fixing bugs with Iron workbench and fractionator

Foghrye4 · May 24, 2017 · 8ed8c65 · 8ed8c65
1 parent b67ac61
commit 8ed8c65
Show file tree

Hide file tree

Showing 191 changed files with 1,142 additions and 859 deletions.
diff --git a/assets/ihl/lang/en_US.lang b/assets/ihl/lang/en_US.lang
@@ -2,6 +2,7 @@ language.name=HAYO
 language.region=US
 language.code=en_US
 
+ihl.solarEvaporator=Solar evaporator
 ihl.achesonFurnace=Acheson furnace
 ihl.chemicalReactor=Chemical reactor
 ihl.crucible=Crucible
@@ -56,9 +57,10 @@ dustSodiumFormate.name=Sodium formate
 dustMercuryChloride.name=Mercury chloride
 dustMercuryFulminate.name=Mercury fulminate
 dustCalciumAcetate.name=Calcium acetate
-itemCellMethanol=Methanol cell
-itemCellNitroGlycerin=Nitro glycerin cell
-
+itemCellMethanol.name=Methanol cell
+itemCellNitroGlycerin.name=Nitro glycerin cell
+itemCellAmmonia.name=Ammonia cell
+itemCellGlycerol.name=Glycerol
 item.skull.name=Wailer remains
 item.guidebook.name=IHL manual
 item.handpump.name=IHL handpump
@@ -70,6 +72,7 @@ item.handpump_discharged.name=IHL handpump
 tile.boneBlock.name=Bone pillar
 entity.LostHead.name=Wailer
 tile.ihlExplosive.name=Explosive pack
+tile.solarEvaporator.name=Solar evaporator
 tile.evaporatorBlock.name=Evaporator
 tile.electricEvaporatorBlock.name=Electric evaporator
 tile.sackBlock.name=Rubber tree sap gathering sack

diff --git a/assets/ihl/textures/blocks/fluidMethanolFlowing.xcf b/assets/ihl/textures/blocks/fluidMethanolFlowing.xcf
diff --git a/assets/ihl/textures/blocks/solarEvaporatorSide.png b/assets/ihl/textures/blocks/solarEvaporatorSide.png
diff --git a/assets/ihl/textures/gui/GUISolarEvaporator.png b/assets/ihl/textures/gui/GUISolarEvaporator.png
diff --git a/assets/ihl/textures/items/itemCellAmmonia.png b/assets/ihl/textures/items/itemCellAmmonia.png
diff --git a/ihl/ClientProxy.java b/ihl/ClientProxy.java
@@ -7,6 +7,15 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.network.FMLNetworkEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.network.internal.FMLProxyPacket;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import ihl.crop_harvestors.BlobEntityFX;
 import ihl.crop_harvestors.BlobEntityFX.FluidType;
 import ihl.crop_harvestors.BlobRenderFX;
@@ -24,8 +33,8 @@
 import ihl.flexible_cable.BatterySwitchUnitModel;
 import ihl.flexible_cable.BatterySwitchUnitTileEntity;
 import ihl.flexible_cable.BlastEntityFX;
-import ihl.flexible_cable.IronWorkbenchTileEntity;
 import ihl.flexible_cable.IronWorkbenchRender;
+import ihl.flexible_cable.IronWorkbenchTileEntity;
 import ihl.flexible_cable.NodeEntity;
 import ihl.flexible_cable.NodeRender;
 import ihl.flexible_cable.RectifierTransformerUnitTileEntity;
@@ -34,8 +43,16 @@
 import ihl.items_blocks.FlexibleCableItem;
 import ihl.items_blocks.IHLTool;
 import ihl.items_blocks.MachineBaseBlock.MachineType;
