From d460bcab7706a158584bffaba8d072914812a3a0 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Thu, 15 Jun 2017 17:08:13 +0200 Subject: [PATCH] Clean Up ModuleItems and add two fluid names to ManagerLiquid --- .../java/binnie/botany/farm/GardenLogic.java | 44 ++++++++++--------- .../botany/genetics/ModuleGenetics.java | 17 ++++--- .../binnie/core/liquid/ManagerLiquid.java | 38 +++++++++------- .../binnie/extratrees/item/ModuleItems.java | 19 +++++--- .../machines/brewery/BrewedGrainRecipe.java | 21 +++++---- .../lumbermill/LumbermillMachine.java | 6 ++- src/main/java/binnie/genetics/Genetics.java | 33 ++++++++------ .../binnie/genetics/item/ModuleItems.java | 30 ++++++++----- 8 files changed, 123 insertions(+), 85 deletions(-) diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index ef24ac7b..3f8b16da 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -1,19 +1,11 @@ package binnie.botany.farm; -import binnie.Binnie; -import binnie.botany.Botany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IBlockSoil; -import binnie.botany.flower.TileEntityFlower; -import binnie.botany.gardening.Gardening; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.core.owner.IOwnedTile; -import forestry.core.utils.BlockUtil; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; @@ -25,13 +17,25 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import net.minecraftforge.fluids.FluidStack; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.core.owner.IOwnedTile; +import forestry.core.utils.BlockUtil; + +import binnie.Binnie; +import binnie.botany.Botany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.IBlockSoil; +import binnie.botany.flower.TileEntityFlower; +import binnie.botany.gardening.Gardening; +import binnie.core.liquid.ManagerLiquid; public class GardenLogic extends FarmLogic { List farmables; @@ -236,7 +240,7 @@ public class GardenLogic extends FarmLogic { } private boolean trySetWater(World world, BlockPos position, IFarmHousing housing) { - final FluidStack water = Binnie.LIQUID.getFluidStack("water", 1000); + final FluidStack water = Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 1000); if (this.moisture == EnumMoisture.DAMP) { if (water == null || !housing.hasLiquid(water)) { return false; diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index 20834706..183b208d 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -1,5 +1,13 @@ package binnie.botany.genetics; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import forestry.api.apiculture.FlowerManager; +import forestry.api.genetics.AlleleManager; +import forestry.api.recipes.RecipeManagers; + import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; @@ -9,12 +17,7 @@ import binnie.botany.flower.ItemBotany; import binnie.botany.flower.TileEntityFlower; import binnie.core.BinnieCore; import binnie.core.IInitializable; -import forestry.api.apiculture.FlowerManager; -import forestry.api.genetics.AlleleManager; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; +import binnie.core.liquid.ManagerLiquid; public class ModuleGenetics implements IInitializable { static AlleleEffectNone alleleEffectNone = new AlleleEffectNone(); @@ -51,7 +54,7 @@ public class ModuleGenetics implements IInitializable { @Override public void postInit() { FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla"); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(Botany.database), + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, new ItemStack(Botany.database), "X#X", "YEY", "RDR", diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index fab22a66..0e1fcb57 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -1,26 +1,34 @@ package binnie.core.liquid; -import binnie.core.ManagerBase; -import forestry.core.utils.OreDictUtil; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.ShapedOreRecipe; - import javax.annotation.Nullable; import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.ShapedOreRecipe; + +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.core.utils.OreDictUtil; + +import binnie.core.ManagerBase; + public class ManagerLiquid extends ManagerBase { + public static final String WATER = "water"; + //TODO: test if the name is "Creosote Oil" and not "fluid.creosote" + public static final String CREOSOTE = "fluid.creosote"; + Map fluids; public ManagerLiquid() { diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index d2fba782..1d2a116b 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -5,6 +5,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -14,6 +15,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.core.Tabs; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; +import forestry.api.recipes.ICarpenterManager; +import forestry.api.recipes.IStillManager; import forestry.api.recipes.RecipeManagers; import binnie.Binnie; @@ -21,6 +24,7 @@ import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.item.ItemMisc; +import binnie.core.liquid.ManagerLiquid; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.EnumETLog; @@ -147,12 +151,15 @@ public class ModuleItems implements IInitializable { GameRegistry.addRecipe(new ShapelessOreRecipe(Food.PAPAYIMAR.get(1), minium, "cropPapaya")); } catch (Exception ignored) { } - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(items.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(items.itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); - RecipeManagers.stillManager.addRecipe(25, ExtraTreeLiquid.Resin.get(5), ExtraTreeLiquid.Turpentine.get(3)); - RecipeManagers.carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), ItemStack.EMPTY, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); - if (Binnie.LIQUID.getFluidStack("Creosote Oil", 100) != null) { - RecipeManagers.carpenterManager.addRecipe(25, Binnie.LIQUID.getFluidStack("Creosote Oil", 50), ItemStack.EMPTY, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); + ICarpenterManager carpenterManager = RecipeManagers.carpenterManager; + IStillManager stillManager = RecipeManagers.stillManager; + carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, new ItemStack(items.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, new ItemStack(items.itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + stillManager.addRecipe(25, ExtraTreeLiquid.Resin.get(5), ExtraTreeLiquid.Turpentine.get(3)); + carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), ItemStack.EMPTY, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); + FluidStack creosoteOil = Binnie.LIQUID.getFluidStack(ManagerLiquid.CREOSOTE, 50); + if (creosoteOil != null) { + carpenterManager.addRecipe(25, creosoteOil, ItemStack.EMPTY, items.itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); } FuelManager.bronzeEngineFuel.put(ExtraTreeLiquid.Sap.get(1).getFluid(), new EngineBronzeFuel(ExtraTreeLiquid.Sap.get(1).getFluid(), 20, 10000, 1)); diff --git a/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java index 20860259..b94fc37f 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java @@ -1,19 +1,22 @@ package binnie.extratrees.machines.brewery; -import binnie.Binnie; -import binnie.core.util.OreDictionaryUtil; -import binnie.extratrees.alcohol.Alcohol; -import binnie.extratrees.item.ExtraTreeItems; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - import javax.annotation.Nullable; import java.util.Collections; import java.util.List; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +import binnie.Binnie; +import binnie.core.liquid.ManagerLiquid; +import binnie.core.util.OreDictionaryUtil; +import binnie.extratrees.alcohol.Alcohol; +import binnie.extratrees.item.ExtraTreeItems; + public class BrewedGrainRecipe implements IBreweryRecipe { - public static final FluidStack WATER = Binnie.LIQUID.getFluidStack("water", Fluid.BUCKET_VOLUME); + public static final FluidStack WATER = Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, Fluid.BUCKET_VOLUME); private final FluidStack output; private final int grainOreId; diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java index 25d9fc49..886bc710 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillMachine.java @@ -1,6 +1,9 @@ package binnie.extratrees.machines.lumbermill; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.liquid.ManagerLiquid; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.inventory.ComponentInventorySlots; @@ -12,7 +15,6 @@ import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; -import net.minecraft.tileentity.TileEntity; public class LumbermillMachine extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { public static final int SLOT_LOG = 0; @@ -41,7 +43,7 @@ public class LumbermillMachine extends ExtraTreeMachine.PackageExtraTreeMachine final ComponentTankContainer tanks = new ComponentTankContainer(machine); TankSlot tankWater = tanks.addTank(TANK_WATER, "input", TANK_WATER_CAPACITY); - tankWater.setValidator(new TankValidator.Basic("water")); + tankWater.setValidator(new TankValidator.Basic(ManagerLiquid.WATER)); new ComponentPowerReceptor(machine); new LumbermillLogic(machine); diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index a7bc721d..9cbbc74f 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -1,10 +1,28 @@ package binnie.genetics; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +import forestry.api.recipes.RecipeManagers; + import binnie.Binnie; import binnie.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; +import binnie.core.liquid.ManagerLiquid; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.proxy.IProxyCore; @@ -15,19 +33,6 @@ import binnie.genetics.item.ItemPunnettSquare; import binnie.genetics.item.ModuleItems; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.proxy.Proxy; -import com.google.common.base.Preconditions; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; - -import javax.annotation.Nullable; @Mod(modid = Constants.GENETICS_MOD_ID, name = "Binnie's Genetics", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class Genetics extends AbstractMod { @@ -64,7 +69,7 @@ public class Genetics extends AbstractMod { @Mod.EventHandler public void init(final FMLInitializationEvent evt) { this.init(); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(dictionaryBees), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, new ItemStack(dictionaryBees), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); } @Mod.EventHandler diff --git a/src/main/java/binnie/genetics/item/ModuleItems.java b/src/main/java/binnie/genetics/item/ModuleItems.java index e42b71f6..9cd7eacc 100644 --- a/src/main/java/binnie/genetics/item/ModuleItems.java +++ b/src/main/java/binnie/genetics/item/ModuleItems.java @@ -1,5 +1,21 @@ package binnie.genetics.item; +import com.google.common.base.Preconditions; + +import javax.annotation.Nullable; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + +import net.minecraftforge.fml.common.registry.GameRegistry; + +import forestry.api.recipes.RecipeManagers; + import binnie.Binnie; import binnie.botany.Botany; import binnie.core.BinnieCore; @@ -8,21 +24,11 @@ import binnie.core.Mods; import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.item.ItemMisc; import binnie.core.liquid.FluidContainerType; +import binnie.core.liquid.ManagerLiquid; import binnie.core.resource.BinnieSprite; import binnie.extratrees.ExtraTrees; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; -import com.google.common.base.Preconditions; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -import javax.annotation.Nullable; public class ModuleItems implements IInitializable { public static BinnieSprite iconNight; @@ -161,7 +167,7 @@ public class ModuleItems implements IInitializable { )); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack(ManagerLiquid.WATER, 2000), ItemStack.EMPTY, new ItemStack(database), "X#X", "YEY",