diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 8b29eef5e..57647f599 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -32,6 +32,7 @@ import net.minecraft.block.BlockFalling; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemBlock; import net.minecraftforge.fluids.Fluid; @@ -2150,7 +2151,7 @@ public class ModBlocks { fire_door = new BlockDoorGeneric(Material.iron, DoorDecl.FIRE_DOOR).setBlockName("fire_door").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fire_door"); transition_seal = new BlockDoorGeneric(Material.iron, DoorDecl.TRANSITION_SEAL).setBlockName("transition_seal").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":transition_seal"); - secure_access_door = new BlockDoorGeneric(Material.iron, DoorDecl.SECURE_ACCESS_DOOR).setBlockName("secure_access_door").setHardness(200.0F).setResistance(20000.0F).setCreativeTab(MainRegistry.machineTab); + secure_access_door = new BlockDoorGeneric(Material.iron, DoorDecl.SECURE_ACCESS_DOOR).setBlockName("secure_access_door").setHardness(200.0F).setResistance(20000.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":secure_access_door"); large_vehicle_door = new BlockDoorGeneric(Material.iron, DoorDecl.LARGE_VEHICLE_DOOR).setBlockName("large_vehicle_door").setHardness(100.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab); qe_containment = new BlockDoorGeneric(Material.iron, DoorDecl.QE_CONTAINMENT).setBlockName("qe_containment").setHardness(100.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab); qe_sliding_door = new BlockDoorGeneric(Material.iron, DoorDecl.QE_SLIDING).setBlockName("qe_sliding_door").setHardness(100.0F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab); diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 4774e9a31..d4c4b05d3 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -457,6 +457,9 @@ public class ClientProxy extends ServerProxy { MinecraftForgeClient.registerItemRenderer(ModItems.crucible, new ItemRenderCrucible()); MinecraftForgeClient.registerItemRenderer(ModItems.chainsaw, new ItemRenderChainsaw()); MinecraftForgeClient.registerItemRenderer(ModItems.boltgun, new ItemRenderBoltgun()); + // 1.12.2 Doors + ItemRenderSlidingSealDoor door = new ItemRenderSlidingSealDoor(); + MinecraftForgeClient.registerItemRenderer(door.getItemForRenderer(), door.getRenderer()); //guns MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg, new ItemRenderRpg()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_karl, new ItemRenderRpg()); diff --git a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java index 0c3a421c2..a6760025c 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java +++ b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java @@ -804,7 +804,7 @@ public class ItemRenderLibrary { } }); - renderers.put(Item.getItemFromBlock(ModBlocks.sliding_seal_door), new ItemRenderBase(){ +/* renderers.put(Item.getItemFromBlock(ModBlocks.sliding_seal_door), new ItemRenderBase(){ public void renderInventory() { GL11.glTranslated(0, -5, 0); GL11.glScaled(7, 7, 7); @@ -815,7 +815,7 @@ public class ItemRenderLibrary { ResourceManager.sliding_seal_door.renderAll(); GL11.glShadeModel(GL11.GL_FLAT); } - }); + });*/ renderers.put(Item.getItemFromBlock(ModBlocks.blast_door), new ItemRenderBase() { public void renderInventory() { diff --git a/src/main/java/com/hbm/render/item/block/ItemRenderSlidingSealDoor.java b/src/main/java/com/hbm/render/item/block/ItemRenderSlidingSealDoor.java new file mode 100644 index 000000000..a22cf0153 --- /dev/null +++ b/src/main/java/com/hbm/render/item/block/ItemRenderSlidingSealDoor.java @@ -0,0 +1,33 @@ +package com.hbm.render.item.block; + +import com.hbm.blocks.ModBlocks; +import com.hbm.main.ResourceManager; +import com.hbm.render.item.ItemRenderBase; +import com.hbm.render.tileentity.IItemRendererProvider; +import net.minecraft.client.Minecraft; +import net.minecraft.item.Item; +import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; + +public class ItemRenderSlidingSealDoor implements IItemRendererProvider { + @Override + public Item getItemForRenderer() { + return Item.getItemFromBlock(ModBlocks.sliding_seal_door); + } + + @Override + public IItemRenderer getRenderer() { + return new ItemRenderBase(){ + public void renderInventory() { + GL11.glTranslated(0, -5, 0); + GL11.glScaled(7, 7, 7); + } + public void renderCommon() { + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.sliding_seal_door_tex); + GL11.glShadeModel(GL11.GL_SMOOTH); + ResourceManager.sliding_seal_door.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + } + }; + } +} diff --git a/src/main/java/com/hbm/tileentity/DoorDecl.java b/src/main/java/com/hbm/tileentity/DoorDecl.java index 64b073fd6..718afb541 100644 --- a/src/main/java/com/hbm/tileentity/DoorDecl.java +++ b/src/main/java/com/hbm/tileentity/DoorDecl.java @@ -314,35 +314,30 @@ public abstract class DoorDecl { } else { set(trans, 0, 0, 0); } - }; + } @Override @SideOnly(Side.CLIENT) public double[][] getClippingPlanes() { return new double[][]{{0, 0, -1, 0.5001}}; - }; + } @Override @SideOnly(Side.CLIENT) public void doOffsetTransform() { GL11.glTranslated(0.375, 0, 0); - }; - - @Override - public int timeToOpen() { - return 20; - }; + } @Override public AxisAlignedBB getBlockBound(int x, int y, int z, boolean open) { if(open){ if(y == 0) return AxisAlignedBB.getBoundingBox(0, 0, 1-0.25, 1, 0.125, 1); - return super.getBlockBound(x, y, z, open); + return super.getBlockBound(x, y, z, true); } else { return AxisAlignedBB.getBoundingBox(0, 0, 1-0.25, 1, 1, 1); } - }; + } @Override public int[][] getDoorOpenRanges(){ @@ -407,24 +402,24 @@ public abstract class DoorDecl { } else { super.getTranslation(partName, openTicks, child, trans); } - }; + } @Override @SideOnly(Side.CLIENT) public void doOffsetTransform() { GL11.glRotated(90, 0, 1, 0); - }; + } @Override @SideOnly(Side.CLIENT) public double[][] getClippingPlanes() { return new double[][]{{0, -1, 0, 5}}; - }; + } @Override public int timeToOpen() { return 120; - }; + } @Override public int[][] getDoorOpenRanges(){ @@ -449,7 +444,7 @@ public abstract class DoorDecl { } else if(y == 4){ return AxisAlignedBB.getBoundingBox(0, 0.5, 0.15, 1, 1, 0.85); } else { - return super.getBlockBound(x, y, z, open); + return super.getBlockBound(x, y, z, true); } } @@ -497,24 +492,24 @@ public abstract class DoorDecl { } else { super.getTranslation(partName, openTicks, child, trans); } - }; + } @Override @SideOnly(Side.CLIENT) public void doOffsetTransform() { GL11.glTranslated(0, 0, 0.5); - }; + } @Override @SideOnly(Side.CLIENT) public double[][] getClippingPlanes() { return new double[][]{{0.0, 0.0, 1.0, 2.0001}, {0.0, 0.0, -1.0, 2.0001}}; - }; + } @Override public AxisAlignedBB getBlockBound(int x, int y, int z, boolean open) { if(!open) - return super.getBlockBound(x, y, z, open); + return super.getBlockBound(x, y, z, false); if(z == 1){ return AxisAlignedBB.getBoundingBox(0.4, 0, 0, 1, 1, 1); } else if(z == -2){ @@ -524,13 +519,13 @@ public abstract class DoorDecl { } else if(y == 0){ return AxisAlignedBB.getBoundingBox(0, 0, 0, 1, 0.0625, 1); } - return super.getBlockBound(x, y, z, open); - }; + return super.getBlockBound(x, y, z, true); + } @Override public int timeToOpen() { return 60; - }; + } @Override public int[][] getDoorOpenRanges(){ @@ -540,7 +535,7 @@ public abstract class DoorDecl { @Override public int[] getDimensions() { return new int[]{3, 0, 0, 0, 2, 1}; - }; + } @Override @SideOnly(Side.CLIENT) @@ -565,15 +560,17 @@ public abstract class DoorDecl { @Override public String getOpenSoundEnd() { return "hbm:door.qe_sliding_opened"; - }; + } + @Override public String getCloseSoundEnd() { return "hbm:door.qe_sliding_shut"; - }; + } + @Override public String getOpenSoundLoop() { return "hbm:door.qe_sliding_opening"; - }; + } public float getSoundVolume(){ return 2; @@ -587,18 +584,18 @@ public abstract class DoorDecl { } else { set(trans, 0, 0, -1*getNormTime(openTicks)); } - }; + } @Override @SideOnly(Side.CLIENT) public void doOffsetTransform() { GL11.glTranslated(0.4375, 0, 0.5); - }; + } @Override public int timeToOpen() { return 10; - }; + } @Override public AxisAlignedBB getBlockBound(int x, int y, int z, boolean open) { @@ -611,7 +608,7 @@ public abstract class DoorDecl { } else { return AxisAlignedBB.getBoundingBox(0, 0, 1-0.125, 1, 1, 1); } - }; + } @Override public int[][] getDoorOpenRanges(){ @@ -646,12 +643,13 @@ public abstract class DoorDecl { @Override public String getOpenSoundEnd() { - return "hbm:door.wgh_stop"; - }; + return "hbm:door.wghStop"; + } + @Override public String getOpenSoundLoop() { - return "hbm:door.wgh_start"; - }; + return "hbm:door.wghStart"; + } @Override public float getSoundVolume(){ @@ -666,24 +664,24 @@ public abstract class DoorDecl { } else { super.getTranslation(partName, openTicks, child, trans); } - }; + } @Override @SideOnly(Side.CLIENT) public void doOffsetTransform() { GL11.glTranslated(0.25, 0, 0); - }; + } @Override @SideOnly(Side.CLIENT) public double[][] getClippingPlanes() { return new double[][]{{0, -1, 0, 3.0001}}; - }; + } @Override public int timeToOpen() { return 160; - }; + } @Override public int[][] getDoorOpenRanges(){ @@ -703,8 +701,8 @@ public abstract class DoorDecl { return AxisAlignedBB.getBoundingBox(0, 0.5, 0.5, 1, 1, 1); else if(y == 0) return AxisAlignedBB.getBoundingBox(0, 0, 0.5, 1, 0.1, 1); - return super.getBlockBound(x, y, z, open); - }; + return super.getBlockBound(x, y, z, true); + } @Override @SideOnly(Side.CLIENT) @@ -732,23 +730,27 @@ public abstract class DoorDecl { @Override public String getOpenSoundEnd() { return "hbm:door.wgh_big_stop"; - }; + } + @Override public String getOpenSoundLoop() { return "hbm:door.wgh_big_start"; - }; + } + @Override public String getOpenSoundStart() { return "hbm:door.door.lever"; - }; + } + @Override public String getCloseSoundStart() { return null; - }; + } + @Override public String getCloseSoundEnd() { return "hbm:door.door.lever"; - }; + } @Override public float getSoundVolume(){ @@ -763,7 +765,7 @@ public abstract class DoorDecl { } else { set(trans, 0, 0, 0); } - }; + } @Override @SideOnly(Side.CLIENT) @@ -785,7 +787,7 @@ public abstract class DoorDecl { return; } super.getOrigin(partName, orig); - }; + } @Override @SideOnly(Side.CLIENT) @@ -798,13 +800,13 @@ public abstract class DoorDecl { return; } super.getRotation(partName, openTicks, rot); - }; + } @Override @SideOnly(Side.CLIENT) public boolean doesRender(String partName, boolean child) { return child || !partName.startsWith("spinny"); - }; + } @Override @SideOnly(Side.CLIENT) @@ -812,7 +814,7 @@ public abstract class DoorDecl { if("door".equals(partName)) return new String[]{"spinny_lower", "spinny_upper"}; return super.getChildren(partName); - }; + } @Override public AxisAlignedBB getBlockBound(int x, int y, int z, boolean open) { @@ -823,13 +825,13 @@ public abstract class DoorDecl { } else if(y == 0){ return AxisAlignedBB.getBoundingBox(0, 0, 0.75, 1, 0.15, 1); } - return super.getBlockBound(x, y, z, open); - }; + return super.getBlockBound(x, y, z, true); + } @Override public int timeToOpen() { return 60; - }; + } @Override public int[][] getDoorOpenRanges(){ @@ -838,7 +840,7 @@ public abstract class DoorDecl { public float getDoorRangeOpenTime(int ticks, int idx) { return getNormTime(ticks, 35, 40); - }; + } @Override public int[] getDimensions(){ @@ -876,7 +878,7 @@ public abstract class DoorDecl { } else { super.getTranslation(partName, openTicks, child, trans); } - }; + } @Override public String getOpenSoundEnd() { @@ -886,7 +888,7 @@ public abstract class DoorDecl { @Override public String getOpenSoundLoop() { return "hbm:door.garage_move"; - }; + } public float getSoundVolume(){ return 2; @@ -896,24 +898,24 @@ public abstract class DoorDecl { @SideOnly(Side.CLIENT) public double[][] getClippingPlanes() { return new double[][]{{0.0, 0.0, 1.0, 3.50001}, {0.0, 0.0, -1.0, 3.50001}}; - }; + } @Override public AxisAlignedBB getBlockBound(int x, int y, int z, boolean open) { if(!open) - return super.getBlockBound(x, y, z, open); + return super.getBlockBound(x, y, z, false); if(z == 3){ return AxisAlignedBB.getBoundingBox(0.4, 0, 0, 1, 1, 1); } else if(z == -3){ return AxisAlignedBB.getBoundingBox(0, 0, 0, 0.6, 1, 1); } - return super.getBlockBound(x, y, z, open); - }; + return super.getBlockBound(x, y, z, true); + } @Override public int timeToOpen() { return 60; - }; + } @Override public int[][] getDoorOpenRanges(){ @@ -923,7 +925,7 @@ public abstract class DoorDecl { @Override public int[] getDimensions() { return new int[]{5, 0, 0, 0, 3, 3}; - }; + } @Override @SideOnly(Side.CLIENT)