-import ihl.model.*;
-import ihl.processing.chemistry.DosingPumpTileEntity;
+import ihl.model.CableHolderSelectionBoxSpecialRenderer;
+import ihl.model.FlexibleCableItemRender;
+import ihl.model.IHLBlockRenderer;
+import ihl.model.IHLToolRenderer;
+import ihl.model.ImpregnatingMachineBlockRender;
+import ihl.model.IronWorkbenchBlockRender;
+import ihl.model.RectifierTransformerUnitBlockRender;
+import ihl.model.RectifierTransformerUnitSelectionBoxSpecialRenderer;
+import ihl.model.RefluxCondenserBlockRender;
+import ihl.model.UniversalTileRender;
 import ihl.processing.chemistry.ElectrolysisBathModel;
 import ihl.processing.chemistry.ElectrolysisBathTileEntity;
 import ihl.processing.chemistry.FractionatorBottomModel;
@@ -50,6 +67,7 @@
 import ihl.processing.chemistry.LoomTileEntity;
 import ihl.processing.chemistry.RefluxCondenserModel;
 import ihl.processing.chemistry.RefluxCondenserTileEntity;
+import ihl.processing.chemistry.SolarEvaporatorTileEntity;
 import ihl.processing.metallurgy.CoilerModel;
 import ihl.processing.metallurgy.CoilerRender;
 import ihl.processing.metallurgy.CoilerTileEntity;
@@ -96,7 +114,6 @@
 import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -107,15 +124,6 @@
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.network.FMLNetworkEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.network.internal.FMLProxyPacket;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 @SideOnly(value = Side.CLIENT)
 public class ClientProxy extends ServerProxy {
@@ -137,6 +145,7 @@ public void load() throws ParserConfigurationException {
 		this.renderUtils = new IHLRenderUtils();
 		MinecraftForge.EVENT_BUS.register(this.renderUtils);
 		registerBlockHandler(new ImpregnatingMachineBlockRender(), MachineType.BronzeTub);
+		registerBlockHandler(new ImpregnatingMachineBlockRender(), MachineType.SolarEvaporator);
 		registerBlockHandler(new RefluxCondenserBlockRender(), MachineType.RefluxCondenser);
 		registerBlockHandler(new RectifierTransformerUnitBlockRender(), MachineType.RectifierTransformerUnit);
 		registerBlockHandler(new IronWorkbenchBlockRender(), MachineType.IronWorkbench);
@@ -153,7 +162,9 @@ public void load() throws ParserConfigurationException {
 		ClientRegistry.bindTileEntitySpecialRenderer(LoomTileEntity.class, new UniversalTileRender(new LoomModel(),
 				new ResourceLocation(IHLModInfo.MODID + ":textures/blocks/detonationSprayingMachine.png")));
 		ClientRegistry.bindTileEntitySpecialRenderer(ImpregnatingMachineTileEntity.class,
-				new ImpregnatingMachineRender());
+				new ImpregnatingMachineRender(900f));
+		ClientRegistry.bindTileEntitySpecialRenderer(SolarEvaporatorTileEntity.class,
+				new ImpregnatingMachineRender(900f));
 		ClientRegistry.bindTileEntitySpecialRenderer(DetonationSprayingMachineTileEntity.class,
 				new DetonationSprayingMachineRender());
 		ClientRegistry.bindTileEntitySpecialRenderer(CoilerTileEntity.class, new CoilerRender());

diff --git a/ihl/IHLMod.java b/ihl/IHLMod.java
@@ -13,6 +13,16 @@
 import org.apache.logging.log4j.Logger;
 
 import codechicken.nei.NEIModContainer;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.IFuelHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.registry.EntityRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
 import gregapi.data.IL;
 import gregapi.data.MT;
 import gregapi.data.OP;
@@ -32,6 +42,9 @@
 import ic2.api.recipe.Recipes;
 import ic2.core.Ic2Items;
 import ic2.core.util.StackUtil;
+import ihl.crop_harvestors.RubberTreeBlock;
+import ihl.crop_harvestors.SackBlock;
+import ihl.crop_harvestors.SackTileEntity;
 import ihl.enviroment.LaserHitMirrorEventHandler;
 import ihl.enviroment.MirrorBlock;
 import ihl.explosion.ChunkAndWorldLoadEventHandler;
@@ -85,9 +98,6 @@
 import ihl.processing.metallurgy.VulcanizationExtrudingMoldTileEntity;
 import ihl.processing.metallurgy.WireMillTileEntity;
 import ihl.processing.metallurgy.WoodenRollingMachinePart1TileEntity;
-import ihl.crop_harvestors.RubberTreeBlock;
-import ihl.crop_harvestors.SackBlock;
-import ihl.crop_harvestors.SackTileEntity;
 import ihl.recipes.IronWorkbenchRecipe;
 import ihl.recipes.RecipeInputDetonator;
 import ihl.recipes.RecipeInputDie;
@@ -118,24 +128,13 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.BiomeDictionary.Type;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.IFuelHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 @Mod(modid = IHLModInfo.MODID, name = IHLModInfo.MODNAME, version = IHLModInfo.MODVERSION, dependencies = "required-after:IC2@[2.2.767-experimental,)")
 public class IHLMod implements IFuelHandler {
@@ -478,7 +477,6 @@ public void postInit(FMLPostInitializationEvent evt) throws IOException {
 								Character.valueOf('R'), IC2Items.getItem("energyCrystal"), Character.valueOf('P'),
 								IC2Items.getItem("powerunitsmall") });
 			}
-
 			ItemStack forestryWaxCapsule = IHLUtils.getOtherModItemStackWithDamage("Forestry", "waxCapsule", 0, 1);
 			ItemStack forestryWaxCast = IHLUtils.getOtherModItemStackWithDamage("Forestry", "waxCast", 0, 1);
 			ItemStack forestryCandle = IHLUtils.getOtherModItemStackWithDamage("Forestry", "candle", 0, 1);
@@ -645,6 +643,10 @@ public void postInit(FMLPostInitializationEvent evt) throws IOException {
 							IHLUtils.getThisModItemStack("hackSawSteel") }),
 					Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("barD10Steel") }),
 					Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStackWithSize("tapM10x1Steel", 2) })));
