From 7578770ec89ebe5c7fc9058492f5e41efbd3c53b Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Wed, 4 May 2016 00:14:04 +0200 Subject: [PATCH] fixed stuff --- src/main/java/fluids/MoltenAardium.java | 4 +--- src/main/java/main/ZCompression.java | 21 ++++++++++----------- src/main/resources/mcmod.info | 6 ++---- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/main/java/fluids/MoltenAardium.java b/src/main/java/fluids/MoltenAardium.java index d7defc9..3717872 100644 --- a/src/main/java/fluids/MoltenAardium.java +++ b/src/main/java/fluids/MoltenAardium.java @@ -3,9 +3,7 @@ package fluids; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; -/** - * Created by Robert on 03.05.2016. - */ + public class MoltenAardium extends Fluid { public MoltenAardium() { super("molten_aardium", new ResourceLocation("tconstruct:blocks/fluids/molten_metal"), new ResourceLocation("tconstruct:blocks/fluids/molten_metal_flow")); diff --git a/src/main/java/main/ZCompression.java b/src/main/java/main/ZCompression.java index 21fed0a..30e4451 100644 --- a/src/main/java/main/ZCompression.java +++ b/src/main/java/main/ZCompression.java @@ -10,6 +10,7 @@ import main.world.ZWorldGen; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -144,8 +145,8 @@ public class ZCompression { GameRegistry.registerWorldGenerator(new ZWorldGen(), 100); GameRegistry.registerFuelHandler(new FuelHandler()); RegisterOres(); - RegisterFluids(); - RegisterTinker(); + registerFluid(moltenAardium); + registerTinkerFluid("Aardium", moltenAardium, true); new Smelting(); new Crafting(); } @@ -160,20 +161,18 @@ public class ZCompression { OreDictionary.registerOre("oreAardium", aardiumOre); OreDictionary.registerOre("oreAdamantite", adamantiteOre); OreDictionary.registerOre("oreArcanite", arcaniteOre); - - } - private void RegisterFluids() { - FluidRegistry.registerFluid(moltenAardium); - FluidRegistry.addBucketForFluid(moltenAardium); + private void registerFluid(Fluid fluid) { + FluidRegistry.registerFluid(fluid); + FluidRegistry.addBucketForFluid(fluid); } - private void RegisterTinker() { + private void registerTinkerFluid(String name, Fluid fluid, boolean toolForge) { NBTTagCompound tag = new NBTTagCompound(); - tag.setString("molten_aardium", moltenAardium.getName()); - tag.setString("ore", "Aardium"); - tag.setBoolean("toolforge", true); + tag.setString("fluid", fluid.getName()); + tag.setString("ore", name); + tag.setBoolean("toolforge", toolForge); FMLInterModComms.sendMessage("tconstruct", "integrateSmeltery", tag); } } \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 90e783b..3dc9f52 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,5 +1,4 @@ -[ -{ +[{ "modid": "zcompression", "name": "Zkaface Compression Mod", "description": "A modification to compress several items and blocks to a solid block with several features coming up on exponent five.", @@ -12,5 +11,4 @@ "logoFile": "", "screenshots": [], "dependencies": ["tconstruct"] -} -] \ No newline at end of file +}] \ No newline at end of file