Merge remote-tracking branch 'origin/asm-cleanup' into dev

GTNewHorizons · Feb 16, 2024 · 29ba367 · 29ba367
2 parents 43c3dd0 + 7e51528
commit 29ba367
Show file tree

Hide file tree

Showing 37 changed files with 99 additions and 2,910 deletions.
diff --git a/src/main/java/net/malisis/core/MalisisCore.java b/src/main/java/net/malisis/core/MalisisCore.java
@@ -23,7 +23,6 @@
 import net.malisis.core.configuration.Settings;
 import net.malisis.core.network.MalisisNetwork;
 import net.malisis.core.tileentity.MultiBlockTileEntity;
-import net.malisis.core.util.chunkblock.ChunkBlockHandler;
 import net.malisis.core.util.finiteliquid.FiniteLiquid;
 import net.malisis.core.util.finiteliquid.FiniteLiquidRenderer;
 import net.malisis.core.util.replacement.ReplacementTool;
@@ -154,8 +153,6 @@ public static Set<String> listModId() {
     public void preInit(FMLPreInitializationEvent event) {
         MinecraftForge.EVENT_BUS.register(instance);
         MinecraftForge.EVENT_BUS.register(ReplacementTool.instance());
-        MinecraftForge.EVENT_BUS.register(ChunkBlockHandler.get());
-        // MinecraftForge.EVENT_BUS.register(ChunkCollision.client);
 
         log = event.getModLog();
 

diff --git a/src/main/java/net/malisis/core/asm/AsmHook.java b/src/main/java/net/malisis/core/asm/AsmHook.java