+			IronWorkbenchTileEntity.addRecipe(new IronWorkbenchRecipe(
+					Arrays.asList(new IRecipeInput[] {new RecipeInputOreDict("craftingToolSaw") }),
+					Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("tubBronze") }),
+					Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("solarEvaporator") })));
 			IronWorkbenchTileEntity.addRecipe(new IronWorkbenchRecipe(Arrays.asList(new ItemStack[] {
 					IHLUtils.getThisModItemStack("handDrillBronze"), IHLUtils.getThisModItemStack("hackSawSteel"),
 					IHLUtils.getThisModItemStack("drillSteelHardened"),
@@ -804,7 +806,7 @@ public void postInit(FMLPostInitializationEvent evt) throws IOException {
 							IHLUtils.getThisModItemStackWithSize("highPressureVesselSteel", 2),
 							IHLUtils.getThisModItemStackWithSize("nutM10x1Steel", 32),
 							IHLUtils.getThisModItemStackWithSize("boltM10x1Steel", 32),
-							IHLUtils.getThisModWireItemStackWithLength("pipeVulcanizedRubber", 16) }),
+							IHLUtils.getThisModItemStack("pipeVulcanizedRubber") }),
 					Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("gasWeldingStation") })));
 			IronWorkbenchTileEntity.addRecipe(new IronWorkbenchRecipe(
 					Arrays.asList(new ItemStack[] { IHLUtils.getThisModItemStack("setOfFilesSteel"),
@@ -2079,7 +2081,7 @@ private void loadGT5Recipes() {
 				new RecipeInputItemStack(IHLUtils.getThisModItemStackWithSize("foilRubberWithSulfur", 16)),
 				new RecipeInputItemStack(IHLUtils.getThisModItemStackWithSize("fabric", 8)),
 				new RecipeInputOreDict("dustGraphite"),
-				IHLUtils.getThisModWireItemStackWithLength("pipeRubberWithSulfur", 16));
+				IHLUtils.getThisModItemStack("pipeRubberWithSulfur"));
 	}
 
 	@SuppressWarnings("deprecation")
@@ -2199,6 +2201,9 @@ private void loadGT6Recipes() {
 		Recipe.RecipeMap.sMaceratorRecipes.addRecipe(true, new ItemStack[] { new ItemStack(Items.brick) },
 				new ItemStack[] { IHLUtils.getOreDictItemStack("dustBrick") }, null, new long[] { 10000 },
 				new FluidStack[] {}, new FluidStack[] {}, 600, 30, 0);
+		Recipe.RecipeMap.sShredderRecipes.addRecipe(true, new ItemStack[] { new ItemStack(Items.brick) },
+				new ItemStack[] { IHLUtils.getOreDictItemStack("dustBrick") }, null, new long[] { 10000 },
+				new FluidStack[] {}, new FluidStack[] {}, 600, 30, 0);
 		Recipe.RecipeMap.sMaceratorRecipes.addRecipe(true,
 				new ItemStack[] { IHLUtils.getOreDictItemStack("stickGraphite") },
 				new ItemStack[] { IHLUtils.getOreDictItemStack("dustSmallGraphite") }, null, new long[] { 10000 },
@@ -2266,7 +2271,7 @@ private void loadGT6Recipes() {
 				new RecipeInputItemStack(IHLUtils.getThisModItemStackWithSize("foilRubberWithSulfur", 16)),
 				new RecipeInputItemStack(IHLUtils.getThisModItemStackWithSize("fabric", 8)),
 				new RecipeInputOreDict("dustGraphite"),
-				IHLUtils.getThisModWireItemStackWithLength("pipeRubberWithSulfur", 16));
+				IHLUtils.getThisModItemStack("pipeRubberWithSulfur"));
 	}
 
 	private void loadIC2Recipes() {
@@ -2311,6 +2316,6 @@ private void loadIC2Recipes() {
 				new RecipeInputItemStack(IHLUtils.getThisModItemStackWithSize("foilRubberWithSulfur", 16)),
 				new RecipeInputItemStack(IHLUtils.getThisModItemStackWithSize("fabric", 8)),
 				new RecipeInputOreDict("dustGraphite"),
-				IHLUtils.getThisModWireItemStackWithLength("pipeRubberWithSulfur", 16));
+				IHLUtils.getThisModItemStack("pipeRubberWithSulfur"));
 	}
 }
