Platinum dust as catalyst, Iron catalist as dust

6 files changed, 18 insertions, 26 deletions

diff --git a/assets/ihl/textures/items/catalystIron.png b/assets/ihl/textures/items/catalystIron.png
index 057a4d3..1d0d638 100644
--- a/assets/ihl/textures/items/catalystIron.png
+++ b/assets/ihl/textures/items/catalystIron.png
diff --git a/ihl/IHLMod.java b/ihl/IHLMod.java
index 7a8323b..b8b7231 100644
--- a/ihl/IHLMod.java
+++ b/ihl/IHLMod.java
@@ -361,8 +361,6 @@ public class IHLMod implements IFuelHandler {
 			IHLUtils.addIC2MaceratorRecipe("oreDatolite", IHLUtils.getThisModItemStackWithSize("dustDatolite", 4));
 			IHLUtils.addIC2MaceratorRecipe("oreBischofite", IHLUtils.getThisModItemStackWithSize("dustBischofite", 4));
 			IHLUtils.addIC2MaceratorRecipe("ingotBrick", IHLUtils.getOreDictItemStackWithSize("dustBrick", 1));
-			IHLUtils.addIC2ExtrudingRecipe(IHLUtils.getThisModItemStack("dustIronOxideCatalystMix"),
-					IHLUtils.getThisModItemStack("catalystRawIronOxide"));
 			Recipes.advRecipes.addShapelessRecipe(IHLUtils.getThisModItemStackWithSize("dustIrongraphite", 2),
 					new Object[] { new RecipeInputOreDict("dustIron"), new RecipeInputOreDict("dustGraphite") });
 			Recipes.advRecipes.addShapelessRecipe(IHLUtils.getOreDictItemStackWithSize("dustPorcelain", 4),
@@ -532,8 +530,6 @@ public class IHLMod implements IFuelHandler {
 					IHLUtils.getOreDictItemStack("plateCoal"), 20F);
 			FurnaceRecipes.smelting().func_151394_a(IHLUtils.getOreDictItemStackWithSize("dustCalcite", 3),
 					IHLUtils.getOreDictItemStack("dustQuicklime"), 2F);
-			FurnaceRecipes.smelting().func_151394_a(IHLUtils.getThisModItemStack("catalystRawIronOxide"),
-					IHLUtils.getThisModItemStack("catalystIronOxide"), 2F);
 			ItemSubstance.postInit();
 			ItemStack lathingTool = Ic2Items.LathingTool.copy();
 			lathingTool.setItemDamage(OreDictionary.WILDCARD_VALUE);
@@ -1790,7 +1786,7 @@ public class IHLMod implements IFuelHandler {
 							new UniversalRecipeInput(
 									new FluidStack[] { IHLUtils.getFluidStackWithSize("hydrogen", 90) },
 									new IRecipeInput[] { new RecipeInputItemStack(
-											IHLUtils.getThisModItemStack("catalystIronOxide")) }),
+											IHLUtils.getThisModItemStack("dustIronOxideCatalystMix")) }),
 							new UniversalRecipeOutput(null, new RecipeOutputItemStack[] {
 									new RecipeOutputItemStack(IHLUtils.getThisModItemStack("catalystIron"), 1f) },
 									200));
