From f62f9c6a478a6d3d7a7c32d8a9e697246d845b1b Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 26 Apr 2015 02:35:16 -0400 Subject: [PATCH] Move RenderBlocksCTM to API, add ClientUtils --- src/main/java/com/cricketcraft/chisel/Chisel.java | 1 - src/main/java/com/cricketcraft/chisel/Features.java | 1 + .../cricketcraft/chisel/api/rendering/ClientUtils.java | 8 ++++++++ .../render => api/rendering}/RenderBlocksCTM.java | 10 +++------- .../cricketcraft/chisel/api/rendering/TextureType.java | 1 - .../com/cricketcraft/chisel/block/BlockCarvable.java | 3 ++- .../cricketcraft/chisel/block/BlockCarvableCarpet.java | 4 ++-- .../cricketcraft/chisel/block/BlockCarvableGlass.java | 4 ++-- .../cricketcraft/chisel/block/BlockCarvableSand.java | 3 ++- .../cricketcraft/chisel/client/render/RendererCTM.java | 10 +++++----- .../chisel/client/render/SubmapManagerAntiblock.java | 1 + .../chisel/client/render/SubmapManagerCarpetFloor.java | 1 + .../chisel/client/render/SubmapManagerSlab.java | 1 + 13 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java rename src/main/java/com/cricketcraft/chisel/{client/render => api/rendering}/RenderBlocksCTM.java (98%) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 5d6d7643..a844393c 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -61,7 +61,6 @@ public class Chisel { public static final BlockCarvable.SoundType soundMetalFootstep = new BlockCarvable.SoundType("metal", 1.0f, 1.0f); public static boolean multipartLoaded = false; public static int renderEldritchId; - public static int renderCTMId; public static int renderAutoChiselId; public static int renderGlowId; public static int renderLayeredId; diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index a29880f1..18a28833 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -47,6 +47,7 @@ import com.google.common.collect.Lists; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; + import static com.cricketcraft.chisel.init.ChiselBlocks.*; import static com.cricketcraft.chisel.utils.General.sGNames; diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java b/src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java new file mode 100644 index 00000000..fc3f3ded --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java @@ -0,0 +1,8 @@ +package com.cricketcraft.chisel.api.rendering; + + +public class ClientUtils { + + public static int renderCTMId; + +} diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksCTM.java b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksCTM.java rename to src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java index 40edaca8..a382ba59 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksCTM.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package com.cricketcraft.chisel.api.rendering; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -6,12 +6,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import com.cricketcraft.chisel.api.rendering.CTM; -import com.cricketcraft.chisel.api.rendering.ISubmapManager; -import com.cricketcraft.chisel.api.rendering.TextureSubmap; - -import static com.cricketcraft.chisel.client.render.RenderBlocksCTM.SubSide.*; -import static com.cricketcraft.chisel.client.render.RenderBlocksCTM.Vert.*; +import static com.cricketcraft.chisel.api.rendering.RenderBlocksCTM.SubSide.*; +import static com.cricketcraft.chisel.api.rendering.RenderBlocksCTM.Vert.*; public class RenderBlocksCTM extends RenderBlocks { 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 914ff2b7..c2b4d9ef 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java @@ -17,7 +17,6 @@ import org.apache.commons.lang3.tuple.Triple; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.client.render.RenderBlocksCTM; import com.cricketcraft.chisel.client.render.RenderBlocksColumn; /** diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java index e40073f7..16d6f270 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java @@ -15,6 +15,7 @@ import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; import com.cricketcraft.chisel.init.ChiselTabs; import cpw.mods.fml.relauncher.Side; @@ -78,7 +79,7 @@ public class BlockCarvable extends Block implements ICarvable { @Override public int getRenderType() { - return Chisel.renderCTMId; + return ClientUtils.renderCTMId; } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java index 64ad4702..465429a6 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java @@ -11,10 +11,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; public class BlockCarvableCarpet extends BlockCarpet implements ICarvable { @@ -51,7 +51,7 @@ public class BlockCarvableCarpet extends BlockCarpet implements ICarvable { @Override public int getRenderType() { - return Chisel.renderCTMId; + return ClientUtils.renderCTMId; } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java index 10c14ec5..d001868c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java @@ -11,10 +11,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; import com.cricketcraft.chisel.init.ChiselTabs; import cpw.mods.fml.relauncher.Side; @@ -49,7 +49,7 @@ public class BlockCarvableGlass extends BlockGlass implements ICarvable { @Override public int getRenderType() { - return Chisel.renderCTMId; + return ClientUtils.renderCTMId; } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java index 8d0a2aa5..7ddfc154 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java @@ -15,6 +15,7 @@ import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; import com.cricketcraft.chisel.init.ChiselTabs; import cpw.mods.fml.relauncher.Side; @@ -69,7 +70,7 @@ public class BlockCarvableSand extends BlockSand implements ICarvable { @Override public int getRenderType() { - return Chisel.renderCTMId; + return ClientUtils.renderCTMId; } @Override diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java b/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java index bc487e6c..46ca4eb4 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java @@ -6,10 +6,11 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; import com.cricketcraft.chisel.api.rendering.ISubmapManager; +import com.cricketcraft.chisel.api.rendering.RenderBlocksCTM; import com.cricketcraft.chisel.utils.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; @@ -21,8 +22,8 @@ public class RendererCTM implements ISimpleBlockRenderingHandler { RenderBlocksColumn rendererColumn = new RenderBlocksColumn(); public RendererCTM() { - if (Chisel.renderCTMId == 0) { - Chisel.renderCTMId = RenderingRegistry.getNextAvailableRenderId(); + if (ClientUtils.renderCTMId == 0) { + ClientUtils.renderCTMId = RenderingRegistry.getNextAvailableRenderId(); } } @@ -62,7 +63,6 @@ public class RendererCTM implements ISimpleBlockRenderingHandler { @Override public int getRenderId() { - return Chisel.renderCTMId; + return ClientUtils.renderCTMId; } - } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java index d5133950..fb76e8fc 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java @@ -6,6 +6,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.cricketcraft.chisel.api.rendering.RenderBlocksCTM; import com.cricketcraft.chisel.api.rendering.TextureSubmap; public class SubmapManagerAntiblock extends SubmapManagerBase { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCarpetFloor.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCarpetFloor.java index c15beada..49f7803c 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCarpetFloor.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCarpetFloor.java @@ -6,6 +6,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.cricketcraft.chisel.api.rendering.RenderBlocksCTM; import com.cricketcraft.chisel.api.rendering.TextureSubmap; public class SubmapManagerCarpetFloor extends SubmapManagerBase { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java index f3aa875a..e19de84b 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java @@ -8,6 +8,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import com.cricketcraft.chisel.api.rendering.ISubmapManager; +import com.cricketcraft.chisel.api.rendering.RenderBlocksCTM; import com.cricketcraft.chisel.api.rendering.TextureSubmap; public class SubmapManagerSlab implements ISubmapManager {