From 4b919ed7e30657aa4cf133faea5d695f73bdcf8a Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 3 Mar 2014 20:57:22 +0800 Subject: [PATCH] Removed RIBlockRenderingHandler --- .../archaic/fluid/gutter/BlockGutter.java | 4 ++-- .../archaic/fluid/tank/BlockTank.java | 4 ++-- .../archaic/process/BlockCastingMold.java | 4 ++-- .../electrical/armbot/BlockArmbot.java | 4 ++-- .../electrical/battery/BlockBattery.java | 4 ++-- .../electrical/generator/BlockGenerator.java | 4 ++-- .../generator/solar/BlockSolarPanel.java | 4 ++-- .../electrical/tesla/BlockTesla.java | 6 ++--- .../mechanical/belt/BlockConveyorBelt.java | 4 ++-- .../energy/turbine/BlockWaterTurbine.java | 5 ++-- .../energy/turbine/BlockWindTurbine.java | 4 ++-- .../mechanical/fluid/transport/BlockPump.java | 4 ++-- .../logistic/belt/BlockManipulator.java | 4 ++-- .../logistic/belt/BlockRejector.java | 4 ++-- .../mechanical/logistic/belt/TileSorter.java | 2 +- .../mechanical/logistic/rail/BlockSorter.java | 4 ++-- .../crusher/BlockMechanicalPiston.java | 4 ++-- .../process/grinder/BlockGrindingWheel.java | 6 ++--- .../process/purifier/BlockMixer.java | 4 ++-- .../resonantinduction/core/ClientProxy.java | 3 --- .../core/render/RIBlockRenderingHandler.java | 23 ------------------- 21 files changed, 39 insertions(+), 66 deletions(-) delete mode 100644 src/main/java/resonantinduction/core/render/RIBlockRenderingHandler.java diff --git a/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/BlockGutter.java b/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/BlockGutter.java index fa7adf86..bd297417 100644 --- a/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/BlockGutter.java +++ b/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/BlockGutter.java @@ -14,9 +14,9 @@ import net.minecraftforge.fluids.FluidStack; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.fluid.BlockFluidNode; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.Vector3; +import calclavia.lib.render.block.BlockRenderingHandler; import calclavia.lib.utility.FluidUtility; import calclavia.lib.utility.WorldUtility; import cpw.mods.fml.relauncher.Side; @@ -157,7 +157,7 @@ public class BlockGutter extends BlockFluidNode @SideOnly(Side.CLIENT) public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/archaic/src/main/java/resonantinduction/archaic/fluid/tank/BlockTank.java b/archaic/src/main/java/resonantinduction/archaic/fluid/tank/BlockTank.java index 306dc6d7..82cd982d 100644 --- a/archaic/src/main/java/resonantinduction/archaic/fluid/tank/BlockTank.java +++ b/archaic/src/main/java/resonantinduction/archaic/fluid/tank/BlockTank.java @@ -11,10 +11,10 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import resonantinduction.core.fluid.BlockFluidNode; -import resonantinduction.core.render.RIBlockRenderingHandler; import resonantinduction.mechanical.fluid.pipe.ItemBlockFluidContainer; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.Vector3; +import calclavia.lib.render.block.BlockRenderingHandler; import calclavia.lib.utility.FluidUtility; import calclavia.lib.utility.inventory.InventoryUtility; import cpw.mods.fml.relauncher.Side; @@ -46,7 +46,7 @@ public class BlockTank extends BlockFluidNode @SideOnly(Side.CLIENT) public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/archaic/src/main/java/resonantinduction/archaic/process/BlockCastingMold.java b/archaic/src/main/java/resonantinduction/archaic/process/BlockCastingMold.java index af0edd9d..b9a33d6e 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/BlockCastingMold.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/BlockCastingMold.java @@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.core.Reference; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.vector.Vector3; import calclavia.lib.prefab.block.BlockTile; +import calclavia.lib.render.block.BlockRenderingHandler; import calclavia.lib.utility.inventory.InventoryUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -25,7 +25,7 @@ public class BlockCastingMold extends BlockTile @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/electrical/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java b/electrical/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java index acf65ffc..cdb767ce 100644 --- a/electrical/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java +++ b/electrical/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java @@ -7,12 +7,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.UniversalElectricity; import calclavia.components.CalclaviaLoader; import calclavia.lib.multiblock.fake.IBlockActivate; import calclavia.lib.multiblock.fake.IMultiBlock; import calclavia.lib.prefab.block.BlockTile; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -90,7 +90,7 @@ public class BlockArmbot extends BlockTile @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/electrical/src/main/java/resonantinduction/electrical/battery/BlockBattery.java b/electrical/src/main/java/resonantinduction/electrical/battery/BlockBattery.java index 8dcde869..35321b5b 100644 --- a/electrical/src/main/java/resonantinduction/electrical/battery/BlockBattery.java +++ b/electrical/src/main/java/resonantinduction/electrical/battery/BlockBattery.java @@ -14,10 +14,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import resonantinduction.core.Reference; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.UniversalElectricity; import calclavia.lib.prefab.block.BlockSidedIO; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -120,7 +120,7 @@ public class BlockBattery extends BlockSidedIO implements ITileEntityProvider @SideOnly(Side.CLIENT) public int getRenderType() { - return RIBlockRenderingHandler.INSTANCE.getRenderId(); + return BlockRenderingHandler.INSTANCE.getRenderId(); } @Override diff --git a/electrical/src/main/java/resonantinduction/electrical/generator/BlockGenerator.java b/electrical/src/main/java/resonantinduction/electrical/generator/BlockGenerator.java index ea93ea77..6a082c33 100644 --- a/electrical/src/main/java/resonantinduction/electrical/generator/BlockGenerator.java +++ b/electrical/src/main/java/resonantinduction/electrical/generator/BlockGenerator.java @@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.core.Reference; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.UniversalElectricity; import calclavia.lib.prefab.block.BlockRotatable; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -78,6 +78,6 @@ public class BlockGenerator extends BlockRotatable @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } } diff --git a/electrical/src/main/java/resonantinduction/electrical/generator/solar/BlockSolarPanel.java b/electrical/src/main/java/resonantinduction/electrical/generator/solar/BlockSolarPanel.java index 8f11fa80..bb60c3bd 100644 --- a/electrical/src/main/java/resonantinduction/electrical/generator/solar/BlockSolarPanel.java +++ b/electrical/src/main/java/resonantinduction/electrical/generator/solar/BlockSolarPanel.java @@ -5,10 +5,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import resonantinduction.core.Reference; -import resonantinduction.core.render.RIBlockRenderingHandler; import resonantinduction.electrical.battery.TileEnergyDistribution; import universalelectricity.api.UniversalElectricity; import calclavia.lib.prefab.block.BlockTile; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -94,6 +94,6 @@ public class BlockSolarPanel extends BlockTile @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } } diff --git a/electrical/src/main/java/resonantinduction/electrical/tesla/BlockTesla.java b/electrical/src/main/java/resonantinduction/electrical/tesla/BlockTesla.java index 42956469..df4e59fc 100644 --- a/electrical/src/main/java/resonantinduction/electrical/tesla/BlockTesla.java +++ b/electrical/src/main/java/resonantinduction/electrical/tesla/BlockTesla.java @@ -11,10 +11,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.core.MultipartUtility; import resonantinduction.core.Reference; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.UniversalElectricity; import universalelectricity.api.vector.VectorWorld; import calclavia.lib.prefab.block.BlockSidedIO; +import calclavia.lib.render.block.BlockRenderingHandler; import calclavia.lib.utility.LanguageUtility; import calclavia.lib.utility.LinkUtility; import calclavia.lib.utility.WrenchUtility; @@ -131,7 +131,7 @@ public class BlockTesla extends BlockSidedIO implements ITileEntityProvider public void onNeighborBlockChange(World world, int x, int y, int z, int id) { TileEntity tile = world.getBlockTileEntity(x, y, z); - + if (tile instanceof TileTesla) { ((TileTesla) tile).updatePositionStatus(); @@ -148,7 +148,7 @@ public class BlockTesla extends BlockSidedIO implements ITileEntityProvider @Override public int getRenderType() { - return RIBlockRenderingHandler.INSTANCE.getRenderId(); + return BlockRenderingHandler.INSTANCE.getRenderId(); } @Override diff --git a/mechanical/src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java b/mechanical/src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java index 0fd43141..6a329509 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/belt/BlockConveyorBelt.java @@ -14,10 +14,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.Reference; -import resonantinduction.core.render.RIBlockRenderingHandler; import resonantinduction.mechanical.belt.TileConveyorBelt.SlantType; import universalelectricity.api.UniversalElectricity; import calclavia.lib.prefab.block.BlockTile; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -369,7 +369,7 @@ public class BlockConveyorBelt extends BlockTile @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/mechanical/src/main/java/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java b/mechanical/src/main/java/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java index c0a5c1c3..4da909d9 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/energy/turbine/BlockWaterTurbine.java @@ -2,12 +2,11 @@ package resonantinduction.mechanical.energy.turbine; import java.util.List; -import calclavia.lib.prefab.turbine.TileTurbine; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import resonantinduction.core.render.RIBlockRenderingHandler; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -29,7 +28,7 @@ public class BlockWaterTurbine extends BlockMechanicalTurbine @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/mechanical/src/main/java/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java b/mechanical/src/main/java/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java index 46d54b0b..97a129fe 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/energy/turbine/BlockWindTurbine.java @@ -6,7 +6,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import resonantinduction.core.render.RIBlockRenderingHandler; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -28,7 +28,7 @@ public class BlockWindTurbine extends BlockMechanicalTurbine @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockPump.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockPump.java index e392081b..58b83e36 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockPump.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/BlockPump.java @@ -3,9 +3,9 @@ package resonantinduction.mechanical.fluid.transport; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.core.Reference; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.UniversalElectricity; import calclavia.lib.prefab.block.BlockRotatable; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -40,7 +40,7 @@ public class BlockPump extends BlockRotatable @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } } diff --git a/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockManipulator.java b/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockManipulator.java index 665165c9..f6887ee6 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockManipulator.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockManipulator.java @@ -6,8 +6,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatMessageComponent; import net.minecraft.world.World; import resonantinduction.core.prefab.imprint.BlockImprintable; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.UniversalElectricity; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -93,7 +93,7 @@ public class BlockManipulator extends BlockImprintable @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockRejector.java b/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockRejector.java index 8c50defa..d90313b3 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockRejector.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/BlockRejector.java @@ -6,8 +6,8 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import resonantinduction.core.Reference; import resonantinduction.core.prefab.imprint.BlockImprintable; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.UniversalElectricity; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -31,7 +31,7 @@ public class BlockRejector extends BlockImprintable @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/TileSorter.java b/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/TileSorter.java index de0e115f..c4d6fcc2 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/TileSorter.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/logistic/belt/TileSorter.java @@ -27,7 +27,7 @@ public class TileSorter extends TileBase @SideOnly(Side.CLIENT) protected TileRender renderer() - {System.out.println("TEST"); + { return new TileRender() { final IModelCustom MODEL = AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "sorter.tcn"); diff --git a/mechanical/src/main/java/resonantinduction/mechanical/logistic/rail/BlockSorter.java b/mechanical/src/main/java/resonantinduction/mechanical/logistic/rail/BlockSorter.java index fe7b6e90..406bd3a0 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/logistic/rail/BlockSorter.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/logistic/rail/BlockSorter.java @@ -6,8 +6,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatMessageComponent; import net.minecraft.world.World; import resonantinduction.core.prefab.imprint.BlockImprintable; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.UniversalElectricity; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -93,7 +93,7 @@ public class BlockSorter extends BlockImprintable @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/BlockMechanicalPiston.java b/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/BlockMechanicalPiston.java index b589a0eb..5ba30d6b 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/BlockMechanicalPiston.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/crusher/BlockMechanicalPiston.java @@ -4,8 +4,8 @@ import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.core.Reference; -import resonantinduction.core.render.RIBlockRenderingHandler; import calclavia.lib.prefab.block.BlockRotatable; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -28,7 +28,7 @@ public class BlockMechanicalPiston extends BlockRotatable @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/grinder/BlockGrindingWheel.java b/mechanical/src/main/java/resonantinduction/mechanical/process/grinder/BlockGrindingWheel.java index ace917d6..8bf9d796 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/grinder/BlockGrindingWheel.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/grinder/BlockGrindingWheel.java @@ -9,8 +9,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.Reference; -import resonantinduction.core.render.RIBlockRenderingHandler; import calclavia.lib.prefab.block.BlockRotatable; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -34,7 +34,7 @@ public class BlockGrindingWheel extends BlockRotatable implements ITileEntityPro @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override @@ -44,7 +44,7 @@ public class BlockGrindingWheel extends BlockRotatable implements ITileEntityPro { ((EntityItem) entity).age--; } - + TileEntity tileEntity = world.getBlockTileEntity(x, y, z); if (tileEntity instanceof TileGrinderWheel) diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/BlockMixer.java b/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/BlockMixer.java index 7b1922ae..e32481a5 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/BlockMixer.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/process/purifier/BlockMixer.java @@ -4,9 +4,9 @@ import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.core.Reference; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.UniversalElectricity; import calclavia.lib.prefab.block.BlockRotatable; +import calclavia.lib.render.block.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -28,7 +28,7 @@ public class BlockMixer extends BlockRotatable implements ITileEntityProvider @Override public int getRenderType() { - return RIBlockRenderingHandler.ID; + return BlockRenderingHandler.ID; } @Override diff --git a/src/main/java/resonantinduction/core/ClientProxy.java b/src/main/java/resonantinduction/core/ClientProxy.java index 9d68bf9c..7c5f84ca 100644 --- a/src/main/java/resonantinduction/core/ClientProxy.java +++ b/src/main/java/resonantinduction/core/ClientProxy.java @@ -6,10 +6,8 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.particle.EntityFX; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import resonantinduction.core.render.RIBlockRenderingHandler; import universalelectricity.api.vector.Vector3; import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,7 +22,6 @@ public class ClientProxy extends CommonProxy public void preInit() { MinecraftForge.EVENT_BUS.register(SoundHandler.INSTANCE); - RenderingRegistry.registerBlockHandler(RIBlockRenderingHandler.INSTANCE); } @Override diff --git a/src/main/java/resonantinduction/core/render/RIBlockRenderingHandler.java b/src/main/java/resonantinduction/core/render/RIBlockRenderingHandler.java deleted file mode 100644 index ea5be6f8..00000000 --- a/src/main/java/resonantinduction/core/render/RIBlockRenderingHandler.java +++ /dev/null @@ -1,23 +0,0 @@ -package resonantinduction.core.render; - -import calclavia.lib.render.block.BlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/** - * @author Calclavia - * - */ -@SideOnly(Side.CLIENT) -public class RIBlockRenderingHandler extends BlockRenderingHandler -{ - public static final RIBlockRenderingHandler INSTANCE = new RIBlockRenderingHandler(); - public static final int ID = RenderingRegistry.getNextAvailableRenderId(); - - @Override - public int getRenderId() - { - return ID; - } -}