diff --git a/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java index da8e9f47..0a078081 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java @@ -75,7 +75,7 @@ public class SubmapManagerAntiblock extends SubmapManagerBase { }; @SideOnly(Side.CLIENT) - private static RenderBlocksCTMFullbright rb; + private RenderBlocksCTMFullbright rb; private String color; private TextureSubmap submap, submapSmall; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java b/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java index 2ef0c7d6..69e39131 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java @@ -14,7 +14,7 @@ import team.chisel.ctmlib.TextureSubmap; public class SubmapManagerCarpetFloor extends SubmapManagerBase { @SideOnly(Side.CLIENT) - private static RenderBlocksCTM rb; + private RenderBlocksCTM rb; private TextureSubmap submap; private TextureSubmap submapSmall; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerSlab.java b/src/main/java/team/chisel/client/render/SubmapManagerSlab.java index 913d9780..339987e0 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerSlab.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerSlab.java @@ -16,7 +16,7 @@ import team.chisel.ctmlib.TextureSubmap; public class SubmapManagerSlab implements ISubmapManager { @SideOnly(Side.CLIENT) - private static RenderBlocksCTM rb; + private RenderBlocksCTM rb; private TextureSubmap submap; private TextureSubmap submapSmall; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerSpecialMaterial.java b/src/main/java/team/chisel/client/render/SubmapManagerSpecialMaterial.java index 71758a80..2e5719d4 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerSpecialMaterial.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerSpecialMaterial.java @@ -48,7 +48,7 @@ public class SubmapManagerSpecialMaterial extends SubmapManagerBase { } }; - private static RenderBlocksCTMFullbright renderBlocksFullbright; + private RenderBlocksCTMFullbright renderBlocksFullbright; private String color; private MaterialType materialType; @@ -85,8 +85,4 @@ public class SubmapManagerSpecialMaterial extends SubmapManagerBase { return renderBlocksFullbright; } - public static void clearRenderBlocksInstance() { - renderBlocksFullbright = null; - } - } diff --git a/src/main/java/team/chisel/item/chisel/ChiselController.java b/src/main/java/team/chisel/item/chisel/ChiselController.java index 59b4805e..fd0c72c8 100644 --- a/src/main/java/team/chisel/item/chisel/ChiselController.java +++ b/src/main/java/team/chisel/item/chisel/ChiselController.java @@ -163,11 +163,4 @@ public final class ChiselController { } } - @SubscribeEvent - public void onWorldUnload(WorldEvent.Unload event) { - if (event.world.isRemote) { - SubmapManagerSpecialMaterial.clearRenderBlocksInstance(); - } - } - }