Move RenderBlocksCTM to API, add ClientUtils

This commit is contained in:
tterrag1098 committed 2015-04-26 02:35:16 -04:00
1 parent 2f6b455514
commit f62f9c6a47
13 files changed
+28 -20

No files matched your search

@@ -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;
@@ -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;
@@ -0,0 +1,8 @@
package com.cricketcraft.chisel.api.rendering;
public class ClientUtils {
public static int renderCTMId;
}
@@ -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 {
@@ -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;
/**
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
}
}
@@ -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<RenderBlocksCTM> {
@@ -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<RenderBlocksCTM> {
@@ -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<RenderBlocksCTM> {