From 8ed8c659da9496bf49fec94c049b0abae21746a8 Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Wed, 24 May 2017 20:13:22 +0300 Subject: fixing bugs with Iron workbench and fractionator --- .../CableHolderSelectionBoxSpecialRenderer.java | 9 +++-- ihl/model/FlexibleCableItemRender.java | 9 +++-- ihl/model/FluidRenderer.java | 10 +++--- ihl/model/IHLBlockRenderer.java | 9 +++-- ihl/model/IHLToolRenderer.java | 1 - ihl/model/ImpregnatingMachineBlockRender.java | 42 +++++++++------------- ihl/model/IronWorkbenchBlockRender.java | 8 ++--- ihl/model/RectifierTransformerUnitBlockRender.java | 13 ++++--- ...TransformerUnitSelectionBoxSpecialRenderer.java | 9 +++-- ihl/model/RefluxCondenserBlockRender.java | 13 ++++--- ihl/model/UniversalTileRender.java | 10 +++--- 11 files changed, 59 insertions(+), 74 deletions(-) (limited to 'ihl/model') diff --git a/ihl/model/CableHolderSelectionBoxSpecialRenderer.java b/ihl/model/CableHolderSelectionBoxSpecialRenderer.java index d06f050..e878a78 100644 --- a/ihl/model/CableHolderSelectionBoxSpecialRenderer.java +++ b/ihl/model/CableHolderSelectionBoxSpecialRenderer.java @@ -1,5 +1,9 @@ package ihl.model; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ihl.flexible_cable.AnchorTileEntity; import ihl.interfaces.ISelectionBoxSpecialRenderer; import ihl.utils.IHLUtils; @@ -11,11 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(value=Side.CLIENT) public class CableHolderSelectionBoxSpecialRenderer implements ISelectionBoxSpecialRenderer { diff --git a/ihl/model/FlexibleCableItemRender.java b/ihl/model/FlexibleCableItemRender.java index fab019c..e11a253 100644 --- a/ihl/model/FlexibleCableItemRender.java +++ b/ihl/model/FlexibleCableItemRender.java @@ -1,5 +1,9 @@ package ihl.model; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ihl.items_blocks.FlexibleCableItem; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; @@ -11,11 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(value=Side.CLIENT) public class FlexibleCableItemRender implements IItemRenderer { private ModelTube model; diff --git a/ihl/model/FluidRenderer.java b/ihl/model/FluidRenderer.java index 87b1abe..674e4ea 100644 --- a/ihl/model/FluidRenderer.java +++ b/ihl/model/FluidRenderer.java @@ -15,17 +15,17 @@ package ihl.model; import java.util.HashMap; import java.util.Map; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GLAllocation; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; +import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/ihl/model/IHLBlockRenderer.java b/ihl/model/IHLBlockRenderer.java index 2244ab7..81efbd9 100644 --- a/ihl/model/IHLBlockRenderer.java +++ b/ihl/model/IHLBlockRenderer.java @@ -1,19 +1,18 @@ package ihl.model; -import ihl.handpump.BlockWithCoordinates; - import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import ihl.handpump.BlockWithCoordinates; +import net.minecraft.client.renderer.GLAllocation; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.ChunkCache; import net.minecraft.world.World; diff --git a/ihl/model/IHLToolRenderer.java b/ihl/model/IHLToolRenderer.java index dd64731..31758b2 100644 --- a/ihl/model/IHLToolRenderer.java +++ b/ihl/model/IHLToolRenderer.java @@ -1,6 +1,5 @@ package ihl.model; -import ihl.items_blocks.IHLTool; import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; diff --git a/ihl/model/ImpregnatingMachineBlockRender.java b/ihl/model/ImpregnatingMachineBlockRender.java index b36f3bd..2602fd0 100644 --- a/ihl/model/ImpregnatingMachineBlockRender.java +++ b/ihl/model/ImpregnatingMachineBlockRender.java @@ -1,17 +1,18 @@ package ihl.model; -import ihl.items_blocks.MachineBaseBlock; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ihl.items_blocks.MachineBaseBlock; +import ihl.items_blocks.MachineBaseBlock.MachineType; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(value=Side.CLIENT) public class ImpregnatingMachineBlockRender implements ISimpleBlockRenderingHandler @@ -32,6 +33,7 @@ public class ImpregnatingMachineBlockRender implements ISimpleBlockRenderingHand @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderblocks) { + MachineBaseBlock blockmb = (MachineBaseBlock) block; Tessellator tessellator = Tessellator.instance; block.setBlockBoundsForItemRender(); renderblocks.setRenderBoundsFromBlock(block); @@ -62,11 +64,7 @@ public class ImpregnatingMachineBlockRender implements ISimpleBlockRenderingHand renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 5, metadata)); tessellator.draw(); float var11 = 0.0625F; - IIcon innerSideIcon = block.getBlockTextureFromSide(0); - if(block instanceof MachineBaseBlock) - { - innerSideIcon = ((MachineBaseBlock)block).getAdditionalIconsForBlockRenderer(0); - } + IIcon innerSideIcon = blockmb.getAdditionalIconsForBlockRenderer(0); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 1.0F - var11, innerSideIcon); @@ -83,13 +81,11 @@ public class ImpregnatingMachineBlockRender implements ISimpleBlockRenderingHand tessellator.setNormal(1.0F, 0.0F, 0.0F); renderblocks.renderFaceXPos(block, var11-1.0F, 0.0D, 0.0D, innerSideIcon); tessellator.draw(); - IIcon innerBottomIcon = block.getBlockTextureFromSide(0); - if(block instanceof MachineBaseBlock) - { - innerBottomIcon = ((MachineBaseBlock)block).getAdditionalIconsForBlockRenderer(1); - } + IIcon innerBottomIcon = blockmb.getAdditionalIconsForBlockRenderer(1); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); + if(blockmb.type.equals(MachineType.SolarEvaporator)) + var11 = 0.5625f; renderblocks.renderFaceYPos(block, 0.0D, var11-1.0F, 0.0D, innerBottomIcon); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); @@ -98,6 +94,7 @@ public class ImpregnatingMachineBlockRender implements ISimpleBlockRenderingHand @Override public boolean renderWorldBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta, RenderBlocks blockRenderer) { + MachineBaseBlock blockmb = (MachineBaseBlock) block; blockRenderer.renderStandardBlock(block, x, y, z); Tessellator var5 = Tessellator.instance; var5.setBrightness(block.getMixedBrightnessForBlock(blockAccess, x, y, z)); @@ -107,21 +104,16 @@ public class ImpregnatingMachineBlockRender implements ISimpleBlockRenderingHand float var9 = (var6 & 255) / 255.0F; float var11; var5.setColorOpaque_F(var7, var8, var9); - IIcon innerSideIcon = block.getBlockTextureFromSide(0); - if(block instanceof MachineBaseBlock) - { - innerSideIcon = ((MachineBaseBlock)block).getAdditionalIconsForBlockRenderer(0); - } + IIcon innerSideIcon = blockmb.getAdditionalIconsForBlockRenderer(0); var11 = 0.0625F; + blockRenderer.renderFaceXPos(block, x - 1.0F + var11, y, z, innerSideIcon); blockRenderer.renderFaceXNeg(block, x + 1.0F - var11, y, z, innerSideIcon); blockRenderer.renderFaceZPos(block, x, y, z - 1.0F + var11, innerSideIcon); blockRenderer.renderFaceZNeg(block, x, y, z + 1.0F - var11, innerSideIcon); - IIcon innerBottomIcon = block.getBlockTextureFromSide(0); - if(block instanceof MachineBaseBlock) - { - innerBottomIcon = ((MachineBaseBlock)block).getAdditionalIconsForBlockRenderer(1); - } + IIcon innerBottomIcon = blockmb.getAdditionalIconsForBlockRenderer(1); + if(blockmb.type.equals(MachineType.SolarEvaporator)) + var11 = 0.5625f; blockRenderer.renderFaceYPos(block, x, y - 1.0F + var11, z, innerBottomIcon); return true; } diff --git a/ihl/model/IronWorkbenchBlockRender.java b/ihl/model/IronWorkbenchBlockRender.java index 7e986c9..1af81cf 100644 --- a/ihl/model/IronWorkbenchBlockRender.java +++ b/ihl/model/IronWorkbenchBlockRender.java @@ -2,14 +2,14 @@ package ihl.model; import org.lwjgl.opengl.GL11; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.IBlockAccess; @SideOnly(value=Side.CLIENT) public class IronWorkbenchBlockRender implements ISimpleBlockRenderingHandler diff --git a/ihl/model/RectifierTransformerUnitBlockRender.java b/ihl/model/RectifierTransformerUnitBlockRender.java index 567745f..9f45ee4 100644 --- a/ihl/model/RectifierTransformerUnitBlockRender.java +++ b/ihl/model/RectifierTransformerUnitBlockRender.java @@ -1,10 +1,13 @@ package ihl.model; -import ic2.api.tile.IWrenchable; -import ihl.utils.IHLRenderUtils; - import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ic2.api.tile.IWrenchable; +import ihl.utils.IHLRenderUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -12,10 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(value=Side.CLIENT) public class RectifierTransformerUnitBlockRender implements ISimpleBlockRenderingHandler diff --git a/ihl/model/RectifierTransformerUnitSelectionBoxSpecialRenderer.java b/ihl/model/RectifierTransformerUnitSelectionBoxSpecialRenderer.java index f8a5340..4ce866b 100644 --- a/ihl/model/RectifierTransformerUnitSelectionBoxSpecialRenderer.java +++ b/ihl/model/RectifierTransformerUnitSelectionBoxSpecialRenderer.java @@ -1,5 +1,9 @@ package ihl.model; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import ihl.flexible_cable.RectifierTransformerUnitTileEntity; import ihl.interfaces.ISelectionBoxSpecialRenderer; import net.minecraft.client.Minecraft; @@ -9,11 +13,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(value=Side.CLIENT) public class RectifierTransformerUnitSelectionBoxSpecialRenderer implements ISelectionBoxSpecialRenderer { diff --git a/ihl/model/RefluxCondenserBlockRender.java b/ihl/model/RefluxCondenserBlockRender.java index ec70021..c9021b9 100644 --- a/ihl/model/RefluxCondenserBlockRender.java +++ b/ihl/model/RefluxCondenserBlockRender.java @@ -1,10 +1,13 @@ package ihl.model; -import ic2.api.tile.IWrenchable; -import ihl.utils.IHLRenderUtils; - import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ic2.api.tile.IWrenchable; +import ihl.utils.IHLRenderUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -12,10 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(value=Side.CLIENT) public class RefluxCondenserBlockRender implements ISimpleBlockRenderingHandler diff --git a/ihl/model/UniversalTileRender.java b/ihl/model/UniversalTileRender.java index 049d465..d3cb4c6 100644 --- a/ihl/model/UniversalTileRender.java +++ b/ihl/model/UniversalTileRender.java @@ -1,9 +1,4 @@ package ihl.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; @@ -11,6 +6,11 @@ import cpw.mods.fml.relauncher.SideOnly; import ic2.api.tile.IWrenchable; import ihl.IHLModInfo; import ihl.flexible_cable.IronWorkbenchModel; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; public class UniversalTileRender extends TileEntitySpecialRenderer{ private ModelBase model = new IronWorkbenchModel(); -- cgit v1.2.3