From b2a394741fd832015a363a08b80383d9c9202ee6 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 1 May 2015 19:44:51 -0400 Subject: [PATCH] Move RenderBlocksColumn to API (for now), bump API version. Closes #314 --- .../com/cricketcraft/chisel/api/ChiselAPIProps.java | 2 +- .../render => api/rendering}/RenderBlocksColumn.java | 11 ++++++----- .../chisel/api/rendering/TextureType.java | 3 +-- .../chisel/client/render/RendererCTM.java | 1 - 4 files changed, 8 insertions(+), 9 deletions(-) rename src/main/java/com/cricketcraft/chisel/{client/render => api/rendering}/RenderBlocksColumn.java (96%) diff --git a/src/main/java/com/cricketcraft/chisel/api/ChiselAPIProps.java b/src/main/java/com/cricketcraft/chisel/api/ChiselAPIProps.java index c4675cdb..dc50c1c5 100644 --- a/src/main/java/com/cricketcraft/chisel/api/ChiselAPIProps.java +++ b/src/main/java/com/cricketcraft/chisel/api/ChiselAPIProps.java @@ -2,6 +2,6 @@ package com.cricketcraft.chisel.api; public class ChiselAPIProps { - public static final String VERSION = "0.0.2"; + public static final String VERSION = "0.1.0"; public static String MOD_ID = null; // Set by Chisel } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksColumn.java b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksColumn.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksColumn.java rename to src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksColumn.java index 72b7fb0b..39fc036c 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksColumn.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksColumn.java @@ -1,18 +1,19 @@ -package com.cricketcraft.chisel.client.render; - -import com.cricketcraft.chisel.api.rendering.CTM; -import com.cricketcraft.chisel.api.rendering.TextureSubmap; +package com.cricketcraft.chisel.api.rendering; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +/** + * Used by {@link TextureType#CTMV}, slated to be rewritten. Do not use. + */ +@Deprecated public class RenderBlocksColumn extends RenderBlocks { public TextureSubmap submap; public IIcon iconTop; - + private IIcon sides[] = new IIcon[6]; private CTM ctm = CTM.getInstance(); 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 b01801db..fbc090df 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.RenderBlocksColumn; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -25,7 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; /** * Handles all default {@link ISubmapManager} behavior */ -@SuppressWarnings("unchecked") +@SuppressWarnings({ "unchecked", "deprecation" }) public enum TextureType { // @formatter:off 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 46ca4eb4..74fcbc0e 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java @@ -19,7 +19,6 @@ import cpw.mods.fml.client.registry.RenderingRegistry; public class RendererCTM implements ISimpleBlockRenderingHandler { public RenderBlocksCTM rendererCTM = new RenderBlocksCTM(); - RenderBlocksColumn rendererColumn = new RenderBlocksColumn(); public RendererCTM() { if (ClientUtils.renderCTMId == 0) {