From 4f94735c790064a3129e2736dc4044f659bd55d4 Mon Sep 17 00:00:00 2001 From: zangamj Date: Sat, 18 Jun 2016 12:28:16 -0400 Subject: [PATCH] Finished changes to ClientProxy --- .../com/zixiken/dimdoors/CommonProxy.java | 8 +------- .../zixiken/dimdoors/client/ClientProxy.java | 19 ++++++++++++------- .../dimdoors/client/RenderDimDoor.java | 5 ++--- .../dimdoors/client/RenderMobObelisk.java | 8 ++++---- .../dimdoors/client/RenderTransTrapdoor.java | 3 +-- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zixiken/dimdoors/CommonProxy.java b/src/main/java/com/zixiken/dimdoors/CommonProxy.java index f0203dbf..e4d64798 100644 --- a/src/main/java/com/zixiken/dimdoors/CommonProxy.java +++ b/src/main/java/com/zixiken/dimdoors/CommonProxy.java @@ -19,11 +19,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class CommonProxy { - public static String BLOCK_PNG = "/PocketBlockTextures.png"; - public static String ITEM_PNG = "/PocketItemTextures.png"; - public static String RIFT_PNG = "/RIFT.png"; - public static String RIFT2_PNG = "/RIFT2.png"; - public static String WARP_PNG = "/WARP.png"; public void registerRenderers() {} @@ -74,8 +69,7 @@ public class CommonProxy { public void updateDoorTE(BaseDimDoor door, World world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileEntityDimDoor) - { + if (tile instanceof TileEntityDimDoor) { IBlockState state = world.getBlockState(pos); TileEntityDimDoor dimTile = (TileEntityDimDoor) tile; dimTile.openOrClosed = door.isDoorOnRift(world, pos) && door.isUpperDoorBlock(state); diff --git a/src/main/java/com/zixiken/dimdoors/client/ClientProxy.java b/src/main/java/com/zixiken/dimdoors/client/ClientProxy.java index 6052da17..881d8f2c 100644 --- a/src/main/java/com/zixiken/dimdoors/client/ClientProxy.java +++ b/src/main/java/com/zixiken/dimdoors/client/ClientProxy.java @@ -8,24 +8,29 @@ import com.zixiken.dimdoors.tileentities.TileEntityDimDoor; import com.zixiken.dimdoors.tileentities.TileEntityTransTrapdoor; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; public class ClientProxy extends CommonProxy { + @Override public void registerRenderers() { - //MinecraftForgeClient.preloadTexture(BLOCK_PNG); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDimDoor.class, new RenderDimDoor()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTransTrapdoor.class, new RenderTransTrapdoor()); - - //MinecraftForgeClient.preloadTexture(RIFT2_PNG); - RenderingRegistry.registerEntityRenderingHandler(MobMonolith.class, new RenderMobObelisk(.5F)); - RenderingRegistry.registerBlockHandler(new PrivatePocketRender(RenderingRegistry.getNextAvailableRenderId())); - + + RenderingRegistry.registerEntityRenderingHandler(MobMonolith.class, new IRenderFactory() { + @Override + public Render createRenderFor(RenderManager manager) { + return new RenderMobObelisk(manager); + } + }); } @Override @@ -33,7 +38,7 @@ public class ClientProxy extends CommonProxy { ClientOnlyHooks hooks = new ClientOnlyHooks(DDProperties.instance()); MinecraftForge.EVENT_BUS.register(hooks); MinecraftForge.TERRAIN_GEN_BUS.register(hooks); - PocketManager.getDimwatcher().registerReceiver (new PocketManager.ClientDimWatcher()); + PocketManager.getDimwatcher().registerReceiver(new PocketManager.ClientDimWatcher()); PocketManager.getLinkWatcher().registerReceiver(new PocketManager.ClientLinkWatcher()); } diff --git a/src/main/java/com/zixiken/dimdoors/client/RenderDimDoor.java b/src/main/java/com/zixiken/dimdoors/client/RenderDimDoor.java index f08f6381..b6337a58 100644 --- a/src/main/java/com/zixiken/dimdoors/client/RenderDimDoor.java +++ b/src/main/java/com/zixiken/dimdoors/client/RenderDimDoor.java @@ -26,7 +26,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderDimDoor extends TileEntitySpecialRenderer +public class RenderDimDoor extends TileEntitySpecialRenderer { private FloatBuffer buffer = GLAllocation.createDirectFloatBuffer(16); private ResourceLocation warpPath= new ResourceLocation(DimDoors.modid + ":textures/other/WARP.png"); @@ -39,8 +39,7 @@ public class RenderDimDoor extends TileEntitySpecialRenderer private static final int NETHER_DIMENSION_ID = -1; private static DDProperties properties = null; - public RenderDimDoor() - { + public RenderDimDoor() { if (properties == null) properties = DDProperties.instance(); } diff --git a/src/main/java/com/zixiken/dimdoors/client/RenderMobObelisk.java b/src/main/java/com/zixiken/dimdoors/client/RenderMobObelisk.java index 8b000800..d484a46a 100644 --- a/src/main/java/com/zixiken/dimdoors/client/RenderMobObelisk.java +++ b/src/main/java/com/zixiken/dimdoors/client/RenderMobObelisk.java @@ -5,6 +5,7 @@ import com.zixiken.dimdoors.ticking.MobMonolith; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.util.ResourceLocation; @@ -18,13 +19,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderMobObelisk extends RenderLiving +public class RenderMobObelisk extends RenderLiving { protected ModelMobObelisk obeliskModel; - public RenderMobObelisk(float f) - { - super(new ModelMobObelisk(), f); + public RenderMobObelisk(RenderManager manager) { + super(manager, new ModelMobObelisk(), 0.5F); this.obeliskModel = (ModelMobObelisk)this.mainModel; } diff --git a/src/main/java/com/zixiken/dimdoors/client/RenderTransTrapdoor.java b/src/main/java/com/zixiken/dimdoors/client/RenderTransTrapdoor.java index daf695e3..0ca4d706 100644 --- a/src/main/java/com/zixiken/dimdoors/client/RenderTransTrapdoor.java +++ b/src/main/java/com/zixiken/dimdoors/client/RenderTransTrapdoor.java @@ -20,8 +20,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderTransTrapdoor extends TileEntitySpecialRenderer -{ +public class RenderTransTrapdoor extends TileEntitySpecialRenderer { private FloatBuffer field_76908_a = GLAllocation.createDirectFloatBuffer(16); private static DDProperties properties = null; private ResourceLocation riftPath= new ResourceLocation(DimDoors.modid+":textures/other/RIFT.png");