fix: ошибки

- добавлена настройка develop-mode
- фикс рекурсии в createFoodItem
- убраны RuntimeException, от туда где их быть не должно
This commit is contained in:
Reider745
2023-12-09 10:01:53 +03:00
parent 9a3e439bfb
commit c49bbe2fcb
7 changed files with 15 additions and 12 deletions
@@ -91,8 +91,12 @@ public class InnerCoreServer {
return server.getPropertyBoolean("eval-enable", true);
}
public static boolean isDevelopMode(){
return server.getPropertyBoolean("develop-mode", false);
}
public static boolean isRuntimeException(){
return server.getPropertyBoolean("inner_core.runtime_exception", false);
return server.getPropertyBoolean("inner_core.runtime_exception", isDevelopMode());
}
private static void processFile(ZipFile file, String uncompressedDirectory, ZipEntry entry) throws IOException {
@@ -1,7 +1,9 @@
package com.zhekasmirnov.apparatus;
import com.reider745.InnerCoreServer;
public class Apparatus {
public static boolean isDevelop() {
return false;
return InnerCoreServer.isDevelopMode();
}
}
@@ -67,11 +67,11 @@ public class NativeAPI {
}
public static void sendCachedItemNameOverride(int id, int data, String overrideCache) {
InnerCoreServer.useNotCurrentSupport("NativeAPI.sendCachedItemNameOverride(id, data, overrideCache)");
// InnerCoreServer.useNotCurrentSupport("NativeAPI.sendCachedItemNameOverride(id, data, overrideCache)");
}
public static void setItemNameOverrideCallbackForced(int id, boolean forces) {
InnerCoreServer.useNotCurrentSupport("NativeAPI.setItemNameOverrideCallbackForced(id, forces)");
//InnerCoreServer.useNotCurrentSupport("NativeAPI.setItemNameOverrideCallbackForced(id, forces)");
}
public static void setBlockChangeCallbackEnabled(int id, boolean enabled) {
@@ -628,7 +628,6 @@ public class NativeAPI {
}
public static void setItemRequiresIconOverride(int id, boolean enabled) {
InnerCoreServer.useClientMethod("NativeAPI.setItemRequiresIconOverride(id, enabled)");
}
public static void setItemToDrop(long entity, int id, int count, int data, long extra) {
@@ -61,7 +61,6 @@ public class NativeItem {
}
public void setGlint(boolean val) {
InnerCoreServer.useNotCurrentSupport("NativeItem.setGlint(val)");
}
public void setHandEquipped(boolean val) {
@@ -73,7 +72,6 @@ public class NativeItem {
}
public void setUseAnimation(int val) {
InnerCoreServer.useNotCurrentSupport("NativeItem.setUseAnimation(val)");
}
public void setMaxUseDuration(int val) {
@@ -101,7 +99,7 @@ public class NativeItem {
}
public void setProperties(String val) {
InnerCoreServer.useNotCurrentSupport("NativeItem.setProperties(val)");
//InnerCoreServer.useNotCurrentSupport("NativeItem.setProperties(val)");
}
public void setEnchantType(int type, int value) {
@@ -220,7 +218,6 @@ public class NativeItem {
}
public static void setUseAnimation(long ptr, int val) {
InnerCoreServer.useNotSupport("NativeItem.setUseAnimation(ptr, val)");
}
public static void setMaxUseDuration(long ptr, int val) {
@@ -276,7 +273,7 @@ public class NativeItem {
}
public static void setCreativeCategoryForId(int id, int category) {
InnerCoreServer.useNotCurrentSupport("NativeItem.setCreativeCategoryForId(id, category)");
ItemMethod.setCreativeCategory(CustomManager.getFor(id), category);
}
public static String getNameForId(int id, int data) {
@@ -27,7 +27,7 @@ public class NativeItemInstance {
this.id = this.count = this.data = 0;
this.extra = null;
} else {
item = ptr;
this.item = item;
this.id = item.getId();
this.count = item.getCount();
this.data = item.getAttackDamage() == 0 ? item.getAttackDamage() : item.getDamage();
@@ -1337,7 +1337,7 @@ public class AdaptedScriptAPI extends API {
item.setUseAnimation(1);
item.setMaxUseDuration(32);
return item;*/
NativeItem item = createFoodItem(id, nameId, name, iconName, iconIndex, food);
NativeItem item = NativeItem.createFoodItem(id, nameId, name, iconName, iconIndex, food);
//item.setProperties(null);
item.setUseAnimation(1);
item.setMaxUseDuration(32);