summaryrefslogtreecommitdiff
path: root/ihl/model
diff options
context:
space:
mode:
Diffstat (limited to 'ihl/model')
-rw-r--r--ihl/model/CableHolderSelectionBoxSpecialRenderer.java9
-rw-r--r--ihl/model/FlexibleCableItemRender.java9
-rw-r--r--ihl/model/IHLModelRenderer.java14
-rw-r--r--ihl/model/IHLToolRenderer.java1
-rw-r--r--ihl/model/IronWorkbenchBlockRender.java7
-rw-r--r--ihl/model/ModelTube.java4
-rw-r--r--ihl/model/MultiMetaBlockRender.java1
-rw-r--r--ihl/model/RectifierTransformerUnitBlockRender.java1
-rw-r--r--ihl/model/RectifierTransformerUnitSelectionBoxSpecialRenderer.java16
-rw-r--r--ihl/model/RenderGameOverlayEventHandler.java1
-rw-r--r--ihl/model/SwitchBoxBlockRender.java2
11 files changed, 17 insertions, 48 deletions
diff --git a/ihl/model/CableHolderSelectionBoxSpecialRenderer.java b/ihl/model/CableHolderSelectionBoxSpecialRenderer.java
index 9bb22f1..7d0de61 100644
--- a/ihl/model/CableHolderSelectionBoxSpecialRenderer.java
+++ b/ihl/model/CableHolderSelectionBoxSpecialRenderer.java
@@ -15,7 +15,8 @@ import org.lwjgl.opengl.GL11;
public class CableHolderSelectionBoxSpecialRenderer implements ISelectionBoxSpecialRenderer
{
- public void drawSelectionBox(EntityPlayer player, ItemStack currentItem, MovingObjectPosition movingObjectPosition, float partialTick)
+ @Override
+ public void drawSelectionBox(EntityPlayer player, ItemStack currentItem, MovingObjectPosition movingObjectPosition, float partialTick)
{
AnchorTileEntity ate = (AnchorTileEntity) Minecraft.getMinecraft().theWorld.getTileEntity(movingObjectPosition.blockX, movingObjectPosition.blockY, movingObjectPosition.blockZ);
short facing = IHLUtils.getFacingFromPlayerView(player, true);
@@ -26,9 +27,9 @@ public class CableHolderSelectionBoxSpecialRenderer implements ISelectionBoxSpec
GL11.glLineWidth(2.0F);
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glDepthMask(false);
- double offsetX = player.lastTickPosX + (player.posX - player.lastTickPosX) * (double)partialTick;
- double offsetY = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double)partialTick;
- double offsetZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double)partialTick;
+ double offsetX = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTick;
+ double offsetY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTick;
+ double offsetZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTick;
double size=0.1d;
RenderGlobal.drawOutlinedBoundingBox(AxisAlignedBB.getBoundingBox(portPos[0]-size, portPos[1]-size, portPos[2]-size, portPos[0]+size, portPos[1]+size, portPos[2]+size).getOffsetBoundingBox(-offsetX, -offsetY, -offsetZ), -1);
GL11.glDepthMask(true);
diff --git a/ihl/model/FlexibleCableItemRender.java b/ihl/model/FlexibleCableItemRender.java
index 86b53ee..92b2036 100644
--- a/ihl/model/FlexibleCableItemRender.java
+++ b/ihl/model/FlexibleCableItemRender.java
@@ -1,22 +1,13 @@
package ihl.model;
-import ic2.core.block.RenderBlockDefault;
-import ihl.datanet.DataCableItem;
import ihl.items_blocks.FlexibleCableItem;
-import ihl.items_blocks.IHLItemBlock;
-import ihl.model.IHLModelRenderer;
-import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.GLAllocation;
-import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.common.util.ForgeDirection;
diff --git a/ihl/model/IHLModelRenderer.java b/ihl/model/IHLModelRenderer.java
index c9b1b77..a9168f8 100644
--- a/ihl/model/IHLModelRenderer.java
+++ b/ihl/model/IHLModelRenderer.java
@@ -39,8 +39,8 @@ public class IHLModelRenderer {
/** Hides the model. */
public boolean isHidden;
- public List cubeList;
- public List childModels;
+ public List<Object> cubeList;
+ public List<ModelRenderer> childModels;
public final String boxName;
private ModelBase baseModel;
public float offsetX;
@@ -48,14 +48,14 @@ public class IHLModelRenderer {
public float offsetZ;
public boolean drawFromInside=false;
- private static final String __OBFID = "CL_00000874";
-
- public IHLModelRenderer(ModelBase par1ModelBase, String par2Str)
+
+ @SuppressWarnings("unchecked")
+ public IHLModelRenderer(ModelBase par1ModelBase, String par2Str)
{
this.textureWidth = 64.0F;
this.textureHeight = 32.0F;
this.showModel = true;
- this.cubeList = new ArrayList();
+ this.cubeList = new ArrayList<Object>();
this.baseModel = par1ModelBase;
par1ModelBase.boxList.add(this);
this.boxName = par2Str;
@@ -80,7 +80,7 @@ public class IHLModelRenderer {
{
if (this.childModels == null)
{
- this.childModels = new ArrayList();
+ this.childModels = new ArrayList<ModelRenderer>();
}
this.childModels.add(par1ModelRenderer);
diff --git a/ihl/model/IHLToolRenderer.java b/ihl/model/IHLToolRenderer.java
index 6f2a30f..a5ba87b 100644
--- a/ihl/model/IHLToolRenderer.java
+++ b/ihl/model/IHLToolRenderer.java
@@ -9,7 +9,6 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.IItemRenderer;
public class IHLToolRenderer implements IItemRenderer
diff --git a/ihl/model/IronWorkbenchBlockRender.java b/ihl/model/IronWorkbenchBlockRender.java
index 43793ed..b5bdec3 100644
--- a/ihl/model/IronWorkbenchBlockRender.java
+++ b/ihl/model/IronWorkbenchBlockRender.java
@@ -1,18 +1,11 @@
package ihl.model;
-import ic2.api.tile.IWrenchable;
-import ihl.items_blocks.MachineBaseBlock;
-import ihl.utils.IHLRenderUtils;
-
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.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;
diff --git a/ihl/model/ModelTube.java b/ihl/model/ModelTube.java
index b513c74..d4dcb08 100644
--- a/ihl/model/ModelTube.java
+++ b/ihl/model/ModelTube.java
@@ -1,9 +1,5 @@
package ihl.model;
-import ihl.handpump.BlockWithCoordinates;
-
-import java.util.Iterator;
-
import org.lwjgl.opengl.GL11;
import net.minecraft.client.model.PositionTextureVertex;
diff --git a/ihl/model/MultiMetaBlockRender.java b/ihl/model/MultiMetaBlockRender.java
index 196cb99..c995989 100644
--- a/ihl/model/MultiMetaBlockRender.java
+++ b/ihl/model/MultiMetaBlockRender.java
@@ -64,7 +64,6 @@ public class MultiMetaBlockRender implements ISimpleBlockRenderingHandler
float var7 = (var6 >> 16 & 255) / 255.0F;
float var8 = (var6 >> 8 & 255) / 255.0F;
float var9 = (var6 & 255) / 255.0F;
- float var11;
var5.setColorOpaque_F(var7, var8, var9);
return true;
}
diff --git a/ihl/model/RectifierTransformerUnitBlockRender.java b/ihl/model/RectifierTransformerUnitBlockRender.java
index 081db7a..27d8ea9 100644
--- a/ihl/model/RectifierTransformerUnitBlockRender.java
+++ b/ihl/model/RectifierTransformerUnitBlockRender.java
@@ -1,7 +1,6 @@
package ihl.model;
import ic2.api.tile.IWrenchable;
-import ihl.items_blocks.MachineBaseBlock;
import ihl.utils.IHLRenderUtils;
import org.lwjgl.opengl.GL11;
diff --git a/ihl/model/RectifierTransformerUnitSelectionBoxSpecialRenderer.java b/ihl/model/RectifierTransformerUnitSelectionBoxSpecialRenderer.java
index 6e3e944..4cd52ea 100644
--- a/ihl/model/RectifierTransformerUnitSelectionBoxSpecialRenderer.java
+++ b/ihl/model/RectifierTransformerUnitSelectionBoxSpecialRenderer.java
@@ -1,30 +1,24 @@
package ihl.model;
-import ic2.api.tile.IWrenchable;
-import ihl.flexible_cable.AnchorTileEntity;
import ihl.flexible_cable.RectifierTransformerUnitTileEntity;
import ihl.interfaces.ISelectionBoxSpecialRenderer;
-import ihl.utils.IHLUtils;
import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ActiveRenderInfo;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.RenderGlobal;
-import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MovingObjectPosition;
import org.lwjgl.opengl.GL11;
public class RectifierTransformerUnitSelectionBoxSpecialRenderer implements ISelectionBoxSpecialRenderer
{
- public void drawSelectionBox(EntityPlayer player, ItemStack currentItem, MovingObjectPosition movingObjectPosition, float partialTick)
+ @Override
+ public void drawSelectionBox(EntityPlayer player, ItemStack currentItem, MovingObjectPosition movingObjectPosition, float partialTick)
{
- double offsetX = player.lastTickPosX + (player.posX - player.lastTickPosX) * (double)partialTick;
- double offsetY = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double)partialTick;
- double offsetZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double)partialTick;
+ double offsetX = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTick;
+ double offsetY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTick;
+ double offsetZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTick;
RectifierTransformerUnitTileEntity tile = (RectifierTransformerUnitTileEntity) Minecraft.getMinecraft().theWorld.getTileEntity(movingObjectPosition.blockX, movingObjectPosition.blockY, movingObjectPosition.blockZ);
if(tile!=null && tile.getWorldObj() != null)
{
diff --git a/ihl/model/RenderGameOverlayEventHandler.java b/ihl/model/RenderGameOverlayEventHandler.java
index e2bbde4..6770c3d 100644
--- a/ihl/model/RenderGameOverlayEventHandler.java
+++ b/ihl/model/RenderGameOverlayEventHandler.java
@@ -4,7 +4,6 @@ import ihl.utils.IHLRenderUtils;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.GuiIngameForge;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
public class RenderGameOverlayEventHandler
diff --git a/ihl/model/SwitchBoxBlockRender.java b/ihl/model/SwitchBoxBlockRender.java
index 93f63a7..87c9fb9 100644
--- a/ihl/model/SwitchBoxBlockRender.java
+++ b/ihl/model/SwitchBoxBlockRender.java
@@ -109,9 +109,7 @@ public class SwitchBoxBlockRender implements ISimpleBlockRenderingHandler
float var7 = (var6 >> 16 & 255) / 255.0F;
float var8 = (var6 >> 8 & 255) / 255.0F;
float var9 = (var6 & 255) / 255.0F;
- float var11;
var5.setColorOpaque_F(var7, var8, var9);
- var11 = 0.0625F;
blockRenderer.renderFaceXPos(block, x, y, z, sideToTypes[4]);
blockRenderer.renderFaceXNeg(block, x, y, z, sideToTypes[5]);
blockRenderer.renderFaceZPos(block, x, y, z, sideToTypes[2]);
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-10 01:51:18 +0000