diff --git a/common/ic2/api/keyboard/Keys.java b/common/ic2/api/keyboard/Keys.java deleted file mode 100644 index 8469da5b6..000000000 --- a/common/ic2/api/keyboard/Keys.java +++ /dev/null @@ -1,45 +0,0 @@ -package ic2.api.keyboard; - -import net.minecraft.entity.player.EntityPlayer; - -public class Keys { - public static boolean isModeKeyPressed(EntityPlayer aPlayer) { - return getKeyPressed(aPlayer, "isModeSwitchKeyDown"); - } - - public static boolean isAltKeyPressed(EntityPlayer aPlayer) { - return getKeyPressed(aPlayer, "isAltKeyDown"); - } - - public static boolean isHudModeKeyPressed(EntityPlayer aPlayer) { - return getKeyPressed(aPlayer, "isHudModeKeyDown"); - } - - public static boolean isBoostKeyPressed(EntityPlayer aPlayer) { - return getKeyPressed(aPlayer, "isBoostKeyDown"); - } - - public static boolean isForwardKeyPressed(EntityPlayer aPlayer) { - return getKeyPressed(aPlayer, "isForwardKeyDown"); - } - - public static boolean isJumpKeyPressed(EntityPlayer aPlayer) { - return getKeyPressed(aPlayer, "isJumpKeyDown"); - } - - public static boolean isSideInventoryKeyPressed(EntityPlayer aPlayer) { - return getKeyPressed(aPlayer, "isSideinventoryKeyDown"); - } - - public static boolean isSneakKeyPressed(EntityPlayer aPlayer) { - return getKeyPressed(aPlayer, "isSneakKeyDown"); - } - - public static boolean getKeyPressed(EntityPlayer aPlayer, String aKeyName) { - Object tObject = ic2.api.util.ReflectionHelper.callMethod(ic2.api.util.ReflectionHelper.getField(ic2.api.info.Info.ic2ModInstance, "keyboard", false, true), "isModeSwitchKeyDown", false, false, true, aPlayer); - if (tObject != null && tObject instanceof Boolean) { - return (Boolean)tObject; - } - return false; - } -} \ No newline at end of file diff --git a/common/ic2/api/recipe/IPatternStorage.java b/common/ic2/api/recipe/IPatternStorage.java new file mode 100644 index 000000000..0fb094c9c --- /dev/null +++ b/common/ic2/api/recipe/IPatternStorage.java @@ -0,0 +1,9 @@ +package ic2.api.recipe; + +import net.minecraft.item.ItemStack; + +public interface IPatternStorage { + + boolean transferPattern(ItemStack itemstack, short amountUU , int amountEU); + +} diff --git a/common/ic2/api/recipe/Recipes.java b/common/ic2/api/recipe/Recipes.java index 3e0acd5f6..608d38b67 100644 --- a/common/ic2/api/recipe/Recipes.java +++ b/common/ic2/api/recipe/Recipes.java @@ -13,10 +13,11 @@ public class Recipes { public static IMachineRecipeManager compressor; public static IMachineRecipeManager centrifuge; public static IMachineRecipeManager recycler; - public static IMachineRecipeManager metalformerextruding; - public static IMachineRecipeManager metalformercutting; - public static IMachineRecipeManager metalformerrolling; + public static IMachineRecipeManager metalformerExtruding; + public static IMachineRecipeManager metalformerCutting; + public static IMachineRecipeManager metalformerRolling; public static IMachineRecipeManager orewasching; + public static IMachineRecipeManager Scanner; /** * Reference amplifier values: diff --git a/common/ic2/api/util/IKeyboard.java b/common/ic2/api/util/IKeyboard.java new file mode 100644 index 000000000..ff6eaea5e --- /dev/null +++ b/common/ic2/api/util/IKeyboard.java @@ -0,0 +1,14 @@ +package ic2.api.util; + +import net.minecraft.entity.player.EntityPlayer; + +public interface IKeyboard { + boolean isAltKeyDown(EntityPlayer player); + boolean isBoostKeyDown(EntityPlayer player); + boolean isForwardKeyDown(EntityPlayer player); + boolean isJumpKeyDown(EntityPlayer player); + boolean isModeSwitchKeyDown(EntityPlayer player); + boolean isSideinventoryKeyDown(EntityPlayer player); + boolean isHudModeKeyDown(EntityPlayer player); + boolean isSneakKeyDown(EntityPlayer player); +} diff --git a/common/ic2/api/util/Keys.java b/common/ic2/api/util/Keys.java new file mode 100644 index 000000000..84d175676 --- /dev/null +++ b/common/ic2/api/util/Keys.java @@ -0,0 +1,6 @@ +package ic2.api.util; + + +public class Keys { + public static IKeyboard instance; +} \ No newline at end of file diff --git a/common/ic2/api/util/ReflectionHelper.java b/common/ic2/api/util/ReflectionHelper.java deleted file mode 100644 index b302de5b8..000000000 --- a/common/ic2/api/util/ReflectionHelper.java +++ /dev/null @@ -1,55 +0,0 @@ -package ic2.api.util; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -public class ReflectionHelper { - public static Object callMethod(Object aObject, String aMethod, boolean aPrivate, boolean aUseUpperCasedDataTypes, boolean aLogErrors, Object... aParameters) { - try { - Class[] tParameterTypes = new Class[aParameters.length]; - for (byte i = 0; i < aParameters.length; i++) { - if (aParameters[i] instanceof Class) { - tParameterTypes[i] = (Class)aParameters[i]; - aParameters[i] = null; - } else { - tParameterTypes[i] = aParameters[i].getClass(); - } - if (!aUseUpperCasedDataTypes) { - if (tParameterTypes[i] == Boolean.class ) tParameterTypes[i] = boolean.class; - if (tParameterTypes[i] == Byte.class ) tParameterTypes[i] = byte.class; - if (tParameterTypes[i] == Short.class ) tParameterTypes[i] = short.class; - if (tParameterTypes[i] == Integer.class ) tParameterTypes[i] = int.class; - if (tParameterTypes[i] == Long.class ) tParameterTypes[i] = long.class; - if (tParameterTypes[i] == Float.class ) tParameterTypes[i] = float.class; - if (tParameterTypes[i] == Double.class ) tParameterTypes[i] = double.class; - } - } - Method tMethod = (aObject instanceof Class)?((Class)aObject).getMethod(aMethod, tParameterTypes):aObject.getClass().getMethod(aMethod, tParameterTypes); - if (aPrivate) tMethod.setAccessible(true); - return tMethod.invoke(aObject, aParameters); - } catch (Throwable e) { - if (aLogErrors) e.printStackTrace(); - } - return null; - } - - public static Object callConstructor(String aClass, int aConstructorIndex, Object aReplacementObject, boolean aLogErrors, Object... aParameters) { - try { - return Class.forName(aClass).getConstructors()[aConstructorIndex].newInstance(aParameters); - } catch (Throwable e) { - if (aLogErrors) e.printStackTrace(); - } - return aReplacementObject; - } - - public static Object getField(Object aObject, String aField, boolean aPrivate, boolean aLogErrors) { - try { - Field tField = (aObject instanceof Class)?((Class)aObject).getDeclaredField(aField):aObject.getClass().getDeclaredField(aField); - if (aPrivate) tField.setAccessible(true); - return tField.get(aObject); - } catch (Throwable e) { - if (aLogErrors) e.printStackTrace(); - } - return null; - } -} \ No newline at end of file diff --git a/common/mekanism/common/ItemClump.java b/common/mekanism/common/ItemClump.java index 3c8020d2c..8dc3a633a 100644 --- a/common/mekanism/common/ItemClump.java +++ b/common/mekanism/common/ItemClump.java @@ -11,7 +11,8 @@ public class ItemClump extends ItemMekanism { public Icon[] icons = new Icon[256]; public static String[] en_USNames = {"Iron", "Gold", "Osmium", - "Copper", "Tin", "Silver"}; + "Copper", "Tin", "Silver", + "Obsidian"}; public ItemClump(int id) { @@ -23,7 +24,7 @@ public class ItemClump extends ItemMekanism @Override public void registerIcons(IconRegister register) { - for(int i = 0; i <= 5; i++) + for(int i = 0; i <= 6; i++) { icons[i] = register.registerIcon("mekanism:" + en_USNames[i] + "Clump"); } @@ -38,7 +39,7 @@ public class ItemClump extends ItemMekanism @Override public void getSubItems(int id, CreativeTabs tabs, List itemList) { - for(int counter = 0; counter <= 5; ++counter) + for(int counter = 0; counter <= 6; ++counter) { itemList.add(new ItemStack(this, 1, counter)); } diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index d35bef4fb..fdec5c1d3 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -446,6 +446,9 @@ public class Mekanism RecipeHandler.addCrusherRecipe(new ItemStack(Block.stoneBrick, 1, 0), new ItemStack(Block.stoneBrick, 1, 2)); RecipeHandler.addCrusherRecipe(new ItemStack(Block.stoneBrick, 1, 3), new ItemStack(Block.stoneBrick, 1, 0)); + //Purification Chamber Recipes + RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.obsidian), new ItemStack(Clump, 2, 6)); + //Metallurgic Infuser Recipes RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(EnrichedIron)), new ItemStack(Dust, 1, 5)); @@ -559,6 +562,7 @@ public class Mekanism LanguageRegistry.instance().addStringLocalization("item.copperClump.name", "Copper Clump"); LanguageRegistry.instance().addStringLocalization("item.tinClump.name", "Tin Clump"); LanguageRegistry.instance().addStringLocalization("item.silverClump.name", "Silver Clump"); + LanguageRegistry.instance().addStringLocalization("item.obsidianClump.name", "Obsidian Clump"); //Localization for Dirty Dust LanguageRegistry.instance().addStringLocalization("item.dirtyIronDust.name", "Dirty Iron Dust"); @@ -711,7 +715,7 @@ public class Mekanism OreDictionary.registerOre("dustDirtySilver", new ItemStack(DirtyDust, 1, 5)); OreDictionary.registerOre("dustDirtyObsidian", new ItemStack(DirtyDust, 1, 6)); - //for RailCraft. rc + mek = rawr + //for RailCraft/IC2. OreDictionary.registerOre("dustObsidian", new ItemStack(DirtyDust, 1, 6)); OreDictionary.registerOre("clumpIron", new ItemStack(Clump, 1, 0)); @@ -720,6 +724,7 @@ public class Mekanism OreDictionary.registerOre("clumpCopper", new ItemStack(Clump, 1, 3)); OreDictionary.registerOre("clumpTin", new ItemStack(Clump, 1, 4)); OreDictionary.registerOre("clumpSilver", new ItemStack(Clump, 1, 5)); + OreDictionary.registerOre("clumpObsidian", new ItemStack(Clump, 1, 6)); OreDictionary.registerOre("oreOsmium", new ItemStack(OreBlock, 1, 0)); @@ -737,6 +742,7 @@ public class Mekanism CraftingManagers.pulverizerManager.addRecipe(80, new ItemStack(Clump, 1, 3), new ItemStack(DirtyDust, 1, 3), false); CraftingManagers.pulverizerManager.addRecipe(80, new ItemStack(Clump, 1, 4), new ItemStack(DirtyDust, 1, 4), false); CraftingManagers.pulverizerManager.addRecipe(80, new ItemStack(Clump, 1, 5), new ItemStack(DirtyDust, 1, 5), false); + System.out.println("[Mekanism] Hooked into Thermal Expansion successfully."); } catch(Exception e) {} @@ -748,20 +754,16 @@ public class Mekanism OreDictionary.registerOre("itemCompressedCarbon", new ItemStack(CompressedCarbon)); OreDictionary.registerOre("itemEnrichedAlloy", new ItemStack(EnrichedAlloy)); - if(hooks.IC2Loaded) - { - if(!hooks.RailcraftLoaded) - { - Recipes.macerator.addRecipe(new ItemStack(Block.obsidian), null, new ItemStack(DirtyDust, 1, 6)); - } - } - for(ItemStack ore : OreDictionary.getOres("dustRefinedObsidian")) { - RecipeHandler.addOsmiumCompressorRecipe(MekanismUtils.size(ore, 1), new ItemStack(Ingot, 1, 0)); RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(DirtyDust, 1, 6)); } + for(ItemStack ore : OreDictionary.getOres("dustObsidian")) + { + RecipeHandler.addOsmiumCompressorRecipe(MekanismUtils.size(ore, 2), new ItemStack(Ingot, 1, 0)); + } + for(ItemStack ore : OreDictionary.getOres("clumpIron")) { RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(DirtyDust, 1, 0)); @@ -792,6 +794,11 @@ public class Mekanism RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(DirtyDust, 1, 5)); } + for(ItemStack ore : OreDictionary.getOres("clumpObsidian")) + { + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(DirtyDust, 1, 6)); + } + for(ItemStack ore : OreDictionary.getOres("dustDirtyIron")) { RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Dust, 1, 0)); diff --git a/resources/assets/mekanism/textures/items/EnergyMeter.png b/resources/assets/mekanism/textures/items/NetworkReader.png similarity index 100% rename from resources/assets/mekanism/textures/items/EnergyMeter.png rename to resources/assets/mekanism/textures/items/NetworkReader.png diff --git a/resources/assets/mekanism/textures/items/ObsidianClump.png b/resources/assets/mekanism/textures/items/ObsidianClump.png new file mode 100644 index 000000000..c4fe2c16a Binary files /dev/null and b/resources/assets/mekanism/textures/items/ObsidianClump.png differ