@@ -1806,7 +1802,7 @@ public class IHLMod implements IFuelHandler {
 					new UniversalRecipeInput(
 							new FluidStack[] { IHLUtils.getFluidStackWithSize("ammonia", 100),
 									IHLUtils.getFluidStackWithSize("oxygen", 150) },
-							new IRecipeInput[] { new RecipeInputOreDict("dustIridium", 0) }),
+							new IRecipeInput[] { new RecipeInputOreDictionaryList(new String[] {"dustIridium", "dustPlatinum"}, 0) }),
 					new UniversalRecipeOutput(new FluidStack[] { IHLUtils.getFluidStackWithSize("nitricacid", 250) },
 							null, 200));
 			ChemicalReactorTileEntity.addRecipe(
@@ -2290,14 +2286,12 @@ public class IHLMod implements IFuelHandler {
 		crystal.setItemDamage(OreDictionary.WILDCARD_VALUE);
 		advBattery.setItemDamage(OreDictionary.WILDCARD_VALUE);
 		chargedReBattery.setItemDamage(OreDictionary.WILDCARD_VALUE);
-		if (IHLMod.config.enableRubberTreeSack) {
-			Recipes.advRecipes.addRecipe(new ItemStack(electricEvaporatorBlock, 1),
-					new Object[] { "CCC", "CCC", " F ", Character.valueOf('C'), IC2Items.getItem("platecopper"),
-							Character.valueOf('F'), IC2Items.getItem("electroFurnace") });
-			Recipes.advRecipes.addRecipe(new ItemStack(electricEvaporatorBlock, 1),
-					new Object[] { "   ", " C ", " F ", Character.valueOf('C'), Ic2Items.electronicCircuit.copy(),
-							Character.valueOf('F'), new ItemStack(evaporatorBlock, 1)});
-		}
+		Recipes.advRecipes.addRecipe(new ItemStack(electricEvaporatorBlock, 1),
+				new Object[] { "CCC", "CCC", " F ", Character.valueOf('C'), IC2Items.getItem("platecopper"),
+						Character.valueOf('F'), IC2Items.getItem("electroFurnace") });
+		Recipes.advRecipes.addRecipe(new ItemStack(electricEvaporatorBlock, 1),
+				new Object[] { "   ", " C ", " F ", Character.valueOf('C'), Ic2Items.electronicCircuit.copy(),
+						Character.valueOf('F'), new ItemStack(evaporatorBlock, 1)});
 		if (IHLMod.config.enableFlexibleCablesCrafting) {
 			ItemStack cutter = Ic2Items.cutter.copy();
 			cutter.setItemDamage(OreDictionary.WILDCARD_VALUE);
diff --git a/ihl/enviroment/LightHandler.java b/ihl/enviroment/LightHandler.java
index b3f8da6..c89ffb7 100644
--- a/ihl/enviroment/LightHandler.java
+++ b/ihl/enviroment/LightHandler.java
@@ -59,7 +59,7 @@ public class LightHandler {
 	private void litBlocksAndGetDescendants(World world, int[] evSource, int[] lightSource, BitSet illuminatedBlocksSet,
 			int ev, int power, int[] directionMask, int[] borders) {
 		power = this.getNewPower(world, ev, evSource, lightSource, power, directionMask, illuminatedBlocksSet, borders);
-		power = (power<<1)/3 - 1;
+		power = (power<<4)/17 - 1;
 		if (power > 1) {
 			if (vectors[ev][0] == 0) {
 				int[] xyz = IHLMod.explosionHandler.decodeXYZ(ev);
diff --git a/ihl/enviroment/LightSource.java b/ihl/enviroment/LightSource.java
index 291b15a..ff4a91f 100644
--- a/ihl/enviroment/LightSource.java
+++ b/ihl/enviroment/LightSource.java
@@ -72,7 +72,7 @@ public class LightSource {
 		dx=dx>0?(dx<<16)/d:0;
 		dy=dy>0?(dy<<16)/d:0;
 		dz=dz>0?(dz<<16)/d:0;
-		int brightness = Math.min(power*(dx+dy+dz)>>16,255);
+		int brightness = Math.min(power*(dx+dy+dz)>>16,16);
 		return new int[]{brightness, this.red, this.blue, this.green};
 	}
 }
diff --git a/ihl/items_blocks/ItemSubstance.java b/ihl/items_blocks/ItemSubstance.java
index 9c55e36..528f453 100644
--- a/ihl/items_blocks/ItemSubstance.java
+++ b/ihl/items_blocks/ItemSubstance.java
@@ -190,8 +190,8 @@ public class ItemSubstance extends Item implements IItemHasMiniGUI {
 		DustPotassiumOxide(191, "dustPotassiumOxide", true, "K\u2082O"),

 		IngotPotassium(190, "ingotPotassium", true, "K"),

 		catalystIron(189, "catalystIron", false, "Fe (foam) + Al\u2082O\u2083 + K\u2082O"),

-		catalystIronOxide(188, "catalystIronOxide", false, "Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),

-		catalystRawIronOxide(187, "catalystRawIronOxide", false, "Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),

+//		catalystIronOxide(188, "catalystIronOxide", false, "Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),

+//		catalystRawIronOxide(187, "catalystRawIronOxide", false, "Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),

 		IronOxideCatalystMix(186, "dustIronOxideCatalystMix", false, "Fe\u2082O\u2083 + Al\u2082O\u2083 + K\u2082O"),

 		SodiumFormate(185, "dustSodiumFormate", true, "HCO\u2082Na"),

 		MercuryChloride(184, "dustMercuryChloride", true, "HgCl\u2082"),

diff --git a/ihl/model/RenderBlocksExt.java b/ihl/model/RenderBlocksExt.java
index f634bb0..b4b334a 100644
--- a/ihl/model/RenderBlocksExt.java
+++ b/ihl/model/RenderBlocksExt.java
@@ -33,16 +33,14 @@ public class RenderBlocksExt extends RenderBlocks {
 	}
 
 	private void transformColour(int x, int y, int z, int[] normal) {
-		for (LightSource lightSource : ((ClientProxy)IHLMod.proxy).getLightHandler().lightSources) {
+		/*		for (LightSource lightSource : ((ClientProxy)IHLMod.proxy).getLightHandler().lightSources) {
 			if (lightSource.isBlockIlluminated(x, y, z)) {
 				int[] lightValue = lightSource.getLightValue((int) x, (int) y, (int) z, normal);
 				System.out.println("this.brightnessBottomRight="+this.brightnessBottomRight);
-//				this.brightnessTopLeft |= lightValue[0];
-//				this.brightnessBottomLeft |= lightValue[0];
-//				this.brightnessTopRight |= lightValue[0];
-				this.brightnessBottomRight |= lightValue[0]>>4;
-				System.out.println("lightValue[0]="+lightValue[0]);
-				System.out.println("this.brightnessBottomRight|lightValue[0]="+this.brightnessBottomRight);
+				this.brightnessTopLeft |= lightValue[0];
+				this.brightnessBottomLeft |= lightValue[0];
+				this.brightnessTopRight |= lightValue[0];
+				this.brightnessBottomRight |= lightValue[0];
 				this.colorRedTopLeft *= (255 - lightValue[0]) * lightValue[1] / 255 / 255f;
 				this.colorRedBottomLeft *= (255 - lightValue[0]) * lightValue[1] / 255 / 255f;
 				this.colorRedTopRight *= (255 - lightValue[0]) * lightValue[1] / 255 / 255f;
@@ -56,7 +54,7 @@ public class RenderBlocksExt extends RenderBlocks {
 				this.colorGreenTopRight *= (255 - lightValue[0]) * lightValue[3] / 255 / 255f;
 				this.colorGreenBottomRight *= (255 - lightValue[0]) * lightValue[3] / 255 / 255f;
 			}
-		}
+		}*/
 	}
 
 	@Override