tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Move rendering IDs to Common Proxy classes to appease ExtraUtils.

Browse source
This commit is contained in:
Ben Spiers 2015-03-18 21:39:01 +00:00
parent e36ecf9f05
commit efeeb06b77
9 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/mekanism/client/ClientProxy.java
View file

@ -197,11 +197,6 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy public class ClientProxy extends CommonProxy
{ {
public static int MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
public static int BASIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
public static int PLASTIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
public static int CTM_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
@Override @Override
public void loadConfiguration() public void loadConfiguration()
{ {

7
src/main/java/mekanism/common/CommonProxy.java
View file

@ -113,6 +113,7 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
@ -125,6 +126,12 @@ import cpw.mods.fml.relauncher.FMLInjectionData;
*/ */
public class CommonProxy public class CommonProxy
{ {
public static int MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
public static int BASIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
public static int PLASTIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
public static int CTM_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
/** /**
* Register tile entities that have special models. Overwritten in client to register TESRs. * Register tile entities that have special models. Overwritten in client to register TESRs.
*/ */

3
src/main/java/mekanism/common/block/BlockBasic.java
View file

@ -715,10 +715,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
} }
@Override @Override
@SideOnly(Side.CLIENT)
public int getRenderType() public int getRenderType()
{ {
return ClientProxy.CTM_RENDER_ID; return Mekanism.proxy.CTM_RENDER_ID;
} }
@Override @Override

3
src/main/java/mekanism/common/block/BlockMachine.java
View file

@ -752,10 +752,9 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
} }
@Override @Override
@SideOnly(Side.CLIENT)
public int getRenderType() public int getRenderType()
{ {
return ClientProxy.MACHINE_RENDER_ID; return Mekanism.proxy.MACHINE_RENDER_ID;
} }
@Override @Override

3
src/main/java/mekanism/common/block/BlockPlastic.java
View file

@ -129,9 +129,8 @@ public class BlockPlastic extends Block
} }
@Override @Override
@SideOnly(Side.CLIENT)
public int getRenderType() public int getRenderType()
{ {
return ClientProxy.PLASTIC_RENDER_ID; return Mekanism.proxy.PLASTIC_RENDER_ID;
} }
} }

2
src/main/java/mekanism/generators/client/GeneratorsClientProxy.java
View file

@ -40,8 +40,6 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GeneratorsClientProxy extends GeneratorsCommonProxy public class GeneratorsClientProxy extends GeneratorsCommonProxy
{ {
public static int GENERATOR_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
@Override @Override
public void registerSpecialTileEntities() public void registerSpecialTileEntities()
{ {

3
src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
View file

@ -27,6 +27,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
/** /**
@ -36,6 +37,8 @@ import cpw.mods.fml.common.registry.GameRegistry;
*/ */
public class GeneratorsCommonProxy public class GeneratorsCommonProxy
{ {
public static int GENERATOR_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
/** /**
* Register normal tile entities * Register normal tile entities
*/ */

3
src/main/java/mekanism/generators/common/block/BlockGenerator.java
View file

@ -398,10 +398,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP
} }
@Override @Override
@SideOnly(Side.CLIENT)
public int getRenderType() public int getRenderType()
{ {
return GeneratorsClientProxy.GENERATOR_RENDER_ID; return MekanismGenerators.proxy.GENERATOR_RENDER_ID;
} }
/*This method is not used, metadata manipulation is required to create a Tile Entity.*/ /*This method is not used, metadata manipulation is required to create a Tile Entity.*/

2
src/main/java/mekanism/generators/common/block/BlockReactor.java
View file

@ -275,7 +275,7 @@ public class BlockReactor extends BlockContainer implements IBlockCTM
@Override @Override
public int getRenderType() public int getRenderType()
{ {
return ClientProxy.CTM_RENDER_ID; return Mekanism.proxy.CTM_RENDER_ID;
} }
@Override @Override