diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 01e44a076..e72a3856d 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -1210,8 +1210,6 @@ public class Mekanism GasRegistry.register(new Gas("sulfuricAcid")).registerFluid(); Mekanism.proxy.preInit(); - - MinecraftForge.EVENT_BUS.register(hooks); //Register infuses InfuseRegistry.registerInfuseType(new InfuseType("CARBON", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 0, 0)); diff --git a/common/mekanism/common/MekanismHooks.java b/common/mekanism/common/MekanismHooks.java index e57cf1cef..c053788bc 100644 --- a/common/mekanism/common/MekanismHooks.java +++ b/common/mekanism/common/MekanismHooks.java @@ -15,10 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; /** * Hooks for Mekanism. Use to grab items or blocks out of different mods. @@ -57,19 +54,25 @@ public final class MekanismHooks if(IC2Loaded) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreOsmium"), null, new ItemStack(Mekanism.Dust, 2, 2)); - - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotOsmium"), null, new ItemStack(Mekanism.Dust, 1, 2)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedObsidian"), null, new ItemStack(Mekanism.Dust, 1, 3)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedGlowstone"), null, new ItemStack(Item.glowstone)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotSteel"), null, new ItemStack(Mekanism.Dust, 1, 5)); - - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpIron"), null, new ItemStack(Mekanism.DirtyDust, 1, 0)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpGold"), null, new ItemStack(Mekanism.DirtyDust, 1, 1)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpOsmium"), null, new ItemStack(Mekanism.DirtyDust, 1, 2)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpCopper"), null, new ItemStack(Mekanism.DirtyDust, 1, 3)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpTin"), null, new ItemStack(Mekanism.DirtyDust, 1, 4)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpSilver"), null, new ItemStack(Mekanism.DirtyDust, 1, 5)); + try { + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreOsmium"), null, new ItemStack(Mekanism.Dust, 2, 2)); + } catch(Exception e) {} + + try { + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotOsmium"), null, new ItemStack(Mekanism.Dust, 1, 2)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedObsidian"), null, new ItemStack(Mekanism.Dust, 1, 3)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedGlowstone"), null, new ItemStack(Item.glowstone)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotSteel"), null, new ItemStack(Mekanism.Dust, 1, 5)); + } catch(Exception e) {} + + try { + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpIron"), null, new ItemStack(Mekanism.DirtyDust, 1, 0)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpGold"), null, new ItemStack(Mekanism.DirtyDust, 1, 1)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpOsmium"), null, new ItemStack(Mekanism.DirtyDust, 1, 2)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpCopper"), null, new ItemStack(Mekanism.DirtyDust, 1, 3)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpTin"), null, new ItemStack(Mekanism.DirtyDust, 1, 4)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpSilver"), null, new ItemStack(Mekanism.DirtyDust, 1, 5)); + } catch(Exception e) {} for(Map.Entry entry : Recipes.macerator.getRecipes().entrySet()) { @@ -182,40 +185,4 @@ public final class MekanismHooks return null; } } - - @EventHandler - public void handleIMC(IMCEvent event) - { - for(IMCMessage message : event.getMessages()) - { - try { - if(message.isNBTMessage()) - { - if(message.key.equalsIgnoreCase("PulverizerRecipe") && !message.getNBTValue().hasKey("secondaryChance") && !message.getNBTValue().hasKey("secondaryOutput")) - { - ItemStack input = ItemStack.loadItemStackFromNBT(message.getNBTValue().getCompoundTag("input")); - ItemStack output = ItemStack.loadItemStackFromNBT(message.getNBTValue().getCompoundTag("output")); - - if(input != null && output != null) - { - if(MekanismUtils.getName(input).startsWith("ore")) - { - if(!Recipe.ENRICHMENT_CHAMBER.containsRecipe(input)) - { - RecipeHandler.addEnrichmentChamberRecipe(input, output); - } - } - else if(MekanismUtils.getName(input).startsWith("ingot")) - { - if(!Recipe.CRUSHER.containsRecipe(input)) - { - RecipeHandler.addCrusherRecipe(input, output); - } - } - } - } - } - } catch(Exception e) {} - } - } } diff --git a/common/mekanism/common/tileentity/TileEntityDynamicValve.java b/common/mekanism/common/tileentity/TileEntityDynamicValve.java index 34756317f..bb19fe445 100644 --- a/common/mekanism/common/tileentity/TileEntityDynamicValve.java +++ b/common/mekanism/common/tileentity/TileEntityDynamicValve.java @@ -20,7 +20,7 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fluidTank.getInfo()} : null; + return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fluidTank.getInfo()} : new FluidTankInfo[0]; } @Override diff --git a/resources/assets/mekanism/lang/de_DE.lang b/resources/assets/mekanism/lang/de_DE.lang index 784de0bfd..882ec3b36 100644 --- a/resources/assets/mekanism/lang/de_DE.lang +++ b/resources/assets/mekanism/lang/de_DE.lang @@ -25,6 +25,7 @@ item.WalkieTalkie.name=Walkie-Talkie item.Jetpack.name=Jetpack item.ScubaTank.name=Taucherflasche item.GasMask.name=Gasmaske +item.Dictionary.name=Lexikon //Gas Tank tile.GasTank.GasTank.name=Gastank @@ -65,6 +66,8 @@ tile.MachineBlock.DigitalMiner.name=Digitalbergbaugerät //Machine Block 2 (second ID iteration) tile.MachineBlock2.RotaryCondensentrator.name=Rotationskondensentrator +tile.MachineBlock2.ChemicalFormulator.name=Chemischer Formulator +tile.MachineBlock2.ChemicalInfuser.name=Chemischer Infundierer //Ore Block tile.OreBlock.OsmiumOre.name=Osmiumerz @@ -95,6 +98,7 @@ item.steelDust.name=Stahlstaub item.copperDust.name=Kupferstaub item.tinDust.name=Zinnstaub item.silverDust.name=Silberstaub +item.leadDust.name=Bleistaub //Clumps item.ironClump.name=Eisenklumpen @@ -104,6 +108,7 @@ item.copperClump.name=Kupferklumpen item.tinClump.name=Zinnklumpen item.silverClump.name=Silberklumpen item.obsidianClump.name=Obsidianklumpen +item.leadClump.name=Bleiklumpen //Dirty Dust item.dirtyIronDust.name=Dreckiger Eisenstaub @@ -113,6 +118,7 @@ item.dirtyCopperDust.name=Dreckiger Kupferstaub item.dirtyTinDust.name=Dreckiger Zinnstaub item.dirtySilverDust.name=Dreckiger Silberstaub item.dirtyObsidianDust.name=Dreckiger Obsidianstaub +item.dirtyLeadDust.name=Dreckiger Bleistaub //Ingots item.obsidianIngot.name=Obsidianbarren @@ -126,10 +132,14 @@ item.tinIngot.name=Zinnbarren //Gasses gas.hydrogen=Wasserstoff gas.oxygen=Sauerstoff +gas.sulfuricGas=Schwefelgas +gas.sulfuricAcid=Schwefelsäure //Fluids fluid.hydrogen=Flüssiger Wasserstoff fluid.oxygen=Flüssiger Sauerstoff +fluid.sulfuricGas=Schwefelgas +fluid.sulfuricAcid=Schwefelsäure //Gui text gui.removeSpeedUpgrade=Entferne Geschwindigkeitsupgrade @@ -163,6 +173,9 @@ gui.input=Input gui.slots=Slots gui.state=Status +gui.dictionary.noKey=Kein Key. +gui.dictionary.key=Key + gui.configuration=Konfiguration gui.configuration.strictInput=Strikter Input