diff --git a/ihl/IHLModConfig.java b/ihl/IHLModConfig.java
@@ -1,19 +1,5 @@
 package ihl;
 
-import ic2.api.recipe.IRecipeInput;
-import ic2.api.recipe.RecipeInputFluidContainer;
-import ic2.api.recipe.RecipeInputItemStack;
-import ic2.api.recipe.RecipeInputOreDict;
-import ihl.flexible_cable.IronWorkbenchTileEntity;
-import ihl.recipes.IronWorkbenchRecipe;
-import ihl.recipes.RecipeInputDie;
-import ihl.recipes.RecipeInputWire;
-import ihl.recipes.RecipeOutputItemStack;
-import ihl.recipes.UniversalRecipeInput;
-import ihl.recipes.UniversalRecipeManager;
-import ihl.recipes.UniversalRecipeOutput;
-import ihl.utils.IHLUtils;
-
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
@@ -28,12 +14,25 @@
 import java.util.List;
 import java.util.Map.Entry;
 
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import ic2.api.recipe.IRecipeInput;
+import ic2.api.recipe.RecipeInputFluidContainer;
+import ic2.api.recipe.RecipeInputItemStack;
+import ic2.api.recipe.RecipeInputOreDict;
+import ihl.flexible_cable.IronWorkbenchTileEntity;
+import ihl.recipes.IronWorkbenchRecipe;
+import ihl.recipes.RecipeInputDie;
+import ihl.recipes.RecipeInputWire;
+import ihl.recipes.RecipeOutputItemStack;
+import ihl.recipes.UniversalRecipeInput;
+import ihl.recipes.UniversalRecipeManager;
+import ihl.recipes.UniversalRecipeOutput;
+import ihl.utils.IHLUtils;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import net.minecraft.nbt.NBTTagCompound;
 
 public class IHLModConfig 
 {

diff --git a/ihl/IHLModInfo.java b/ihl/IHLModInfo.java
@@ -3,5 +3,5 @@
 public class IHLModInfo {
 	public static final String MODID = "ihl";
 	public static final String MODNAME = "IHL Tools & Machines for IC2V2";
-	public static final String MODVERSION = "0.633";
+	public static final String MODVERSION = "0.637";
 }
diff --git a/ihl/crop_harvestors/BlobRenderFX.java b/ihl/crop_harvestors/BlobRenderFX.java
@@ -1,13 +1,14 @@
 package ihl.crop_harvestors;
 
+import org.lwjgl.opengl.GL11;
+
 import ihl.IHLModInfo;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
 
 public class BlobRenderFX extends Render{
 	private ResourceLocation tex, tex2;

diff --git a/ihl/crop_harvestors/SackBlock.java b/ihl/crop_harvestors/SackBlock.java
@@ -1,6 +1,7 @@
 package ihl.crop_harvestors;
 
 import java.util.List;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ihl.IHLCreativeTab;

diff --git a/ihl/crop_harvestors/SackRender.java b/ihl/crop_harvestors/SackRender.java
@@ -1,12 +1,12 @@
 package ihl.crop_harvestors;
+import org.lwjgl.opengl.GL11;
+
+import ihl.IHLModInfo;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.FluidRegistry;
 
-import org.lwjgl.opengl.GL11;
-import ihl.IHLModInfo;
-
 public class SackRender extends TileEntitySpecialRenderer{
 private SackModel model = new SackModel();
 private ResourceLocation tex = new ResourceLocation(IHLModInfo.MODID+":textures/blocks/sack.png");

diff --git a/ihl/crop_harvestors/SackTileEntity.java b/ihl/crop_harvestors/SackTileEntity.java
@@ -3,6 +3,11 @@
 import java.util.List;
 import java.util.Random;
 
+import ic2.core.IC2;
+import ic2.core.block.TileEntityInventory;
+import ihl.IHLMod;
+import ihl.utils.IHLFluidTank;
+import ihl.utils.IHLUtils;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -15,11 +20,6 @@
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
-import ic2.core.IC2;
-import ic2.core.block.TileEntityInventory;
-import ihl.IHLMod;
-import ihl.utils.IHLFluidTank;
-import ihl.utils.IHLUtils;
 
 public class SackTileEntity extends TileEntityInventory implements IFluidHandler
 {

diff --git a/ihl/enviroment/LaserHitMirrorEventHandler.java b/ihl/enviroment/LaserHitMirrorEventHandler.java
@@ -1,11 +1,11 @@
 package ihl.enviroment;
 
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import ic2.api.event.LaserEvent;
 import ic2.core.item.tool.EntityMiningLaser;
 import net.minecraft.entity.Entity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class LaserHitMirrorEventHandler 
 {

diff --git a/ihl/enviroment/MirrorBlock.java b/ihl/enviroment/MirrorBlock.java
@@ -1,10 +1,10 @@
 package ihl.enviroment;
-import ihl.IHLCreativeTab;
-import ihl.IHLModInfo;
-import ihl.utils.IHLUtils;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import ihl.IHLCreativeTab;
+import ihl.IHLModInfo;
+import ihl.utils.IHLUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;