Removed explosion radius limitations. Explosion calculation optimized (reduced memory usage). One more detonator and explosive pack recipe. GT6 recipes for both chemical reactors and cryogenic distiller. Max stack size of muffle furnace is limited to 32. A lot of old features are removed.

4 files changed, 111 insertions, 326 deletions

diff --git a/ihl/model/FlexibleCableItemRender.java b/ihl/model/FlexibleCableItemRender.java
index 92b2036..02fc5f7 100644
--- a/ihl/model/FlexibleCableItemRender.java
+++ b/ihl/model/FlexibleCableItemRender.java
@@ -13,30 +13,30 @@ import net.minecraftforge.common.util.ForgeDirection;
 

 import org.lwjgl.opengl.GL11;

 

-public class FlexibleCableItemRender implements IItemRenderer

-{

+public class FlexibleCableItemRender implements IItemRenderer {

 	private ModelTube model;

 	private ModelTube modelThin;

 	private ModelTube modelLong;

 	private ModelTube modelThinLong;

-	private final int segmentsAmount=19;

-	private final float spiralStepAngle=1f;

-	private final float scale=1/32f;

+	private final int segmentsAmount = 19;

+	private final float spiralStepAngle = 1f;

+	private final float scale = 1 / 32f;

 	private final int[] displayListCache = new int[4];

-	

-public FlexibleCableItemRender()

-{

-	float vOffset=16f;

-	int longFragmensSize=24;

-	model=new ModelTube(null, 0, 0, -2F, -3F, -2F+vOffset, 4, 6, 4,0f, 0.5f,0.99f, ForgeDirection.UP);

-	modelLong=new ModelTube(null, 0, 0, -2F, -3F, -2F+vOffset, 4, longFragmensSize, 4,0f, 0f,0.99f, ForgeDirection.UP);

-	modelThin=new ModelTube(null, 0, 0, -1F, -3F, -1F+vOffset, 2, 6, 2,0f, 0.5f,0.99f, ForgeDirection.UP);

-	modelThinLong=new ModelTube(null, 0, 0, -1F, -3F, -1F+vOffset, 2, longFragmensSize, 2,0f, 0.5f,0.99f, ForgeDirection.UP);

-}

 

-@Override

-public boolean handleRenderType(ItemStack item, ItemRenderType type) {

-	switch (type) {

+	public FlexibleCableItemRender() {

+		float vOffset = 16f;

+		int longFragmensSize = 24;

+		model = new ModelTube(null, 0, 0, -2F, -3F, -2F + vOffset, 4, 6, 4, 0f, 0.5f, 0.99f, ForgeDirection.UP);

+		modelLong = new ModelTube(null, 0, 0, -2F, -3F, -2F + vOffset, 4, longFragmensSize, 4, 0f, 0f, 0.99f,

+				ForgeDirection.UP);

+		modelThin = new ModelTube(null, 0, 0, -1F, -3F, -1F + vOffset, 2, 6, 2, 0f, 0.5f, 0.99f, ForgeDirection.UP);

+		modelThinLong = new ModelTube(null, 0, 0, -1F, -3F, -1F + vOffset, 2, longFragmensSize, 2, 0f, 0.5f, 0.99f,

+				ForgeDirection.UP);

+	}

+

+	@Override

+	public boolean handleRenderType(ItemStack item, ItemRenderType type) {

+		switch (type) {

 		case ENTITY:

 			return true;

 		case EQUIPPED:

@@ -47,171 +47,136 @@ public boolean handleRenderType(ItemStack item, ItemRenderType type) {
 			return true;

 		default:

 			return false;

+		}

 	}

-}

 

-@Override

-public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {

-	return true;

-}

+	@Override

+	public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {

+		return true;

+	}

 

-@Override

-public void renderItem(ItemRenderType type, ItemStack stack, Object... data) {

-	GL11.glPushMatrix();

-    GL11.glEnable(GL11.GL_BLEND);

-    GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);

-	GL11.glScalef(1F, -1F, -1F);

-	switch (type) {

+	@Override

+	public void renderItem(ItemRenderType type, ItemStack stack, Object... data) {

+		GL11.glPushMatrix();

+		GL11.glEnable(GL11.GL_BLEND);

+		GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);

+		GL11.glScalef(1F, -1F, -1F);

+		switch (type) {

 		case ENTITY:

-		    GL11.glTranslatef(0,-1.0F,0);

-		    this.rendercoil(stack);

+			GL11.glTranslatef(0, -1.0F, 0);

+			this.rendercoil(stack);

 			break;

 		case EQUIPPED:

-		    GL11.glTranslatef(0.25F,-2F,-0.75F);

-		    this.rendercoil(stack);

-            break;

+			GL11.glTranslatef(0.25F, -2F, -0.75F);

+			this.rendercoil(stack);

+			break;

 		case EQUIPPED_FIRST_PERSON:

-		    RenderPlayer var25;

-		    EntityClientPlayerMP var3 = Minecraft.getMinecraft().thePlayer;

+			RenderPlayer var25;

+			EntityClientPlayerMP var3 = Minecraft.getMinecraft().thePlayer;

 			Minecraft.getMinecraft().getTextureManager().bindTexture(var3.getLocationSkin());

-			var25 = (RenderPlayer)RenderManager.instance.getEntityRenderObject(Minecraft.getMinecraft().thePlayer);

+			var25 = (RenderPlayer) RenderManager.instance.getEntityRenderObject(Minecraft.getMinecraft().thePlayer);

 			GL11.glRotatef(135F, 1.0F, 0.0F, 0.0F);

 			GL11.glRotatef(35F, 0.0F, 1.0F, 0.0F);

 			var25.renderFirstPersonArm(Minecraft.getMinecraft().thePlayer);

 			GL11.glRotatef(-35F, 0.0F, 1.0F, 0.0F);

 			GL11.glRotatef(-135F, 1.0F, 0.0F, 0.0F);

-		    GL11.glTranslatef(0.0F,0.2F,0F);

-		    GL11.glTranslatef(-0.25F,-1.0F,0F);

-		    this.rendercoil(stack);

+			GL11.glTranslatef(0.0F, 0.2F, 0F);

+			GL11.glTranslatef(-0.25F, -1.0F, 0F);

+			this.rendercoil(stack);

 			break;

 		case INVENTORY:

-			GL11.glTranslatef(0.0F,-0.2F,0F);

-		    this.rendercoil(stack);

+			GL11.glTranslatef(0.0F, -0.2F, 0F);

+			this.rendercoil(stack);

 			break;

 		default:

 		}

-    GL11.glPopMatrix();

+		GL11.glPopMatrix();

 	}

 

-	private void rendercoil(ItemStack stack)

-	{

+	private void rendercoil(ItemStack stack) {

 		int type = this.getCableType(stack);

-		if (this.displayListCache[type] != 0)

-		{

+		if (this.displayListCache[type] != 0) {

 			GL11.glCallList(displayListCache[type]);

-		}

-		else

-		{

-			

-		this.displayListCache[type]=GLAllocation.generateDisplayLists(1);

-       	GL11.glNewList(displayListCache[type], 4864 /*GL_COMPILE*/);

-       	

-	    GL11.glDisable(GL11.GL_TEXTURE_2D);

-	    int saMax=this.segmentsAmount*2+this.segmentsAmount/2;

-		for(int i=0; i<=saMax;i++)

-		{

-			GL11.glRotatef(-spiralStepAngle, 0f, 0f, 1f);

-			GL11.glRotatef(360f/this.segmentsAmount, 1f, 0f, 0f);

-			GL11.glTranslatef(0.004f,0f,0f);

-			GL11.glRotatef(spiralStepAngle, 0f, 0f, 1f);

-			if(((FlexibleCableItem)stack.getItem()).isDataCable)

-			{

-				GL11.glColor3f(1f,0.2f, 0f);

-			}

-			else

-			{

-				GL11.glColor3f(1f,1f, 1f);

-			}

-			if(i==0)

-			{

-				if(isNoInsulation(stack))

-				{

-					if(FlexibleCableItem.instance.yellowColoredWires.contains(FlexibleCableItem.instance.getMaterial(stack)))

-					{

-						GL11.glColor3f(1f,0.75f, 0.1f);

-					}

-					else

-					{

-						GL11.glColor3f(0.65f,0.65f, 0.67f);

-					}

-					this.modelThinLong.render(Tessellator.instance, scale);

-					

-				}

-				else

-				{

-					this.modelLong.render(Tessellator.instance, scale);

+		} else {

+

+			this.displayListCache[type] = GLAllocation.generateDisplayLists(1);

+			GL11.glNewList(displayListCache[type], 4864 /* GL_COMPILE */);

+

+			GL11.glDisable(GL11.GL_TEXTURE_2D);

+			int saMax = this.segmentsAmount * 2 + this.segmentsAmount / 2;

+			for (int i = 0; i <= saMax; i++) {

+				GL11.glRotatef(-spiralStepAngle, 0f, 0f, 1f);

+				GL11.glRotatef(360f / this.segmentsAmount, 1f, 0f, 0f);

+				GL11.glTranslatef(0.004f, 0f, 0f);

+				GL11.glRotatef(spiralStepAngle, 0f, 0f, 1f);

+				if (((FlexibleCableItem) stack.getItem()).isDataCable) {

+					GL11.glColor3f(1f, 0.2f, 0f);

+				} else {

+					GL11.glColor3f(1f, 1f, 1f);

 				}

-			}

-			else if(i==saMax)

-			{

-			    GL11.glTranslatef(0.0F,-0.55F,0F);

-				if(isNoInsulation(stack))

-				{

-					if(FlexibleCableItem.instance.yellowColoredWires.contains(FlexibleCableItem.instance.getMaterial(stack)))

-					{

-						GL11.glColor3f(1f,0.75f, 0.1f);

-					}

-					else

-					{

-						GL11.glColor3f(0.65f,0.65f, 0.67f);

+				if (i == 0) {

+					if (isNoInsulation(stack)) {

+						if (FlexibleCableItem.instance.yellowColoredWires

+								.contains(FlexibleCableItem.instance.getMaterial(stack))) {

+							GL11.glColor3f(1f, 0.75f, 0.1f);

+						} else {

+							GL11.glColor3f(0.65f, 0.65f, 0.67f);

+						}

+						this.modelThinLong.render(Tessellator.instance, scale);

+

+					} else {

+						this.modelLong.render(Tessellator.instance, scale);

 					}

-					this.modelThinLong.render(Tessellator.instance, scale);

-					

-				}

-				else

-				{

-					this.modelLong.render(Tessellator.instance, scale);

-				}

-			    GL11.glTranslatef(0.0F,0.55F,0F);

-			}

-			else

-			{

-				if(isNoInsulation(stack))

-				{

-					if(FlexibleCableItem.instance.yellowColoredWires.contains(FlexibleCableItem.instance.getMaterial(stack)))

-					{

-						GL11.glColor3f(1f,0.75f, 0.1f);

+				} else if (i == saMax) {

+					GL11.glTranslatef(0.0F, -0.55F, 0F);

+					if (isNoInsulation(stack)) {

+						if (FlexibleCableItem.instance.yellowColoredWires

+								.contains(FlexibleCableItem.instance.getMaterial(stack))) {

+							GL11.glColor3f(1f, 0.75f, 0.1f);

+						} else {

+							GL11.glColor3f(0.65f, 0.65f, 0.67f);

+						}

+						this.modelThinLong.render(Tessellator.instance, scale);

+

+					} else {

+						this.modelLong.render(Tessellator.instance, scale);

 					}

-					else

-					{

-						GL11.glColor3f(0.65f,0.65f, 0.67f);

+					GL11.glTranslatef(0.0F, 0.55F, 0F);

+				} else {

+					if (isNoInsulation(stack)) {

+						if (FlexibleCableItem.instance.yellowColoredWires

+								.contains(FlexibleCableItem.instance.getMaterial(stack))) {

+							GL11.glColor3f(1f, 0.75f, 0.1f);

+						} else {

+							GL11.glColor3f(0.65f, 0.65f, 0.67f);

+						}

+						this.modelThin.render(Tessellator.instance, scale);

+

+					} else {

+						this.model.render(Tessellator.instance, scale);

 					}

-					this.modelThin.render(Tessellator.instance, scale);

-					

-				}

-				else

-				{

-					this.model.render(Tessellator.instance, scale);

 				}

 			}

-		}

-	    GL11.glEnable(GL11.GL_TEXTURE_2D);

-       	GL11.glEndList();

+			GL11.glEnable(GL11.GL_TEXTURE_2D);

+			GL11.glEndList();

 		}

 	}

-	

-	private int getCableType(ItemStack stack) 

-	{

-		if(((FlexibleCableItem)stack.getItem()).isDataCable)

-		{

+

+	private int getCableType(ItemStack stack) {

+		if (((FlexibleCableItem) stack.getItem()).isDataCable) {

 			return 3;

-		}

-		else if(isNoInsulation(stack))

-		{

-			if(FlexibleCableItem.instance.yellowColoredWires.contains(FlexibleCableItem.instance.getMaterial(stack)))

-			{

+		} else if (isNoInsulation(stack)) {

+			if (FlexibleCableItem.instance.yellowColoredWires.contains(FlexibleCableItem.instance.getMaterial(stack))) {

 				return 1;

-			}

-			else

-			{

+			} else {

 				return 2;

 			}

 		}

 		return 0;

 	}

 

-	private boolean isNoInsulation(ItemStack stack)

-	{

-		return stack.stackTagCompound!=null && FlexibleCableItem.instance.getInsulationMaterial(stack).equals("null") && !((FlexibleCableItem)stack.getItem()).isDataCable;

+	private boolean isNoInsulation(ItemStack stack) {

+		return stack.stackTagCompound != null && FlexibleCableItem.instance.getInsulationMaterial(stack).equals("null")

+				&& !((FlexibleCableItem) stack.getItem()).isDataCable;

 	}

 }
\ No newline at end of file
diff --git a/ihl/model/IHLToolRenderer.java b/ihl/model/IHLToolRenderer.java
index a5ba87b..14e610b 100644
--- a/ihl/model/IHLToolRenderer.java
+++ b/ihl/model/IHLToolRenderer.java
@@ -33,21 +33,6 @@ public class IHLToolRenderer implements IItemRenderer
 	@Override

 	public void renderItem(ItemRenderType irt, ItemStack stack, Object... arg2) 

 	{

-		if(irt.equals(ItemRenderType.EQUIPPED_FIRST_PERSON))

-		{

-			if(stack.getItemDamage()==IHLTool.Type.Thermometer.itemDamage && stack.stackTagCompound!=null)

-			{

-				if(stack.stackTagCompound.getByte("showTemperature")>0)

-				{

-					RenderGameOverlayEventHandler.instance.temperature=stack.stackTagCompound.getLong("temperature");

-					RenderGameOverlayEventHandler.instance.displayCurrentGUITimer=2000;

-			    }

-				else

-				{

-					RenderGameOverlayEventHandler.instance.displayCurrentGUITimer=500;

-				}

-			}

-		}

 		IIcon icon = stack.getItem().getIcon(stack, 0);

         Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);

 		if(irt.equals(ItemRenderType.INVENTORY))

diff --git a/ihl/model/RenderGameOverlayEventHandler.java b/ihl/model/RenderGameOverlayEventHandler.java
deleted file mode 100644
index 6770c3d..0000000
--- a/ihl/model/RenderGameOverlayEventHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package ihl.model;

-

-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.event.RenderGameOverlayEvent;

-

-public class RenderGameOverlayEventHandler 

-{

-	

-	private static final ResourceLocation thermometerGUI = new ResourceLocation("ihl", "textures/gui/GUIThermometer.png");

-	public static RenderGameOverlayEventHandler instance;

-	public long temperature = 0;

-	public int displayCurrentGUITimer = 0;

-	

-	public RenderGameOverlayEventHandler()

-	{

-		instance=this;

-	}

-	

-	public void showThermometerTemperature(int temperature1, int displayCurrentGUITimer1)

-	{

-		

-	}

-	

-	@SubscribeEvent

-	public void renderGameOverlayEvent(RenderGameOverlayEvent.Pre/*.Post*/ event)

-	{

-		if(displayCurrentGUITimer>0)

-		{

-			displayCurrentGUITimer--;

-			Minecraft.getMinecraft().renderEngine.bindTexture(thermometerGUI);

-			IHLRenderUtils.instance.drawThermometerTemperature(temperature, displayCurrentGUITimer>500);

-		}

-	}

-

-}

diff --git a/ihl/model/SwitchBoxBlockRender.java b/ihl/model/SwitchBoxBlockRender.java
deleted file mode 100644
index 87c9fb9..0000000
--- a/ihl/model/SwitchBoxBlockRender.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package ihl.model;

-

-import ic2.core.Ic2Items;

-import ihl.datanet.RedstoneSignalConverterTileEntity;

-import ihl.items_blocks.MachineBaseBlock;

-import ihl.utils.IHLUtils;

-

-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 cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;

-import cpw.mods.fml.client.registry.RenderingRegistry;

-

-public class SwitchBoxBlockRender implements ISimpleBlockRenderingHandler

-{

-    public static int renderId;

-    

-    public SwitchBoxBlockRender()

-    {

-    	renderId = RenderingRegistry.getNextAvailableRenderId();

-    }

-

-	@Override

-	public int getRenderId() 

-	{

-		return renderId;

-	}

-

-	@Override

-	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderblocks) 

-	{

-        Tessellator tessellator = Tessellator.instance;

-        block.setBlockBoundsForItemRender();

-        renderblocks.setRenderBoundsFromBlock(block);

-        GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);

-        GL11.glTranslatef(-0.5F, -0.5F, -0.5F);

-        tessellator.startDrawingQuads();

-        tessellator.setNormal(0.0F, -1.0F, 0.0F);

-        renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 0, metadata));

-        tessellator.draw();

-        tessellator.startDrawingQuads();

-        tessellator.setNormal(0.0F, 1.0F, 0.0F);

-        renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 1, metadata));

-        tessellator.draw();

-        tessellator.startDrawingQuads();

-        tessellator.setNormal(0.0F, 0.0F, -1.0F);

-        renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 2, metadata));

-        tessellator.draw();

-        tessellator.startDrawingQuads();

-        tessellator.setNormal(0.0F, 0.0F, 1.0F);

-        renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 3, metadata));

-        tessellator.draw();

-        tessellator.startDrawingQuads();

-        tessellator.setNormal(-1.0F, 0.0F, 0.0F);

-        renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 4, metadata));

-        tessellator.draw();

-        tessellator.startDrawingQuads();

-        tessellator.setNormal(1.0F, 0.0F, 0.0F);

-        renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 5, metadata));

-        tessellator.draw();

-        GL11.glTranslatef(0.5F, 0.5F, 0.5F);

-	}

-

-	@Override

-	public boolean renderWorldBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta, RenderBlocks blockRenderer) 

-	{

-		TileEntity te = blockAccess.getTileEntity(x, y, z);

-	    IIcon emptyIcon,emitterIcon,sensorIcon = block.getBlockTextureFromSide(0);

-	    emptyIcon=emitterIcon=sensorIcon;

-	    if(block instanceof MachineBaseBlock)

-	    {

-	       	emptyIcon = ((MachineBaseBlock)block).getAdditionalIconsForBlockRenderer(0);

-	       	emitterIcon = ((MachineBaseBlock)block).getAdditionalIconsForBlockRenderer(1);

-	       	sensorIcon = ((MachineBaseBlock)block).getAdditionalIconsForBlockRenderer(2);

-	    }

-	    IIcon[] sideToTypes = new IIcon[6];

-		if(te instanceof RedstoneSignalConverterTileEntity)

-		{

-			RedstoneSignalConverterTileEntity rscte = (RedstoneSignalConverterTileEntity) te;

-			for(int side=0;side<sideToTypes.length;side++)

-			{

-				if(rscte.sensorEmitterSlots.get(side)==null)

-				{

-					sideToTypes[side]=emptyIcon;

-				}

-				else if(IHLUtils.isItemStacksIsEqual(rscte.sensorEmitterSlots.get(side), Ic2Items.detectorCableItem, true)) 

-				{

-					sideToTypes[side]=emitterIcon;

-				}

-				else if(IHLUtils.isItemStacksIsEqual(rscte.sensorEmitterSlots.get(side), Ic2Items.splitterCableItem, true)) 

-				{

-					sideToTypes[side]=sensorIcon;

-				}

-				else

-				{

-					sideToTypes[side]=emptyIcon;

-				}

-			}

-		}

-		blockRenderer.setRenderBounds(0d, 0d, 0d, 1d, 1d, 1d);

-        Tessellator var5 = Tessellator.instance;

-        var5.setBrightness(block.getMixedBrightnessForBlock(blockAccess, x, y, z));

-        int var6 = block.colorMultiplier(blockAccess, x, y, z);

-        float var7 = (var6 >> 16 & 255) / 255.0F;

-        float var8 = (var6 >> 8 & 255) / 255.0F;

-        float var9 = (var6 & 255) / 255.0F;

-        var5.setColorOpaque_F(var7, var8, var9);

-        blockRenderer.renderFaceXPos(block, x, y, z, sideToTypes[4]);

-        blockRenderer.renderFaceXNeg(block, x, y, z, sideToTypes[5]);

-        blockRenderer.renderFaceZPos(block, x, y, z, sideToTypes[2]);

-        blockRenderer.renderFaceZNeg(block, x, y, z, sideToTypes[3]);

-        blockRenderer.renderFaceYPos(block, x, y, z, sideToTypes[0]);

-        blockRenderer.renderFaceYNeg(block, x, y, z, sideToTypes[1]);

-        return true;

-	}

-

-	@Override

-	public boolean shouldRender3DInInventory(int arg0) 

-	{

-		return true;

-	}

-}