Optimize initialization.

Author: ScottCTD

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx7G -Dfile.encoding=utf-8
 org.gradle.daemon=false
 
 mc_version=1.16.4
-mod_version=1.0.1
+mod_version=1.0.2
 mappings_version=20201028-1.16.3
 forge_version=35.1.10
 

src/main/java/xyz/scottc/oreunification/Config.java

@@ -1,11 +1,15 @@
 package xyz.scottc.oreunification;
 
 import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.config.ModConfig;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+@Mod.EventBusSubscriber(modid = OreUnification.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class Config {
 
     public static ForgeConfigSpec SERVER_CONFIG;
@@ -27,6 +31,7 @@ public class Config {
         initEventsSettings();
 
         SERVER_CONFIG = SERVER_BUILDER.build();
+        OreUnification.init();
     }
 
     private static void initMatchingSettings() {
@@ -58,7 +63,7 @@ private static void initMatchingSettings() {
         tagsWhiteList = SERVER_BUILDER
                 .comment("Whitelist for tags to be replaced.\n[Notice]If you want to match all the occurrences, you have to add \"*\"!\n(e.g. \"forge:ingots/*\")\nYou can use * but you cannot use other regex.")
                 .translation("config.oreunification.tags_whitelist_comment")
-                .defineList("WhiteList", Arrays.asList("forge:ingots/*", "forge:nuggets/*", "forge:dusts/*", "forge:gems/*", "forge:ores/*"), Config::isItemOrTag);
+                .defineList("WhiteList", Arrays.asList("forge:ingots/*", "forge:nuggets/*", "forge:dusts/*", "forge:gems/*", "forge:ores/*", "forge:storage_blocks"), Config::isItemOrTag);
 
         tagsBlackList = SERVER_BUILDER
                 .comment("Blacklist for tags to be replaced.\nThe priority of blacklist is higher than that of whitelist. So if you have both \"forge:ingots/*\" in the whitelist and blacklist, \"forge:ingots/*\" will not be replaced.")
@@ -109,4 +114,16 @@ private static boolean isItemOrTag(Object s) {
         return false;
     }
 
+    @SubscribeEvent
+    public static void onLoading(ModConfig.Loading event) {
+        OreUnification.init();
+        OreUnification.LOGGER.info("Config Loaded!");
+    }
+
+    @SubscribeEvent
+    public static void onReloading(ModConfig.Reloading event) {
+        OreUnification.init();
+        OreUnification.LOGGER.info("Config Reloaded!");
+    }
+
 }

src/main/java/xyz/scottc/oreunification/EventHandler.java

@@ -14,10 +14,6 @@
 @Mod.EventBusSubscriber(modid = OreUnification.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE)
 public class EventHandler {
 
-    static {
-        init();
-    }
-
     public static boolean isEnableTickEventListener, isEnableEntityJoinWorldListener;
     public static int playerTickEventGap;
 
@@ -26,7 +22,6 @@ public class EventHandler {
     public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
         if (isEnableTickEventListener) {
             if (!event.player.getEntityWorld().isRemote && event.phase == TickEvent.Phase.END && event.player.world.getGameTime() % playerTickEventGap == 0) {
-                init();
                 PlayerEntity player = event.player;
                 for (int i = 0; i < player.inventory.getSizeInventory(); i++) {
                     ItemStack stack = player.inventory.getStackInSlot(i);
@@ -44,7 +39,6 @@ public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
     public static void onEntityJoinWorld(EntityJoinWorldEvent event) {
         if (isEnableEntityJoinWorldListener) {
             if (!event.getWorld().isRemote && event.getEntity() instanceof ItemEntity) {
-                init();
                 ItemEntity itemEntity = (ItemEntity) event.getEntity();
                 ItemStack itemStack = itemEntity.getItem();
                 Item item = itemStack.getItem();
@@ -57,17 +51,4 @@ public static void onEntityJoinWorld(EntityJoinWorldEvent event) {
         }
     }
 
-    public static void init() {
-        OreUnification.isEnableItemsWhiteList = Config.isEnableItemsWhiteList.get();
-        OreUnification.itemsWhiteList = Config.itemsWhiteList.get();
-        OreUnification.tagsWhiteList = Config.tagsWhiteList.get();
-        OreUnification.itemsBlackList = Config.itemsBlackList.get();
-        OreUnification.tagsBlackList = Config.tagsBlackList.get();
-        OreUnification.modsPriority = Config.modsPriority.get();
-
-        isEnableTickEventListener = Config.isEnableTickEventListener.get();
-        isEnableEntityJoinWorldListener = Config.isEnableEntityJoinWorldListener.get();
-        playerTickEventGap = Config.playerTickEventGap.get();
-    }
-
 }

src/main/java/xyz/scottc/oreunification/OreUnification.java

@@ -36,6 +36,19 @@ public OreUnification() {
         ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, Config.SERVER_CONFIG);
     }
 
+    public static void init() {
+        OreUnification.isEnableItemsWhiteList = Config.isEnableItemsWhiteList.get();
+        OreUnification.itemsWhiteList = Config.itemsWhiteList.get();
+        OreUnification.tagsWhiteList = Config.tagsWhiteList.get();
+        OreUnification.itemsBlackList = Config.itemsBlackList.get();
+        OreUnification.tagsBlackList = Config.tagsBlackList.get();
+        OreUnification.modsPriority = Config.modsPriority.get();
+
+        EventHandler.isEnableTickEventListener = Config.isEnableTickEventListener.get();
+        EventHandler.isEnableEntityJoinWorldListener = Config.isEnableEntityJoinWorldListener.get();
+        EventHandler.playerTickEventGap = Config.playerTickEventGap.get();
+    }
+
     public static @NotNull Item replace(Item target, ResourceLocation validTag) {
         if (isNeedToReplace(target)) {
             ITag<Item> itemITag = ItemTags.getCollection().get(validTag);