diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 6df2b9ef5..8abf59f4a 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -100,7 +100,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapelessOreRecipe; import rebelkeithy.mods.metallurgy.api.IOreInfo; import rebelkeithy.mods.metallurgy.api.MetallurgyAPI; import thermalexpansion.api.crafting.CraftingManagers; @@ -204,7 +203,6 @@ public class Mekanism public static Item TeleportationCore; public static Item Configurator; public static Item NetworkReader; - public static Item ManganeseAlloy; public static Item WalkieTalkie; public static Item ItemProxy; @@ -357,11 +355,8 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ControlCircuit), new Object[] { "RER", Character.valueOf('R'), Item.redstone, Character.valueOf('E'), EnrichedAlloy })); - CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(EnrichedIron, 2), new Object[] { - ManganeseAlloy, Item.ingotIron - })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 8), new Object[] { - "IFI", "CEC", "IFI", Character.valueOf('I'), Item.ingotIron, Character.valueOf('F'), Block.furnaceIdle, Character.valueOf('C'), "circuitBasic", Character.valueOf('E'), EnrichedAlloy + "IFI", "ROR", "IFI", Character.valueOf('I'), Item.ingotIron, Character.valueOf('F'), Block.furnaceIdle, Character.valueOf('R'), Item.redstone, Character.valueOf('O'), "ingotOsmium" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(TeleportationCore), new Object[] { "LAL", "GDG", "LAL", Character.valueOf('L'), new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('A'), AtomicCore, Character.valueOf('G'), Item.ingotGold, Character.valueOf('D'), Item.diamond @@ -468,7 +463,6 @@ public class Mekanism FurnaceRecipes.smelting().addSmelting(Dust.itemID, 0, new ItemStack(Item.ingotIron), 1.0F); FurnaceRecipes.smelting().addSmelting(Dust.itemID, 1, new ItemStack(Item.ingotGold), 1.0F); FurnaceRecipes.smelting().addSmelting(Dust.itemID, 5, new ItemStack(Ingot, 1, 4), 1.0F); - FurnaceRecipes.smelting().addSmelting(EnrichedIron.itemID, 0, new ItemStack(EnrichedAlloy), 1.0F); //Enrichment Chamber Recipes RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Block.oreRedstone), new ItemStack(Item.redstone, 12)); @@ -506,7 +500,9 @@ public class Mekanism RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.obsidian), new ItemStack(Clump, 2, 6)); //Metallurgic Infuser Recipes + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(Item.ingotIron)), new ItemStack(EnrichedIron)); RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(EnrichedIron)), new ItemStack(Dust, 1, 5)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("REDSTONE"), 10, new ItemStack(Item.ingotIron)), new ItemStack(EnrichedAlloy)); if(InfuseRegistry.contains("BIO")) { @@ -518,9 +514,7 @@ public class Mekanism InfuseRegistry.registerInfuseObject(new ItemStack(Item.coal, 1, 0), new InfuseObject(InfuseRegistry.get("CARBON"), 10)); InfuseRegistry.registerInfuseObject(new ItemStack(Item.coal, 1, 1), new InfuseObject(InfuseRegistry.get("CARBON"), 20)); InfuseRegistry.registerInfuseObject(new ItemStack(CompressedCarbon), new InfuseObject(InfuseRegistry.get("CARBON"), 100)); - - //Smelting - FurnaceRecipes.smelting().addSmelting(Block.dirt.blockID, new ItemStack(ManganeseAlloy, 2), 0); + InfuseRegistry.registerInfuseObject(new ItemStack(Item.redstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 10)); } /** @@ -551,7 +545,7 @@ public class Mekanism DirtyDust = new ItemDirtyDust(configuration.getItem("DirtyDust", 11220).getInt()-256); Configurator = new ItemConfigurator(configuration.getItem("Configurator", 11221).getInt()).setUnlocalizedName("Configurator"); NetworkReader = new ItemNetworkReader(configuration.getItem("NetworkReader", 11222).getInt()).setUnlocalizedName("NetworkReader"); - ManganeseAlloy = new ItemMekanism(configuration.getItem("ManganeseAlloy", 11223).getInt()).setUnlocalizedName("ManganeseAlloy"); + //OPEN 11223 WalkieTalkie = new ItemWalkieTalkie(configuration.getItem("WalkieTalkie", 11224).getInt()).setUnlocalizedName("WalkieTalkie"); configuration.save(); @@ -576,7 +570,6 @@ public class Mekanism GameRegistry.registerItem(DirtyDust, "DirtyDust"); GameRegistry.registerItem(Configurator, "Configurator"); GameRegistry.registerItem(NetworkReader, "NetworkReader"); - GameRegistry.registerItem(ManganeseAlloy, "MaganeseAlloy"); GameRegistry.registerItem(WalkieTalkie, "WalkieTalkie"); } @@ -1098,6 +1091,7 @@ public class Mekanism InfuseRegistry.registerInfuseType(new InfuseType("CARBON", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 0, 0)); InfuseRegistry.registerInfuseType(new InfuseType("TIN", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 4, 0)); InfuseRegistry.registerInfuseType(new InfuseType("DIAMOND", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 8, 0)); + InfuseRegistry.registerInfuseType(new InfuseType("REDSTONE", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 16, 0)); } @EventHandler diff --git a/common/mekanism/induction/common/tileentity/TileEntityTesla.java b/common/mekanism/induction/common/tileentity/TileEntityTesla.java index f380b49b6..99d679756 100644 --- a/common/mekanism/induction/common/tileentity/TileEntityTesla.java +++ b/common/mekanism/induction/common/tileentity/TileEntityTesla.java @@ -149,12 +149,6 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla transferTeslaCoils.add(tesla); } - else { - System.out.println("Connected already"); - } - } - else { - System.out.println("outta range"); } } @@ -186,7 +180,6 @@ public class TileEntityTesla extends TileEntityElectricBlock implements ITesla if(transferTeslaCoils.size() > 0) { - System.out.println("yes"); double transferEnergy = getEnergy() / transferTeslaCoils.size(); int count = 0; boolean sentPacket = false; diff --git a/resources/assets/mekanism/gui/GuiChamber.png b/resources/assets/mekanism/gui/GuiChamber.png index 24ee308ce..791796cb1 100644 Binary files a/resources/assets/mekanism/gui/GuiChamber.png and b/resources/assets/mekanism/gui/GuiChamber.png differ diff --git a/resources/assets/mekanism/gui/GuiCombiner.png b/resources/assets/mekanism/gui/GuiCombiner.png index 62e94b57c..c2b982a8d 100644 Binary files a/resources/assets/mekanism/gui/GuiCombiner.png and b/resources/assets/mekanism/gui/GuiCombiner.png differ diff --git a/resources/assets/mekanism/gui/GuiCompressor.png b/resources/assets/mekanism/gui/GuiCompressor.png index 9f9aa800a..39773552c 100644 Binary files a/resources/assets/mekanism/gui/GuiCompressor.png and b/resources/assets/mekanism/gui/GuiCompressor.png differ diff --git a/resources/assets/mekanism/gui/GuiCrusher.png b/resources/assets/mekanism/gui/GuiCrusher.png index 82347eff9..017bf15fe 100644 Binary files a/resources/assets/mekanism/gui/GuiCrusher.png and b/resources/assets/mekanism/gui/GuiCrusher.png differ diff --git a/resources/assets/mekanism/gui/GuiEnergizedSmelter.png b/resources/assets/mekanism/gui/GuiEnergizedSmelter.png index 36c592a82..bc2a1f896 100644 Binary files a/resources/assets/mekanism/gui/GuiEnergizedSmelter.png and b/resources/assets/mekanism/gui/GuiEnergizedSmelter.png differ diff --git a/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png b/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png index 159ec34c5..289b2994a 100644 Binary files a/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png and b/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png differ diff --git a/resources/assets/mekanism/gui/GuiPurificationChamber.png b/resources/assets/mekanism/gui/GuiPurificationChamber.png index 027548be9..2d3cf0387 100644 Binary files a/resources/assets/mekanism/gui/GuiPurificationChamber.png and b/resources/assets/mekanism/gui/GuiPurificationChamber.png differ diff --git a/resources/assets/mekanism/infuse/Bio.png b/resources/assets/mekanism/infuse/Bio.png deleted file mode 100644 index aaf5d75da..000000000 Binary files a/resources/assets/mekanism/infuse/Bio.png and /dev/null differ diff --git a/resources/assets/mekanism/infuse/Carbon.png b/resources/assets/mekanism/infuse/Carbon.png deleted file mode 100644 index 03f2c34df..000000000 Binary files a/resources/assets/mekanism/infuse/Carbon.png and /dev/null differ diff --git a/resources/assets/mekanism/infuse/Diamond.png b/resources/assets/mekanism/infuse/Diamond.png deleted file mode 100644 index cf8182960..000000000 Binary files a/resources/assets/mekanism/infuse/Diamond.png and /dev/null differ diff --git a/resources/assets/mekanism/infuse/Infusions.png b/resources/assets/mekanism/infuse/Infusions.png index c5336602e..6584e6a3e 100644 Binary files a/resources/assets/mekanism/infuse/Infusions.png and b/resources/assets/mekanism/infuse/Infusions.png differ diff --git a/resources/assets/mekanism/infuse/Tin.png b/resources/assets/mekanism/infuse/Tin.png deleted file mode 100644 index cc3bc2876..000000000 Binary files a/resources/assets/mekanism/infuse/Tin.png and /dev/null differ diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang index 677fcd0be..9539a800c 100644 --- a/resources/assets/mekanism/lang/en_US.lang +++ b/resources/assets/mekanism/lang/en_US.lang @@ -21,7 +21,6 @@ item.PortableTeleporter.name=Portable Teleporter item.TeleportationCore.name=Teleportation Core item.Configurator.name=Configurator item.NetworkReader.name=Network Reader -item.ManganeseAlloy.name=Manganese Alloy item.WalkieTalkie.name=Walkie-Talkie //Gas Tank diff --git a/resources/assets/mekanism/textures/blocks/OsmiumOre.png b/resources/assets/mekanism/textures/blocks/OsmiumOre.png index d21b3490e..f34b65ccf 100644 Binary files a/resources/assets/mekanism/textures/blocks/OsmiumOre.png and b/resources/assets/mekanism/textures/blocks/OsmiumOre.png differ diff --git a/resources/assets/mekanism/textures/items/ManganeseAlloy.png b/resources/assets/mekanism/textures/items/ManganeseAlloy.png deleted file mode 100644 index 0881636c4..000000000 Binary files a/resources/assets/mekanism/textures/items/ManganeseAlloy.png and /dev/null differ