Remove generics from ISubmapManager to prevent serverside errors

This commit is contained in:
tterrag1098 committed 2015-05-13 13:19:24 -04:00
1 parent 62a38e9816
commit 31328b0ac1
12 files changed
+43 -47

No files matched your search

@@ -9,7 +9,6 @@ import org.lwjgl.opengl.GL11;
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;
@@ -33,7 +32,6 @@ public class RendererCTM implements ISimpleBlockRenderingHandler {
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
@SuppressWarnings("unchecked")
@Override
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rendererOld) {
int meta = world.getBlockMetadata(x, y, z);
@@ -45,7 +43,7 @@ public class RendererCTM implements ISimpleBlockRenderingHandler {
if (rb != null && rb != rendererOld) {
rb.blockAccess = world;
if (rb instanceof RenderBlocksCTM) {
((RenderBlocksCTM)rb).manager = (ISubmapManager<RenderBlocksCTM>) var.getSubmapManager();
((RenderBlocksCTM)rb).manager = var.getSubmapManager();
((RenderBlocksCTM)rb).rendererOld = rendererOld;
}
return rb.renderStandardBlock(block, x, y, z);
@@ -12,7 +12,7 @@ import com.cricketcraft.chisel.api.rendering.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SubmapManagerAntiblock extends SubmapManagerBase<RenderBlocksCTM> {
public class SubmapManagerAntiblock extends SubmapManagerBase {
@SideOnly(Side.CLIENT)
private static class RenderBlocksCTMFullbright extends RenderBlocksCTM {
@@ -54,7 +54,7 @@ public class SubmapManagerAntiblock extends SubmapManagerBase<RenderBlocksCTM> {
@Override
@SideOnly(Side.CLIENT)
public RenderBlocksCTM createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
if (rb == null) {
rb = new RenderBlocksCTMFullbright();
}
@@ -12,7 +12,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public abstract class SubmapManagerBase<T extends RenderBlocks> implements ISubmapManager<T> {
public abstract class SubmapManagerBase implements ISubmapManager {
@Override
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
@@ -21,17 +21,17 @@ public abstract class SubmapManagerBase<T extends RenderBlocks> implements ISubm
@Override
@SideOnly(Side.CLIENT)
public T createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
return null;
}
@Override
@SideOnly(Side.CLIENT)
public void preRenderSide(T renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) {
public void preRenderSide(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) {
}
@Override
@SideOnly(Side.CLIENT)
public void postRenderSide(T renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) {
public void postRenderSide(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) {
}
}
@@ -12,7 +12,7 @@ import com.cricketcraft.chisel.api.rendering.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SubmapManagerCarpetFloor extends SubmapManagerBase<RenderBlocksCTM> {
public class SubmapManagerCarpetFloor extends SubmapManagerBase {
@SideOnly(Side.CLIENT)
private static RenderBlocksCTM rb;
@@ -45,7 +45,7 @@ public class SubmapManagerCarpetFloor extends SubmapManagerBase<RenderBlocksCTM>
@Override
@SideOnly(Side.CLIENT)
public RenderBlocksCTM createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
if (rb == null) {
rb = new RenderBlocksCTM();
}
@@ -1,7 +1,6 @@
package com.cricketcraft.chisel.client.render;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
@@ -12,9 +11,10 @@ import com.cricketcraft.chisel.init.ChiselBlocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import static com.cricketcraft.chisel.api.rendering.Dir.*;
public class SubmapManagerFakeController extends SubmapManagerBase<RenderBlocks> {
public class SubmapManagerFakeController extends SubmapManagerBase {
private TextureSubmap map;
private CTM ctm = CTM.getInstance();
@@ -14,7 +14,7 @@ import com.cricketcraft.chisel.api.rendering.TextureSubmap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SubmapManagerSlab implements ISubmapManager<RenderBlocksCTM> {
public class SubmapManagerSlab implements ISubmapManager {
@SideOnly(Side.CLIENT)
private static RenderBlocksCTM rb;
@@ -49,7 +49,7 @@ public class SubmapManagerSlab implements ISubmapManager<RenderBlocksCTM> {
@Override
@SideOnly(Side.CLIENT)
public RenderBlocksCTM createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) {
if (rb == null) {
rb = new RenderBlocksCTM();
}
@@ -63,9 +63,10 @@ public class SubmapManagerSlab implements ISubmapManager<RenderBlocksCTM> {
@Override
@SideOnly(Side.CLIENT)
public void preRenderSide(RenderBlocksCTM renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) {
if (side.ordinal() < 2 && !renderer.rendererOld.hasOverrideBlockTexture()) {
renderer.rendererOld.setOverrideBlockTexture(sideTexture);
public void preRenderSide(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) {
RenderBlocksCTM rbctm = (RenderBlocksCTM) renderer;
if (side.ordinal() < 2 && !rbctm.rendererOld.hasOverrideBlockTexture()) {
rbctm.rendererOld.setOverrideBlockTexture(sideTexture);
hadOverride = false;
} else {
hadOverride = true;
@@ -74,9 +75,9 @@ public class SubmapManagerSlab implements ISubmapManager<RenderBlocksCTM> {
@Override
@SideOnly(Side.CLIENT)
public void postRenderSide(RenderBlocksCTM renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) {
public void postRenderSide(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) {
if (!hadOverride) {
renderer.rendererOld.clearOverrideBlockTexture();
((RenderBlocksCTM) renderer).rendererOld.clearOverrideBlockTexture();
}
}
}