Bring last few APIs for porting FoxLoader 1.0 mods.

Author: Fox2Code

loader/src/main/java/com/fox2code/foxloader/loader/Mod.java

@@ -60,6 +60,8 @@ protected final void setConfigObject(@Nullable Object configObject) {
 
     public void onPreInit() {}
 
+    public void onLatePreInit() {}
+
     public void onInit() {}
 
     public void onPostInit() {}

loader/src/main/java/com/fox2code/foxloader/loader/ModLoader.java

@@ -59,6 +59,7 @@ public final class ModLoader extends Mod {
     private static final ArrayList<Mod> mods = new ArrayList<>();
     private static boolean areAllModsLoaded = false;
     private static boolean areAllModsFullyLoaded = false;
+    private static boolean constructingMods = false;
     private static Thread gameThread;
 
     static {
@@ -96,13 +97,15 @@ static void preInitializeMods(Collection<LoadingPlugin> loadingPlugins) throws E
         for (LoadingPlugin loadingPlugin : loadingPlugins) {
             loadingPlugin.preModInitialization();
         }
+        constructingMods = true;
         for (ModContainer modContainer : ModLoaderInit.modContainers.values()) {
             ModContainer.setActiveModContainer(modContainer);
             Mod mod = modContainer.initializeMod();
             if (mod != null) {
                 mods.add(mod);
             }
         }
+        constructingMods = false;
         for (Mod mod : mods) {
             ModContainer.setActiveModContainer(mod.getModContainer());
             FoxLoaderEvents.INSTANCE.registerEvents(mod);
@@ -111,6 +114,10 @@ static void preInitializeMods(Collection<LoadingPlugin> loadingPlugins) throws E
             ModContainer.setActiveModContainer(mod.getModContainer());
             mod.onPreInit();
         }
+        for (Mod mod : mods) {
+            ModContainer.setActiveModContainer(mod.getModContainer());
+            mod.onLatePreInit();
+        }
         ModContainer.setActiveModContainer(null);
         areAllModsLoaded = true;
         GameRegistry.freeze();
@@ -202,6 +209,10 @@ public static boolean areAllModsFullyLoaded() {
         return areAllModsFullyLoaded;
     }
 
+    public static boolean isConstructingMods() {
+        return constructingMods;
+    }
+
     public static Thread getGameThread() {
         return gameThread;
     }

loader/src/main/java/com/fox2code/foxloader/registry/GameRegistry.java

@@ -447,6 +447,10 @@ static void initializeCustomInitialIds(int initialNextBlockId, int initialNextIt
         public static int generateBlockId(Block block, String id) {
             if (!initialized) throw new IllegalStateException("GameRegistry not initialized");
             if (frozen) throw new IllegalStateException("GameRegistry frozen");
+            if (ModLoader.isConstructingMods()) {
+                // Avoid bad practices that can leads to severe unfixable bugs down the line.
+                throw new IllegalStateException("Cannot register blocks during mods construction");
+            }
             ModContainer modContainer = ModContainer.getActiveModContainer();
             if (modContainer == null) throw new IllegalStateException("No mod container active");
             if (modContainer != FOXLOADER_MOD_CONTAINER) {
@@ -468,6 +472,10 @@ public static int generateBlockId(Block block, String id) {
         public static int generateItemId(Item item, String id) {
             if (!initialized) throw new IllegalStateException("GameRegistry not initialized");
             if (frozen) throw new IllegalStateException("GameRegistry frozen");
+            if (ModLoader.isConstructingMods()) {
+                // Avoid bad practices that can leads to severe unfixable bugs down the line.
+                throw new IllegalStateException("Cannot register items during mods construction");
+            }
             ModContainer modContainer = ModContainer.getActiveModContainer();
             if (modContainer == null) throw new IllegalStateException("No mod container active");
             if (modContainer != FOXLOADER_MOD_CONTAINER) {

patching/src/main/java/com/fox2code/foxloader/patching/game/RegistryPatch.java

@@ -567,6 +567,9 @@ private static void patchRenderItem(ClassNode classNode) {
 
     // Block/Item patching
     private static void patchItem(ClassNode classNode) {
+        TransformerUtils.getMethod(classNode, "setMaxDamage").access = ACC_PUBLIC;
+        TransformerUtils.getMethod(classNode, "setWearable").access = ACC_PUBLIC;
+        TransformerUtils.getMethod(classNode, "addDescription").access = ACC_PUBLIC;
         MethodNode init = TransformerUtils.getMethod(classNode, "<init>");
         MethodNode flInit = TransformerUtils.copyMethodNode(init);
         init.access |= ACC_DEPRECATED;
@@ -690,6 +693,14 @@ private static void patchBlock(ClassNode classNode) {
         TransformerUtils.getField(classNode, "blockName").access = ACC_PROTECTED;
         TransformerUtils.getMethod(classNode, "getBlockName").access |= ACC_FINAL;
         TransformerUtils.getMethod(classNode, "setBlockName").access |= ACC_FINAL;
+        TransformerUtils.getMethod(classNode, "setLightOpacity").access = ACC_PUBLIC;
+        TransformerUtils.getMethod(classNode, "setResistance").access = ACC_PUBLIC;
+        TransformerUtils.getMethod(classNode, "setIsIndestructible").access = ACC_PUBLIC;
+        TransformerUtils.getMethod(classNode, "setBlockUnbreakable").access = ACC_PUBLIC;
+        TransformerUtils.getMethod(classNode, "setHardness").access = ACC_PUBLIC;
+        TransformerUtils.getMethod(classNode, "disableStats").access = ACC_PUBLIC;
+        TransformerUtils.getMethod(classNode, "setWearable").access = ACC_PUBLIC;
+        TransformerUtils.getMethod(classNode, "addDescription").access = ACC_PUBLIC;
         MethodNode init = TransformerUtils.getMethod(classNode, "<init>");
         MethodNode flInit = TransformerUtils.copyMethodNode(init);
         init.access |= ACC_DEPRECATED;