diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java index 8c8be963..ce9347ca 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java @@ -345,7 +345,12 @@ public enum TextureType { } } - public ISubmapManager createManagerFor(ICarvingVariation variation, String texturePath) { + public static void clearStatics() { + theRenderBlocksCTM = null; + theRenderBlocksColumn = null; + } + + public ISubmapManager createManagerFor(ICarvingVariation variation, String texturePath) { return new SubmapManagerDefault(this, variation, texturePath); } diff --git a/src/main/java/team/chisel/item/chisel/ChiselController.java b/src/main/java/team/chisel/item/chisel/ChiselController.java index fd0c72c8..d5aa0e0f 100644 --- a/src/main/java/team/chisel/item/chisel/ChiselController.java +++ b/src/main/java/team/chisel/item/chisel/ChiselController.java @@ -18,6 +18,7 @@ import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.ICarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.cricketcraft.chisel.api.carving.IChiselMode; +import com.cricketcraft.chisel.api.rendering.TextureType; import com.google.common.collect.Queues; import cpw.mods.fml.common.FMLCommonHandler; @@ -26,7 +27,6 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import team.chisel.Chisel; import team.chisel.carving.Carving; -import team.chisel.client.render.SubmapManagerSpecialMaterial; import team.chisel.utils.General; public final class ChiselController { @@ -163,4 +163,11 @@ public final class ChiselController { } } + @SubscribeEvent + public void onWorldUnload(WorldEvent.Unload event) { + if (event.world.isRemote) { + TextureType.clearStatics(); + } + } + }