From c4b3f7e9f1c8116d39c5943786d9612692c7c111 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 13 Dec 2014 18:56:31 -0800 Subject: [PATCH 01/13] Only consume fluid containers with null getContainerItem --- .../forestry/core/fluids/FluidHelper.java | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java index 2eac3fb34..adad32f67 100644 --- a/src/main/java/forestry/core/fluids/FluidHelper.java +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -166,23 +166,32 @@ public final class FluidHelper { if (used < fluidInContainer.amount) return false; - fluidHandler.fill(ForgeDirection.UNKNOWN, fluidInContainer, true); - ItemStack emptyItem = getEmptyContainer(input); - // unstackable containers like buckets are not consumed - if (outputSlot == inputSlot && input.getMaxStackSize() == 1) { - inv.setInventorySlotContents(outputSlot, emptyItem); - return true; + if (output != null && emptyItem != null) { + if (outputSlot == inputSlot) { + if (input.stackSize > 1) + return false; + } else if (!StackUtils.isIdenticalItem(output, emptyItem)) { + return false; + } else if (output.stackSize + emptyItem.stackSize > output.getMaxStackSize()) { + return false; + } } + fluidHandler.fill(ForgeDirection.UNKNOWN, fluidInContainer, true); + if (emptyItem != null) { + if (outputSlot == inputSlot) { + inv.setInventorySlotContents(outputSlot, emptyItem); + return true; + } + if (output == null) { inv.setInventorySlotContents(outputSlot, emptyItem); - } else if (StackUtils.isIdenticalItem(output, emptyItem) && (output.stackSize < output.getMaxStackSize())) { + } else { output.stackSize++; } - // else output item is consumed } inv.decrStackSize(inputSlot, 1); return true; @@ -239,17 +248,11 @@ public final class FluidHelper { } public static ItemStack getEmptyContainer(ItemStack container) { - Item item = container.getItem(); - if (item instanceof IFluidContainerItem) { - ItemStack empty = container.copy(); - empty.stackSize = 1; - IFluidContainerItem containerItem = (IFluidContainerItem) item; - containerItem.drain(empty, Integer.MAX_VALUE, true); - return empty; - } + if (item == null) + return null; - return FluidContainerRegistry.drainFluidContainer(container); + return item.getContainerItem(container); } public static ItemStack getFilledContainer(Fluid fluid, ItemStack empty) { From 9cbb6e390b0580913261c71a9cbf99b6b7842326 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 13 Dec 2014 18:58:49 -0800 Subject: [PATCH 02/13] Cleanup, use Fluids enum --- .../gadgets/TileAlvearyHygroregulator.java | 11 +- .../java/forestry/core/EventHandlerCore.java | 27 ++-- src/main/java/forestry/core/ForestryCore.java | 91 +++++++------ .../java/forestry/core/config/Defaults.java | 14 -- .../java/forestry/core/fluids/Fluids.java | 47 ++++--- .../java/forestry/core/items/ItemFruit.java | 13 +- src/main/java/forestry/core/utils/Fluids.java | 59 --------- .../forestry/core/utils/LiquidHelper.java | 52 ++------ .../java/forestry/core/utils/RecipeUtil.java | 14 +- .../forestry/energy/gadgets/EngineBronze.java | 34 ++--- .../factory/gadgets/MachineBottler.java | 7 +- .../factory/gadgets/MachineCarpenter.java | 5 +- .../factory/gadgets/MachineFabricator.java | 4 +- .../factory/gadgets/MachineFermenter.java | 3 +- .../factory/gadgets/MachineRaintank.java | 4 +- .../farming/gadgets/TileFarmPlain.java | 5 +- .../farming/logic/FarmLogicWatered.java | 23 ++-- .../forestry/plugins/PluginApiculture.java | 20 +-- .../forestry/plugins/PluginArboriculture.java | 42 +++--- .../plugins/PluginBuildCraftFuels.java | 18 +-- .../plugins/PluginBuildCraftRecipes.java | 8 +- .../java/forestry/plugins/PluginFactory.java | 123 +++++++++--------- .../java/forestry/plugins/PluginFood.java | 5 +- src/main/java/forestry/plugins/PluginIC2.java | 17 +-- .../plugins/PluginLepidopterology.java | 4 +- .../java/forestry/plugins/PluginMail.java | 7 +- .../java/forestry/plugins/PluginNatura.java | 9 +- .../java/forestry/plugins/PluginStorage.java | 14 +- 28 files changed, 302 insertions(+), 378 deletions(-) delete mode 100755 src/main/java/forestry/core/utils/Fluids.java diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java index e95542055..87d8603a2 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java @@ -19,8 +19,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -28,14 +26,13 @@ import forestry.api.apiculture.IAlvearyComponent; import forestry.api.core.ForestryAPI; import forestry.core.config.Defaults; import forestry.core.fluids.FluidHelper; +import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.InventoryAdapter; -import forestry.core.utils.LiquidHelper; -import forestry.core.utils.StackUtils; public class TileAlvearyHygroregulator extends TileAlveary implements IInventory, ILiquidTankContainer { @@ -70,9 +67,9 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory public TileAlvearyHygroregulator() { super(BLOCK_META); - Fluid water = FluidRegistry.getFluid(Defaults.LIQUID_WATER); - Fluid lava = FluidRegistry.getFluid(Defaults.LIQUID_LAVA); - Fluid liquidIce = FluidRegistry.getFluid(Defaults.LIQUID_ICE); + Fluid water = Fluids.WATER.get(); + Fluid lava = Fluids.LAVA.get(); + Fluid liquidIce = Fluids.ICE.get(); liquidTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, water, lava, liquidIce); tankManager = new TankManager(liquidTank); diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index 4be006a84..c3b3df08c 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -10,23 +10,26 @@ ******************************************************************************/ package forestry.core; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.EnumErrorCode; -import forestry.core.interfaces.IOreDictionaryHandler; -import forestry.core.interfaces.IPickupHandler; -import forestry.core.interfaces.ISaveEventHandler; -import forestry.core.render.TextureManager; -import forestry.core.utils.LiquidHelper; -import forestry.plugins.PluginManager; import net.minecraft.item.ItemStack; + import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import forestry.api.core.EnumErrorCode; +import forestry.core.fluids.Fluids; +import forestry.core.interfaces.IOreDictionaryHandler; +import forestry.core.interfaces.IPickupHandler; +import forestry.core.interfaces.ISaveEventHandler; +import forestry.core.render.TextureManager; +import forestry.plugins.PluginManager; + public class EventHandlerCore { public EventHandlerCore() { @@ -87,7 +90,7 @@ public class EventHandlerCore { EnumErrorCode.initIcons(event.map); TextureManager.getInstance().initDefaultIcons(event.map); } else if(event.map.getTextureType() == 0) - LiquidHelper.resetLiquidIcons(event.map); + Fluids.resetFluidIcons(event.map); } @SubscribeEvent diff --git a/src/main/java/forestry/core/ForestryCore.java b/src/main/java/forestry/core/ForestryCore.java index 0905e75b4..29f61b83a 100755 --- a/src/main/java/forestry/core/ForestryCore.java +++ b/src/main/java/forestry/core/ForestryCore.java @@ -20,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.FluidRegistry; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; @@ -39,6 +38,7 @@ import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.config.Version; +import forestry.core.fluids.Fluids; import forestry.core.gadgets.TileEngine; import forestry.core.gadgets.TileMachine; import forestry.core.gadgets.TileMill; @@ -90,17 +90,18 @@ public class ForestryCore { Defaults.ENGINE_COPPER_FUEL_VALUE_PEAT, Defaults.ENGINE_COPPER_CYCLE_DURATION_PEAT)); FuelManager.copperEngineFuel.put(ForestryItem.bituminousPeat.getItemStack(), new EngineCopperFuel(ForestryItem.bituminousPeat.getItemStack(), Defaults.ENGINE_COPPER_FUEL_VALUE_BITUMINOUS_PEAT, Defaults.ENGINE_COPPER_CYCLE_DURATION_BITUMINOUS_PEAT)); - FuelManager.bronzeEngineFuel.put(FluidRegistry.getFluid(Defaults.LIQUID_BIOMASS), new EngineBronzeFuel(FluidRegistry.getFluid(Defaults.LIQUID_BIOMASS), + + FuelManager.bronzeEngineFuel.put(Fluids.BIOMASS.get(), new EngineBronzeFuel(Fluids.BIOMASS.get(), Defaults.ENGINE_FUEL_VALUE_BIOMASS, (int) (Defaults.ENGINE_CYCLE_DURATION_BIOMASS * GameMode.getGameMode().getFloatSetting("fuel.biomass.biogas")), 1)); - FuelManager.bronzeEngineFuel.put(FluidRegistry.getFluid(Defaults.LIQUID_WATER), new EngineBronzeFuel(FluidRegistry.getFluid(Defaults.LIQUID_WATER), + FuelManager.bronzeEngineFuel.put(Fluids.WATER.get(), new EngineBronzeFuel(Fluids.WATER.get(), Defaults.ENGINE_FUEL_VALUE_WATER, Defaults.ENGINE_CYCLE_DURATION_WATER, 3)); - FuelManager.bronzeEngineFuel.put(FluidRegistry.getFluid(Defaults.LIQUID_MILK), new EngineBronzeFuel(FluidRegistry.getFluid(Defaults.LIQUID_MILK), + FuelManager.bronzeEngineFuel.put(Fluids.MILK.get(), new EngineBronzeFuel(Fluids.MILK.get(), Defaults.ENGINE_FUEL_VALUE_MILK, Defaults.ENGINE_CYCLE_DURATION_MILK, 3)); - FuelManager.bronzeEngineFuel.put(FluidRegistry.getFluid(Defaults.LIQUID_SEEDOIL), new EngineBronzeFuel(FluidRegistry.getFluid(Defaults.LIQUID_SEEDOIL), + FuelManager.bronzeEngineFuel.put(Fluids.SEEDOIL.get(), new EngineBronzeFuel(Fluids.SEEDOIL.get(), Defaults.ENGINE_FUEL_VALUE_SEED_OIL, Defaults.ENGINE_CYCLE_DURATION_SEED_OIL, 1)); - FuelManager.bronzeEngineFuel.put(FluidRegistry.getFluid(Defaults.LIQUID_HONEY), new EngineBronzeFuel(FluidRegistry.getFluid(Defaults.LIQUID_HONEY), + FuelManager.bronzeEngineFuel.put(Fluids.HONEY.get(), new EngineBronzeFuel(Fluids.HONEY.get(), Defaults.ENGINE_FUEL_VALUE_HONEY, Defaults.ENGINE_CYCLE_DURATION_HONEY, 1)); - FuelManager.bronzeEngineFuel.put(FluidRegistry.getFluid(Defaults.LIQUID_JUICE), new EngineBronzeFuel(FluidRegistry.getFluid(Defaults.LIQUID_JUICE), + FuelManager.bronzeEngineFuel.put(Fluids.JUICE.get(), new EngineBronzeFuel(Fluids.JUICE.get(), Defaults.ENGINE_FUEL_VALUE_JUICE, Defaults.ENGINE_CYCLE_DURATION_JUICE, 1)); // Set rain substrates @@ -149,60 +150,58 @@ public class ForestryCore { private void registerLiquidContainers() { // Add lava and water buckets to the API in case this has not been done yet. if (LiquidHelper.isEmptyLiquidData()) { - LiquidHelper.injectLiquidContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket)); - LiquidHelper.injectLiquidContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, new ItemStack(Items.water_bucket), new ItemStack(Items.bucket)); + LiquidHelper.injectLiquidContainer(Fluids.LAVA, Defaults.BUCKET_VOLUME, new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket)); + LiquidHelper.injectLiquidContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, new ItemStack(Items.water_bucket), new ItemStack(Items.bucket)); } // Glass - LiquidHelper.getOrCreateLiquid(Defaults.LIQUID_GLASS); + Fluids.GLASS.register(); // Set default lava, water and biofuel buckets - LiquidHelper.getOrCreateLiquid(Defaults.LIQUID_MILK); - LiquidHelper.injectLiquidContainer(Defaults.LIQUID_MILK, Defaults.BUCKET_VOLUME, new ItemStack(Items.milk_bucket), new ItemStack(Items.bucket)); + Fluids.MILK.register(); + LiquidHelper.injectLiquidContainer(Fluids.MILK, Defaults.BUCKET_VOLUME, new ItemStack(Items.milk_bucket), new ItemStack(Items.bucket)); // Lava - LiquidHelper.injectTinContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, ForestryItem.canLava.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, ForestryItem.refractoryLava.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + LiquidHelper.injectTinContainer(Fluids.LAVA, Defaults.BUCKET_VOLUME, ForestryItem.canLava.getItemStack(), ForestryItem.canEmpty.getItemStack()); + LiquidHelper.injectRefractoryContainer(Fluids.LAVA, Defaults.BUCKET_VOLUME, ForestryItem.refractoryLava.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); // Water - LiquidHelper.injectLiquidContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, new ItemStack(Items.potionitem, 1, 0), - new ItemStack(Items.glass_bottle)); - LiquidHelper.injectTinContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, ForestryItem.canWater.getItemStack(), - ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleWater.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, ForestryItem.refractoryWater.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + LiquidHelper.injectLiquidContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.glass_bottle)); + LiquidHelper.injectTinContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, ForestryItem.canWater.getItemStack(), ForestryItem.canEmpty.getItemStack()); + LiquidHelper.injectWaxContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleWater.getItemStack(), ForestryItem.waxCapsule.getItemStack()); + LiquidHelper.injectRefractoryContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, ForestryItem.refractoryWater.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - LiquidHelper.getOrCreateLiquid(Defaults.LIQUID_BIOMASS); - LiquidHelper.injectLiquidContainer(Defaults.LIQUID_BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.bucketBiomass.getItemStack(), new ItemStack(Items.bucket)); - LiquidHelper.injectTinContainer(Defaults.LIQUID_BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.canBiomass.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Defaults.LIQUID_BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleBiomass.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.refractoryBiomass.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + Fluids.BIOMASS.register(); + LiquidHelper.injectLiquidContainer(Fluids.BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.bucketBiomass.getItemStack(), new ItemStack(Items.bucket)); + LiquidHelper.injectTinContainer(Fluids.BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.canBiomass.getItemStack(), ForestryItem.canEmpty.getItemStack()); + LiquidHelper.injectWaxContainer(Fluids.BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleBiomass.getItemStack(), ForestryItem.waxCapsule.getItemStack()); + LiquidHelper.injectRefractoryContainer(Fluids.BIOMASS, Defaults.BUCKET_VOLUME, ForestryItem.refractoryBiomass.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - LiquidHelper.getOrCreateLiquid(Defaults.LIQUID_ETHANOL); - LiquidHelper.injectLiquidContainer(Defaults.LIQUID_ETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.bucketBiofuel.getItemStack(), new ItemStack(Items.bucket)); - LiquidHelper.injectTinContainer(Defaults.LIQUID_ETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.canBiofuel.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Defaults.LIQUID_ETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleBiofuel.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_ETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.refractoryBiofuel.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + Fluids.BIOETHANOL.register(); + LiquidHelper.injectLiquidContainer(Fluids.BIOETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.bucketBiofuel.getItemStack(), new ItemStack(Items.bucket)); + LiquidHelper.injectTinContainer(Fluids.BIOETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.canBiofuel.getItemStack(), ForestryItem.canEmpty.getItemStack()); + LiquidHelper.injectWaxContainer(Fluids.BIOETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleBiofuel.getItemStack(), ForestryItem.waxCapsule.getItemStack()); + LiquidHelper.injectRefractoryContainer(Fluids.BIOETHANOL, Defaults.BUCKET_VOLUME, ForestryItem.refractoryBiofuel.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - LiquidHelper.getOrCreateLiquid(Defaults.LIQUID_SEEDOIL); - LiquidHelper.injectTinContainer(Defaults.LIQUID_SEEDOIL, Defaults.BUCKET_VOLUME, ForestryItem.canSeedOil.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Defaults.LIQUID_SEEDOIL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleSeedOil.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_SEEDOIL, Defaults.BUCKET_VOLUME, ForestryItem.refractorySeedOil.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + Fluids.SEEDOIL.register(); + LiquidHelper.injectTinContainer(Fluids.SEEDOIL, Defaults.BUCKET_VOLUME, ForestryItem.canSeedOil.getItemStack(), ForestryItem.canEmpty.getItemStack()); + LiquidHelper.injectWaxContainer(Fluids.SEEDOIL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleSeedOil.getItemStack(), ForestryItem.waxCapsule.getItemStack()); + LiquidHelper.injectRefractoryContainer(Fluids.SEEDOIL, Defaults.BUCKET_VOLUME, ForestryItem.refractorySeedOil.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - LiquidHelper.getOrCreateLiquid(Defaults.LIQUID_HONEY); - LiquidHelper.injectTinContainer(Defaults.LIQUID_HONEY, Defaults.BUCKET_VOLUME, ForestryItem.canHoney.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Defaults.LIQUID_HONEY, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleHoney.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_HONEY, Defaults.BUCKET_VOLUME, ForestryItem.refractoryHoney.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + Fluids.HONEY.register(); + LiquidHelper.injectTinContainer(Fluids.HONEY, Defaults.BUCKET_VOLUME, ForestryItem.canHoney.getItemStack(), ForestryItem.canEmpty.getItemStack()); + LiquidHelper.injectWaxContainer(Fluids.HONEY, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleHoney.getItemStack(), ForestryItem.waxCapsule.getItemStack()); + LiquidHelper.injectRefractoryContainer(Fluids.HONEY, Defaults.BUCKET_VOLUME, ForestryItem.refractoryHoney.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - LiquidHelper.getOrCreateLiquid(Defaults.LIQUID_JUICE); - LiquidHelper.injectTinContainer(Defaults.LIQUID_JUICE, Defaults.BUCKET_VOLUME, ForestryItem.canJuice.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Defaults.LIQUID_JUICE, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleJuice.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_JUICE, Defaults.BUCKET_VOLUME, ForestryItem.refractoryJuice.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + Fluids.JUICE.register(); + LiquidHelper.injectTinContainer(Fluids.JUICE, Defaults.BUCKET_VOLUME, ForestryItem.canJuice.getItemStack(), ForestryItem.canEmpty.getItemStack()); + LiquidHelper.injectWaxContainer(Fluids.JUICE, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleJuice.getItemStack(), ForestryItem.waxCapsule.getItemStack()); + LiquidHelper.injectRefractoryContainer(Fluids.JUICE, Defaults.BUCKET_VOLUME, ForestryItem.refractoryJuice.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - LiquidHelper.getOrCreateLiquid(Defaults.LIQUID_ICE); - LiquidHelper.injectTinContainer(Defaults.LIQUID_ICE, Defaults.BUCKET_VOLUME, ForestryItem.canIce.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectWaxContainer(Defaults.LIQUID_ICE, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleIce.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_ICE, Defaults.BUCKET_VOLUME, ForestryItem.refractoryIce.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + Fluids.ICE.register(); + LiquidHelper.injectTinContainer(Fluids.ICE, Defaults.BUCKET_VOLUME, ForestryItem.canIce.getItemStack(), ForestryItem.canEmpty.getItemStack()); + LiquidHelper.injectWaxContainer(Fluids.ICE, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleIce.getItemStack(), ForestryItem.waxCapsule.getItemStack()); + LiquidHelper.injectRefractoryContainer(Fluids.ICE, Defaults.BUCKET_VOLUME, ForestryItem.refractoryIce.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); } } diff --git a/src/main/java/forestry/core/config/Defaults.java b/src/main/java/forestry/core/config/Defaults.java index 104eff1e5..4cf2e08e5 100755 --- a/src/main/java/forestry/core/config/Defaults.java +++ b/src/main/java/forestry/core/config/Defaults.java @@ -45,20 +45,6 @@ public class Defaults { public static final int[] FACING_WESTEAST = { FACING_WEST, FACING_EAST }; public static final int[] FACINGS_NONE = new int[0]; - public static final String LIQUID_WATER = "water"; - public static final String LIQUID_LAVA = "lava"; - public static final String LIQUID_MILK = "milk"; - public static final String LIQUID_BIOMASS = "biomass"; - public static final String LIQUID_ETHANOL = "bioethanol"; - public static final String LIQUID_SEEDOIL = "seedoil"; - public static final String LIQUID_HONEY = "honey"; - public static final String LIQUID_JUICE = "juice"; - public static final String LIQUID_ICE = "ice"; - public static final String LIQUID_MEAD = "short.mead"; - public static final String LIQUID_GLASS = "glass"; - public static final String LIQUID_OIL = "oil"; - public static final String LIQUID_FUEL = "fuel"; - // Textures public static final String TEXTURE_PATH_GUI = "textures/gui"; public static final String TEXTURE_PATH_BLOCKS = "textures/blocks"; diff --git a/src/main/java/forestry/core/fluids/Fluids.java b/src/main/java/forestry/core/fluids/Fluids.java index f148112d9..46e294f8f 100644 --- a/src/main/java/forestry/core/fluids/Fluids.java +++ b/src/main/java/forestry/core/fluids/Fluids.java @@ -10,14 +10,20 @@ ******************************************************************************/ package forestry.core.fluids; -import forestry.core.config.Defaults; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; + +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import forestry.core.render.TextureManager; + /** * * @author CovertJaguar @@ -25,7 +31,10 @@ import net.minecraftforge.fluids.FluidStack; public enum Fluids { WATER, LAVA, FUEL, BIOMASS, BIOFUEL, CREOSOTE, STEAM, BIOETHANOL, - COAL, PYROTHEUM, HONEY, MILK, JUICE, ICE, GLASS, OIL, SEEDOIL, SHORT_MEAD(Defaults.LIQUID_MEAD); + COAL, PYROTHEUM, HONEY, MILK, JUICE, ICE, GLASS, OIL, SEEDOIL, SHORT_MEAD("short.mead"); + + private static final List myLiquids = new ArrayList(values().length); + private final String tag; private Fluids() { @@ -44,24 +53,20 @@ public enum Fluids { return FluidRegistry.getFluid(tag); } - /** - * Gets a FluidStack filled with qty milliBuckets worth of Fluid. - * - * @param qty - * @return - */ - public FluidStack get(int qty) { - return FluidRegistry.getFluidStack(tag, qty); + public void register() { + Fluid fluid = get(); + if (fluid == null) { + fluid = new Fluid(tag); + FluidRegistry.registerFluid(fluid); + myLiquids.add(tag); + } } /** - * Gets a FluidStack filled with n buckets worth of Fluid. - * - * @param n - * @return + * Gets a FluidStack filled with mb milliBuckets worth of Fluid. */ - public FluidStack getB(int n) { - return FluidRegistry.getFluidStack(tag, n * FluidContainerRegistry.BUCKET_VOLUME); + public FluidStack get(int mb) { + return FluidRegistry.getFluidStack(tag, mb); } public boolean is(Fluid fluid) { @@ -82,4 +87,12 @@ public enum Fluids { return fluid == null && fluidStack == null; } + public static void resetFluidIcons(IIconRegister register) { + for (String fluidString : myLiquids) { + Fluid fluid = FluidRegistry.getFluid(fluidString); + IIcon icon = TextureManager.getInstance().registerTex(register, "liquid/" + fluid.getName()); + fluid.setIcons(icon); + } + } + } diff --git a/src/main/java/forestry/core/items/ItemFruit.java b/src/main/java/forestry/core/items/ItemFruit.java index 6948c9c1f..15591a8a5 100755 --- a/src/main/java/forestry/core/items/ItemFruit.java +++ b/src/main/java/forestry/core/items/ItemFruit.java @@ -19,11 +19,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.oredict.OreDictionary; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; - +import forestry.core.config.ForestryItem; import forestry.core.render.TextureManager; public class ItemFruit extends ItemForestryFood { @@ -49,6 +50,14 @@ public class ItemFruit extends ItemForestryFood { public IIcon getIcon() { return icons[ordinal()]; } + + public ItemStack getStack() { + return getStack(1); + } + + public ItemStack getStack(int qty) { + return ForestryItem.fruits.getItemStack(qty, ordinal()); + } } public ItemFruit() { diff --git a/src/main/java/forestry/core/utils/Fluids.java b/src/main/java/forestry/core/utils/Fluids.java deleted file mode 100755 index 0a011b318..000000000 --- a/src/main/java/forestry/core/utils/Fluids.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.utils; - -import java.util.Locale; - -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import forestry.core.fluids.FluidHelper; - -/** - * @author CovertJaguar - */ -public enum Fluids { - - WATER, LAVA, FUEL, BIOFUEL, CREOSOTE, STEAM; - - public String getTag() { - return name().toLowerCase(Locale.ENGLISH); - } - - public Fluid get() { - return FluidRegistry.getFluid(getTag()); - } - - public FluidStack get(int qty) { - return FluidRegistry.getFluidStack(getTag(), qty); - } - - public boolean is(Fluid fluid) { - return get() == fluid; - } - - public boolean is(FluidStack fluidStack) { - return fluidStack != null && get() == fluidStack.getFluid(); - } - - public boolean isContained(ItemStack containerStack) { - return containerStack != null && FluidHelper.containsFluid(containerStack, Fluids.WATER.get()); - } - - public static boolean areEqual(Fluid fluid, FluidStack fluidStack) { - if (fluidStack != null && fluid == fluidStack.getFluid()) - return true; - return fluid == null && fluidStack == null; - } -} diff --git a/src/main/java/forestry/core/utils/LiquidHelper.java b/src/main/java/forestry/core/utils/LiquidHelper.java index 157ff030f..e6ec5a3a7 100755 --- a/src/main/java/forestry/core/utils/LiquidHelper.java +++ b/src/main/java/forestry/core/utils/LiquidHelper.java @@ -10,63 +10,42 @@ ******************************************************************************/ package forestry.core.utils; -import java.util.LinkedList; - -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import forestry.api.recipes.RecipeManagers; import forestry.core.config.ForestryItem; -import forestry.core.render.TextureManager; +import forestry.core.fluids.Fluids; public class LiquidHelper { - private static final LinkedList myLiquids = new LinkedList(); - public static boolean isEmptyLiquidData() { return FluidContainerRegistry.getRegisteredFluidContainerData().length <= 0; } - public static Fluid getOrCreateLiquid(String ident) { - if (!FluidRegistry.isFluidRegistered(ident)) { - Fluid fluid = new Fluid(ident); - FluidRegistry.registerFluid(fluid); - myLiquids.add(ident); - } - return FluidRegistry.getFluid(ident); + public static void injectLiquidContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { + injectLiquidContainer(fluid, volume, filled, empty, null, 0); } - public static FluidStack getLiquid(String name, int amount) { - return FluidRegistry.getFluidStack(name, amount); + public static void injectWaxContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { + injectLiquidContainer(fluid, volume, filled, empty, ForestryItem.beeswax.getItemStack(), 10); } - public static void injectLiquidContainer(String name, int volume, ItemStack filled, ItemStack empty) { - injectLiquidContainer(name, volume, filled, empty, null, 0); + public static void injectRefractoryContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { + injectLiquidContainer(fluid, volume, filled, empty, ForestryItem.refractoryWax.getItemStack(), 10); } - public static void injectWaxContainer(String name, int volume, ItemStack filled, ItemStack empty) { - injectLiquidContainer(name, volume, filled, empty, ForestryItem.beeswax.getItemStack(), 10); + public static void injectTinContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty) { + injectLiquidContainer(fluid, volume, filled, empty, ForestryItem.ingotTin.getItemStack(), 5); } - public static void injectRefractoryContainer(String name, int volume, ItemStack filled, ItemStack empty) { - injectLiquidContainer(name, volume, filled, empty, ForestryItem.refractoryWax.getItemStack(), 10); - } - - public static void injectTinContainer(String name, int volume, ItemStack filled, ItemStack empty) { - injectLiquidContainer(name, volume, filled, empty, ForestryItem.ingotTin.getItemStack(), 5); - } - - public static void injectLiquidContainer(String name, int volume, ItemStack filled, ItemStack empty, ItemStack remnant, int chance) { - FluidStack contained = FluidRegistry.getFluidStack(name, volume); + public static void injectLiquidContainer(Fluids fluid, int volume, ItemStack filled, ItemStack empty, ItemStack remnant, int chance) { + FluidStack contained = fluid.get(volume); if (contained == null) - throw new IllegalArgumentException(String.format("Attempted to inject a liquid container for the non-existent liquid '%s'.", name)); + throw new IllegalArgumentException(String.format("Attempted to inject a liquid container for the non-existent liquid '%s'.", fluid)); FluidContainerData container = new FluidContainerData(contained, filled, empty); FluidContainerRegistry.registerFluidContainer(container); @@ -79,11 +58,4 @@ public class LiquidHelper { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[] { container.filledContainer }, container.fluid); } - public static void resetLiquidIcons(IIconRegister register) { - for (String fluidString : myLiquids) { - Fluid fluid = FluidRegistry.getFluid(fluidString); - IIcon icon = TextureManager.getInstance().registerTex(register, "liquid/" + fluid.getName()); - fluid.setIcons(icon); - } - } } diff --git a/src/main/java/forestry/core/utils/RecipeUtil.java b/src/main/java/forestry/core/utils/RecipeUtil.java index 37341c907..fe1fb3d63 100755 --- a/src/main/java/forestry/core/utils/RecipeUtil.java +++ b/src/main/java/forestry/core/utils/RecipeUtil.java @@ -21,10 +21,12 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import forestry.api.recipes.RecipeManagers; import forestry.core.config.Defaults; +import forestry.core.fluids.Fluids; import forestry.core.gui.ContainerDummy; import forestry.core.interfaces.IDescriptiveRecipe; import forestry.core.proxy.Proxies; @@ -33,17 +35,17 @@ public class RecipeUtil { private static final Container DUMMY_CONTAINER = new ContainerDummy(); - public static void injectLeveledRecipe(ItemStack resource, int fermentationValue, String output) { + public static void injectLeveledRecipe(ItemStack resource, int fermentationValue, Fluids output) { if (RecipeManagers.fermenterManager == null) return; - RecipeManagers.fermenterManager.addRecipe(resource, fermentationValue, 1.0f, FluidRegistry.getFluidStack(output, 1), FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1)); + RecipeManagers.fermenterManager.addRecipe(resource, fermentationValue, 1.0f, output.get(1), Fluids.WATER.get(1)); - if (FluidRegistry.isFluidRegistered(Defaults.LIQUID_JUICE)) - RecipeManagers.fermenterManager.addRecipe(resource, fermentationValue, 1.5f, FluidRegistry.getFluidStack(output, 1), FluidRegistry.getFluidStack(Defaults.LIQUID_JUICE, 1)); + if (FluidRegistry.isFluidRegistered(Fluids.JUICE.get())) + RecipeManagers.fermenterManager.addRecipe(resource, fermentationValue, 1.5f, output.get(1), Fluids.JUICE.get(1)); - if (FluidRegistry.isFluidRegistered(Defaults.LIQUID_HONEY)) - RecipeManagers.fermenterManager.addRecipe(resource, fermentationValue, 1.5f, FluidRegistry.getFluidStack(output, 1), FluidRegistry.getFluidStack(Defaults.LIQUID_HONEY, 1)); + if (FluidRegistry.isFluidRegistered(Fluids.HONEY.get())) + RecipeManagers.fermenterManager.addRecipe(resource, fermentationValue, 1.5f, output.get(1), Fluids.HONEY.get(1)); } /** diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index 28b2cd9d6..b26ba5d61 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -10,6 +10,20 @@ ******************************************************************************/ package forestry.energy.gadgets; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import forestry.api.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.fuels.EngineBronzeFuel; @@ -17,6 +31,7 @@ import forestry.api.fuels.FuelManager; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.FluidHelper; +import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.tanks.StandardTank; @@ -25,24 +40,8 @@ import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; import forestry.core.network.PacketPayload; -import forestry.core.utils.LiquidHelper; import forestry.core.utils.TileInventoryAdapter; -import static forestry.factory.gadgets.MachineBottler.SLOT_CAN; -import static forestry.factory.gadgets.MachineBottler.SLOT_PRODUCT; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; - public class EngineBronze extends Engine implements ISidedInventory, ILiquidTankContainer { /* CONSTANTS */ @@ -143,7 +142,8 @@ public class EngineBronze extends Engine implements ISidedInventory, ILiquidTank if (heatStage > 0.25 && shutdown) shutdown(false); else if (shutdown) - if (heatingTank.getFluidAmount() > 0 && heatingTank.getFluid().getFluid().getName().equals(Defaults.LIQUID_LAVA)) { + + if (heatingTank.getFluidAmount() > 0 && Fluids.LAVA.is(heatingTank.getFluid())) { addHeat(Defaults.ENGINE_HEAT_VALUE_LAVA); heatingTank.drain(1, true); } diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index 0a35a8f9f..e9228a06e 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -106,11 +106,10 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq } // No recipe matched. See if the liquid dictionary has anything. - if(FluidContainerRegistry.isEmptyContainer(empty)) { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(res, empty); + if(FluidHelper.isEmptyContainer(empty)) { + ItemStack filled = FluidHelper.getFilledContainer(res, empty); if(filled != null) { - FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(filled); - Recipe recipe = new Recipe(CYCLES_FILLING_DEFAULT, fluidStack, empty, filled); + Recipe recipe = new Recipe(CYCLES_FILLING_DEFAULT, res, empty, filled); recipes.add(recipe); return recipe; } diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 5e4b99397..cef212e38 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -40,6 +40,7 @@ import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.fluids.FluidHelper; +import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; @@ -146,14 +147,14 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL @Override public void addCrating(ItemStack itemStack) { ItemStack uncrated = ((forestry.core.items.ItemCrated) itemStack.getItem()).getContained(itemStack); - addRecipe(Defaults.CARPENTER_CRATING_CYCLES, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, Defaults.CARPENTER_CRATING_LIQUID_QUANTITY), + addRecipe(Defaults.CARPENTER_CRATING_CYCLES, Fluids.WATER.get(Defaults.CARPENTER_CRATING_LIQUID_QUANTITY), ForestryItem.crate.getItemStack(), itemStack, new Object[] { "###", "###", "###", '#', uncrated }); addRecipe(null, new ItemStack(uncrated.getItem(), 9, uncrated.getItemDamage()), new Object[] { "#", '#', itemStack }); } @Override public void addCrating(String toCrate, ItemStack unpack, ItemStack crated) { - addRecipe(Defaults.CARPENTER_CRATING_CYCLES, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, Defaults.CARPENTER_CRATING_LIQUID_QUANTITY), + addRecipe(Defaults.CARPENTER_CRATING_CYCLES, Fluids.WATER.get(Defaults.CARPENTER_CRATING_LIQUID_QUANTITY), ForestryItem.crate.getItemStack(), crated, new Object[] { "###", "###", "###", '#', toCrate }); addRecipe(null, new ItemStack(unpack.getItem(), 9, unpack.getItemDamage()), new Object[] { "#", '#', crated }); } diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index b44302666..8e10ad22e 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -15,6 +15,7 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.IFabricatorManager; import forestry.core.config.Defaults; +import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.tanks.StandardTank; @@ -214,8 +215,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial public MachineFabricator() { super(1100, 50, 3300); - Fluid liquidGlass = FluidRegistry.getFluid(Defaults.LIQUID_GLASS); - moltenTank = new FilteredTank(2 * Defaults.BUCKET_VOLUME, liquidGlass); + moltenTank = new FilteredTank(2 * Defaults.BUCKET_VOLUME, Fluids.GLASS.get()); moltenTank.tankMode = StandardTank.TankMode.INTERNAL; tankManager = new TankManager(moltenTank); } diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index a64926b2e..d70e068a1 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -41,6 +41,7 @@ import forestry.api.recipes.IVariableFermentable; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.FluidHelper; +import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.tanks.StandardTank; @@ -138,7 +139,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL @Override public void addRecipe(ItemStack resource, int fermentationValue, float modifier, FluidStack output) { - addRecipe(resource, fermentationValue, modifier, output, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000)); + addRecipe(resource, fermentationValue, modifier, output, Fluids.WATER.get(1000)); } public static Recipe findMatchingRecipe(ItemStack res, FluidStack liqu) { diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index 939587e67..b9ddcf208 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -30,12 +30,12 @@ import forestry.api.core.ForestryAPI; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.FluidHelper; +import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; -import forestry.core.utils.Fluids; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; @@ -45,7 +45,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui /* CONSTANTS */ public static final short SLOT_RESOURCE = 0; public static final short SLOT_PRODUCT = 1; - private static final FluidStack STACK_WATER = FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, Defaults.RAINTANK_AMOUNT_PER_UPDATE); + private static final FluidStack STACK_WATER = Fluids.WATER.get(Defaults.RAINTANK_AMOUNT_PER_UPDATE); /* MEMBER */ public FilteredTank resourceTank; diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index b0014ebd1..31543a143 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -48,6 +48,7 @@ import forestry.core.GameMode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.FluidHelper; +import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.interfaces.IClimatised; @@ -434,7 +435,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable else hasFertilizer = true; - FluidStack liquid = FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, logic.getWaterConsumption(getHydrationModifier())); + FluidStack liquid = Fluids.WATER.get(logic.getWaterConsumption(getHydrationModifier())); if (liquid.amount > 0 && !hasLiquid(liquid)) continue; else @@ -557,7 +558,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable } // Check water - FluidStack liquid = FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, provider.getWaterConsumption(getHydrationModifier())); + FluidStack liquid = Fluids.WATER.get(provider.getWaterConsumption(getHydrationModifier())); if (liquid.amount > 0 && !hasLiquid(liquid)) { setErrorState(EnumErrorCode.NOLIQUID); return false; diff --git a/src/main/java/forestry/farming/logic/FarmLogicWatered.java b/src/main/java/forestry/farming/logic/FarmLogicWatered.java index a2b50cdea..9899b59fb 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicWatered.java +++ b/src/main/java/forestry/farming/logic/FarmLogicWatered.java @@ -10,31 +10,30 @@ ******************************************************************************/ package forestry.farming.logic; -import forestry.api.farming.IFarmHousing; -import forestry.core.config.Defaults; -import forestry.core.proxy.Proxies; -import forestry.core.utils.BlockUtil; -import forestry.core.utils.LiquidHelper; -import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; -import forestry.core.utils.Vect; +import java.util.ArrayList; +import java.util.Collection; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; -import java.util.Collection; +import forestry.api.farming.IFarmHousing; +import forestry.core.fluids.Fluids; +import forestry.core.utils.BlockUtil; +import forestry.core.utils.StackUtils; +import forestry.core.utils.Utils; +import forestry.core.utils.Vect; public abstract class FarmLogicWatered extends FarmLogic { protected ItemStack ground; private final ItemStack[] resource; - private static final FluidStack STACK_WATER = new FluidStack(FluidRegistry.getFluid(Defaults.LIQUID_WATER), 1000); + private static final FluidStack STACK_WATER = Fluids.WATER.get(1000); ArrayList produce = new ArrayList(); diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 4ab0a92be..b3a009d30 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -145,6 +145,7 @@ import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.config.Property; +import forestry.core.fluids.Fluids; import forestry.core.gadgets.BlockBase; import forestry.core.gadgets.MachineDefinition; import forestry.core.gadgets.TileAnalyzer; @@ -563,13 +564,13 @@ public class PluginApiculture extends ForestryPlugin { '#', ForestryItem.propolis.getItemStack(1, 2)); // / CANDLES - RecipeManagers.carpenterManager.addRecipe(30, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 600), null, ForestryBlock.candle.getItemStack(24), + RecipeManagers.carpenterManager.addRecipe(30, Fluids.WATER.get(600), null, ForestryBlock.candle.getItemStack(24), " X ", "###", "###", '#', ForestryItem.beeswax, 'X', Items.string); - RecipeManagers.carpenterManager.addRecipe(10, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 200), null, ForestryBlock.candle.getItemStack(6), + RecipeManagers.carpenterManager.addRecipe(10, Fluids.WATER.get(200), null, ForestryBlock.candle.getItemStack(6), "#X#", '#', ForestryItem.beeswax, 'X', ForestryItem.craftingMaterial.getItemStack(1, 2)); @@ -639,20 +640,20 @@ public class PluginApiculture extends ForestryPlugin { 'W', ForestryItem.craftingMaterial.getItemStack(1, 3)); // / SQUEEZER - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeyDrop.getItemStack()}, FluidRegistry.getFluidStack(Defaults.LIQUID_HONEY, Defaults.FLUID_PER_HONEY_DROP), + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeyDrop.getItemStack()}, Fluids.HONEY.get(Defaults.FLUID_PER_HONEY_DROP), ForestryItem.propolis.getItemStack(), 5); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeydew.getItemStack()}, FluidRegistry.getFluidStack(Defaults.LIQUID_HONEY, Defaults.FLUID_PER_HONEY_DROP)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.sand)}, FluidRegistry.getFluidStack(Defaults.LIQUID_LAVA, 2000)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.dirt)}, FluidRegistry.getFluidStack(Defaults.LIQUID_LAVA, 1600)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.honeydew.getItemStack()}, Fluids.HONEY.get(Defaults.FLUID_PER_HONEY_DROP)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.sand)}, Fluids.LAVA.get(2000)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.dirt)}, Fluids.LAVA.get(1600)); // / CARPENTER - RecipeManagers.carpenterManager.addRecipe(100, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 2000), null, ForestryItem.beealyzer.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.get(2000), null, ForestryItem.beealyzer.getItemStack(), "X#X", "X#X", "RDR", '#', Blocks.glass_pane, 'X', "ingotTin", 'R', Items.redstone, 'D', Items.diamond); - RecipeManagers.carpenterManager.addRecipe(50, FluidRegistry.getFluidStack(Defaults.LIQUID_HONEY, 500), null, ForestryItem.craftingMaterial.getItemStack(1, 6), + RecipeManagers.carpenterManager.addRecipe(50, Fluids.HONEY.get(500), null, ForestryItem.craftingMaterial.getItemStack(1, 6), " J ", "###", "WPW", '#', "plankWood", 'J', ForestryItem.royalJelly, @@ -707,8 +708,7 @@ public class PluginApiculture extends ForestryPlugin { ForestryItem.craftingMaterial.getItemStack(1, 2), ForestryItem.propolis.getItemStack()}, new int[]{60, 10}); // / FERMENTER - RecipeManagers.fermenterManager.addRecipe(ForestryItem.honeydew.getItemStack(), 500, 1.0f, FluidRegistry.getFluidStack(Defaults.LIQUID_MEAD, 1), - FluidRegistry.getFluidStack(Defaults.LIQUID_HONEY, 1)); + RecipeManagers.fermenterManager.addRecipe(ForestryItem.honeydew.getItemStack(), 500, 1.0f, Fluids.SHORT_MEAD.get(1), Fluids.HONEY.get(1)); // ANALYZER definitionAnalyzer.recipes = createAlyzerRecipes(ForestryBlock.core.block(), Defaults.DEFINITION_ANALYZER_META); diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 2f33f7e73..58b0f989c 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -133,6 +133,7 @@ import forestry.core.GameMode; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; +import forestry.core.fluids.Fluids; import forestry.core.gadgets.BlockBase; import forestry.core.gadgets.MachineDefinition; import forestry.core.genetics.Allele; @@ -412,7 +413,7 @@ public class PluginArboriculture extends ForestryPlugin { ItemStack logStack = forestryBlock.getItemStack(1, i); ItemStack fireproofLogStack = fireproofLog.getItemStack(1, i); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), fireproofLogStack, new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), fireproofLogStack, new Object[]{ " # ", "#X#", " # ", @@ -427,7 +428,7 @@ public class PluginArboriculture extends ForestryPlugin { ForestryBlock fireproofPlank = BlockFireproofPlanks.getFireproofPlanks((BlockPlanks)plank.block()); ItemStack plankStack = plank.getItemStack(1, i); ItemStack fireproofPlankStack = fireproofPlank.getItemStack(5, i); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), fireproofPlankStack, new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), fireproofPlankStack, new Object[]{ "X#X", "#X#", "X#X", @@ -439,7 +440,7 @@ public class PluginArboriculture extends ForestryPlugin { ForestryBlock fireproofPlank = BlockFireproofPlanks.getFireproofPlanks((BlockPlanks)plank.block()); ItemStack plankStack = plank.getItemStack(1, i); ItemStack fireproofPlankStack = fireproofPlank.getItemStack(5, i); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), fireproofPlankStack, new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), fireproofPlankStack, new Object[]{ "X#X", "#X#", "X#X", @@ -477,22 +478,25 @@ public class PluginArboriculture extends ForestryPlugin { Proxies.common.addRecipe(ForestryBlock.fences2.getItemStack(4, i), "###", "# #", '#', ForestryBlock.planks2.getItemStack(1, i)); // Treealyzer - RecipeManagers.carpenterManager.addRecipe(100, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 2000), null, ForestryItem.treealyzer.getItemStack(), "X#X", "X#X", "RDR", + RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.get(2000), null, ForestryItem.treealyzer.getItemStack(), "X#X", "X#X", "RDR", '#', Blocks.glass_pane, 'X', "ingotCopper", 'R', Items.redstone, 'D', Items.diamond); // SQUEEZER RECIPES - RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[]{ForestryItem.fruits.getItemStack(1, EnumFruit.CHERRY.ordinal())}, FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, 5 * GameMode.getGameMode().getIntegerSetting("squeezer.liquid.seed")), ForestryItem.mulch.getItemStack(), 5); - RecipeManagers.squeezerManager.addRecipe(60, new ItemStack[]{ForestryItem.fruits.getItemStack(1, EnumFruit.WALNUT.ordinal())}, FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, 18 * GameMode.getGameMode().getIntegerSetting("squeezer.liquid.seed")), ForestryItem.mulch.getItemStack(), 5); - RecipeManagers.squeezerManager.addRecipe(70, new ItemStack[]{ForestryItem.fruits.getItemStack(1, EnumFruit.CHESTNUT.ordinal())}, FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, 22 * GameMode.getGameMode().getIntegerSetting("squeezer.liquid.seed")), ForestryItem.mulch.getItemStack(), 2); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.fruits.getItemStack(1, EnumFruit.LEMON.ordinal())}, FluidRegistry.getFluidStack(Defaults.LIQUID_JUICE, GameMode.getGameMode().getIntegerSetting("squeezer.liquid.apple") * 2), ForestryItem.mulch.getItemStack(), (int) Math.floor(GameMode.getGameMode().getIntegerSetting("squeezer.mulch.apple") * 0.5f)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.fruits.getItemStack(1, EnumFruit.PLUM.ordinal())}, FluidRegistry.getFluidStack(Defaults.LIQUID_JUICE, (int) Math.floor(GameMode.getGameMode().getIntegerSetting("squeezer.liquid.apple") * 0.5f)), ForestryItem.mulch.getItemStack(), GameMode.getGameMode().getIntegerSetting("squeezer.mulch.apple") * 3); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.fruits.getItemStack(1, EnumFruit.PAPAYA.ordinal())}, FluidRegistry.getFluidStack(Defaults.LIQUID_JUICE, GameMode.getGameMode().getIntegerSetting("squeezer.liquid.apple") * 3), ForestryItem.mulch.getItemStack(), (int) Math.floor(GameMode.getGameMode().getIntegerSetting("squeezer.mulch.apple") * 0.5f)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.fruits.getItemStack(1, EnumFruit.DATES.ordinal())}, FluidRegistry.getFluidStack(Defaults.LIQUID_JUICE, (int) Math.floor(GameMode.getGameMode().getIntegerSetting("squeezer.liquid.apple") * 0.25)), ForestryItem.mulch.getItemStack(), (int) Math.floor(GameMode.getGameMode().getIntegerSetting("squeezer.mulch.apple"))); + int seedOilMultiplier = GameMode.getGameMode().getIntegerSetting("squeezer.liquid.seed"); + int juiceMultiplier = GameMode.getGameMode().getIntegerSetting("squeezer.liquid.apple"); + int mulchMultiplier = GameMode.getGameMode().getIntegerSetting("squeezer.mulch.apple"); + RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[]{EnumFruit.CHERRY.getStack()}, Fluids.SEEDOIL.get(5 * seedOilMultiplier), ForestryItem.mulch.getItemStack(), 5); + RecipeManagers.squeezerManager.addRecipe(60, new ItemStack[]{EnumFruit.WALNUT.getStack()}, Fluids.SEEDOIL.get(18 * seedOilMultiplier), ForestryItem.mulch.getItemStack(), 5); + RecipeManagers.squeezerManager.addRecipe(70, new ItemStack[]{EnumFruit.CHESTNUT.getStack()}, Fluids.SEEDOIL.get(22 * seedOilMultiplier), ForestryItem.mulch.getItemStack(), 2); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{EnumFruit.LEMON.getStack()}, Fluids.JUICE.get(juiceMultiplier * 2), ForestryItem.mulch.getItemStack(), (int) Math.floor(mulchMultiplier * 0.5f)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{EnumFruit.PLUM.getStack()}, Fluids.JUICE.get((int) Math.floor(juiceMultiplier * 0.5f)), ForestryItem.mulch.getItemStack(), mulchMultiplier * 3); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{EnumFruit.PAPAYA.getStack()}, Fluids.JUICE.get(juiceMultiplier * 3), ForestryItem.mulch.getItemStack(), (int) Math.floor(mulchMultiplier * 0.5f)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{EnumFruit.DATES.getStack()}, Fluids.JUICE.get((int) Math.floor(juiceMultiplier * 0.25)), ForestryItem.mulch.getItemStack(), mulchMultiplier); - RecipeUtil.injectLeveledRecipe(ForestryItem.sapling.getItemStack(), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS); + RecipeUtil.injectLeveledRecipe(ForestryItem.sapling.getItemStack(), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); // Stairs for (int i = 0; i < 16; i++) { @@ -918,17 +922,17 @@ public class PluginArboriculture extends ForestryPlugin { Allele.fruitApple = new AlleleFruit("fruitApple", new FruitProviderRandom("apple", pomes, new ItemStack(Items.apple), 1.0f).setColour(0xff2e2e).setOverlay("pomes")); Allele.fruitCocoa = new AlleleFruit("fruitCocoa", new FruitProviderPod("cocoa", jungle, EnumPodType.COCOA)); // .setColours(0xecdca5, 0xc4d24a), true); - Allele.fruitChestnut = new AlleleFruit("fruitChestnut", new FruitProviderRipening("chestnut", nux, ForestryItem.fruits.getItemStack(1, EnumFruit.CHESTNUT.ordinal()), 1.0f).setRipeningPeriod(6).setColours(0x7f333d, 0xc4d24a).setOverlay("nuts"), true); - Allele.fruitWalnut = new AlleleFruit("fruitWalnut", new FruitProviderRipening("walnut", nux, ForestryItem.fruits.getItemStack(1, EnumFruit.WALNUT.ordinal()), 1.0f).setRipeningPeriod(8).setColours(0xfba248, 0xc4d24a).setOverlay("nuts"), true); - Allele.fruitCherry = new AlleleFruit("fruitCherry", new FruitProviderRipening("cherry", prunes, ForestryItem.fruits.getItemStack(1, EnumFruit.CHERRY.ordinal()), 1.0f).setColours(0xff2e2e, 0xc4d24a).setOverlay("berries"), true); - Allele.fruitDates = new AlleleFruit("fruitDates", new FruitProviderPod("dates", jungle, EnumPodType.DATES, ForestryItem.fruits.getItemStack(4, EnumFruit.DATES.ordinal()))); - Allele.fruitPapaya = new AlleleFruit("fruitPapaya", new FruitProviderPod("papaya", jungle, EnumPodType.PAPAYA, ForestryItem.fruits.getItemStack(1, EnumFruit.PAPAYA.ordinal()))); + Allele.fruitChestnut = new AlleleFruit("fruitChestnut", new FruitProviderRipening("chestnut", nux, EnumFruit.CHESTNUT.getStack(), 1.0f).setRipeningPeriod(6).setColours(0x7f333d, 0xc4d24a).setOverlay("nuts"), true); + Allele.fruitWalnut = new AlleleFruit("fruitWalnut", new FruitProviderRipening("walnut", nux, EnumFruit.WALNUT.getStack(), 1.0f).setRipeningPeriod(8).setColours(0xfba248, 0xc4d24a).setOverlay("nuts"), true); + Allele.fruitCherry = new AlleleFruit("fruitCherry", new FruitProviderRipening("cherry", prunes, EnumFruit.CHERRY.getStack(), 1.0f).setColours(0xff2e2e, 0xc4d24a).setOverlay("berries"), true); + Allele.fruitDates = new AlleleFruit("fruitDates", new FruitProviderPod("dates", jungle, EnumPodType.DATES, EnumFruit.DATES.getStack(4))); + Allele.fruitPapaya = new AlleleFruit("fruitPapaya", new FruitProviderPod("papaya", jungle, EnumPodType.PAPAYA, EnumFruit.PAPAYA.getStack())); // Allele.fruitCoconut = new AlleleFruit("fruitCoconut", new // FruitProviderPod("coconut", jungle, EnumPodType.COCONUT, new // ItemStack[] { new ItemStack( // ForestryItem.fruits, 1, EnumFruit.COCONUT.ordinal()) })); - Allele.fruitLemon = new AlleleFruit("fruitLemon", new FruitProviderRipening("lemon", prunes, ForestryItem.fruits.getItemStack(1, EnumFruit.LEMON.ordinal()), 1.0f).setColours(0xeeee00, 0x99ff00).setOverlay("citrus"), true); - Allele.fruitPlum = new AlleleFruit("fruitPlum", new FruitProviderRipening("plum", prunes, ForestryItem.fruits.getItemStack(1, EnumFruit.PLUM.ordinal()), 1.0f).setColours(0x663446, 0xeeff1a).setOverlay("plums"), true); + Allele.fruitLemon = new AlleleFruit("fruitLemon", new FruitProviderRipening("lemon", prunes, EnumFruit.LEMON.getStack(), 1.0f).setColours(0xeeee00, 0x99ff00).setOverlay("citrus"), true); + Allele.fruitPlum = new AlleleFruit("fruitPlum", new FruitProviderRipening("plum", prunes, EnumFruit.PLUM.getStack(), 1.0f).setColours(0x663446, 0xeeff1a).setOverlay("plums"), true); // / TREES // GROWTH PROVIDER 1350 - 1399 Allele.growthLightlevel = new AlleleGrowth("growthLightlevel", new GrowthProvider()); diff --git a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java index 002241592..0e38ec085 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftFuels.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftFuels.java @@ -11,13 +11,13 @@ package forestry.plugins; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import cpw.mods.fml.common.Optional; import forestry.core.GameMode; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; +import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; import forestry.core.utils.LiquidHelper; @@ -39,19 +39,19 @@ public class PluginBuildCraftFuels extends ForestryPlugin { @Optional.Method(modid = "BuildCraftAPI|fuels") @Override public void doInit() { - BuildcraftFuelRegistry.coolant.addCoolant(FluidRegistry.getFluid(Defaults.LIQUID_ICE), 10.0f); + BuildcraftFuelRegistry.coolant.addCoolant(Fluids.ICE.get(), 10.0f); - Fluid ethanol = FluidRegistry.getFluidStack(Defaults.LIQUID_ETHANOL, 1).getFluid(); + Fluid ethanol = Fluids.BIOETHANOL.get(); int ethanolPower = 40; int ethanolBurnTime = Math.round(Defaults.ENGINE_CYCLE_DURATION_ETHANOL * GameMode.getGameMode().getFloatSetting("fuel.ethanol.combustion")); BuildcraftFuelRegistry.fuel.addFuel(ethanol, ethanolPower, ethanolBurnTime); - LiquidHelper.injectWaxContainer(Defaults.LIQUID_OIL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleOil.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectWaxContainer(Defaults.LIQUID_FUEL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleFuel.getItemStack(), ForestryItem.waxCapsule.getItemStack()); - LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_OIL, Defaults.BUCKET_VOLUME, ForestryItem.refractoryOil.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - LiquidHelper.injectRefractoryContainer(Defaults.LIQUID_FUEL, Defaults.BUCKET_VOLUME, ForestryItem.refractoryFuel.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); - LiquidHelper.injectTinContainer(Defaults.LIQUID_OIL, Defaults.BUCKET_VOLUME, ForestryItem.canOil.getItemStack(), ForestryItem.canEmpty.getItemStack()); - LiquidHelper.injectTinContainer(Defaults.LIQUID_FUEL, Defaults.BUCKET_VOLUME, ForestryItem.canFuel.getItemStack(), ForestryItem.canEmpty.getItemStack()); + LiquidHelper.injectWaxContainer(Fluids.OIL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleOil.getItemStack(), ForestryItem.waxCapsule.getItemStack()); + LiquidHelper.injectWaxContainer(Fluids.FUEL, Defaults.BUCKET_VOLUME, ForestryItem.waxCapsuleFuel.getItemStack(), ForestryItem.waxCapsule.getItemStack()); + LiquidHelper.injectRefractoryContainer(Fluids.OIL, Defaults.BUCKET_VOLUME, ForestryItem.refractoryOil.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + LiquidHelper.injectRefractoryContainer(Fluids.FUEL, Defaults.BUCKET_VOLUME, ForestryItem.refractoryFuel.getItemStack(), ForestryItem.refractoryEmpty.getItemStack()); + LiquidHelper.injectTinContainer(Fluids.OIL, Defaults.BUCKET_VOLUME, ForestryItem.canOil.getItemStack(), ForestryItem.canEmpty.getItemStack()); + LiquidHelper.injectTinContainer(Fluids.FUEL, Defaults.BUCKET_VOLUME, ForestryItem.canFuel.getItemStack(), ForestryItem.canEmpty.getItemStack()); } } diff --git a/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java b/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java index 9224ffe1c..2f1ad1cb5 100644 --- a/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java +++ b/src/main/java/forestry/plugins/PluginBuildCraftRecipes.java @@ -10,12 +10,10 @@ ******************************************************************************/ package forestry.plugins; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - import cpw.mods.fml.common.Optional; import forestry.core.config.Defaults; +import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; import buildcraft.api.recipes.BuildcraftRecipeRegistry; @@ -37,8 +35,6 @@ public class PluginBuildCraftRecipes extends ForestryPlugin { @Override protected void registerRecipes() { // Add recipe for ethanol - FluidStack input = FluidRegistry.getFluidStack(Defaults.LIQUID_BIOMASS, 4); - FluidStack output = FluidRegistry.getFluidStack(Defaults.LIQUID_ETHANOL, 1); - BuildcraftRecipeRegistry.refinery.addRecipe("forestry:BiomassToEthanol", input, output, 100, 1); + BuildcraftRecipeRegistry.refinery.addRecipe("forestry:BiomassToEthanol", Fluids.BIOMASS.get(4), Fluids.BIOETHANOL.get(1), 100, 1); } } diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index ccf9e261f..d8306553d 100755 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -18,6 +18,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.network.IGuiHandler; @@ -27,6 +28,7 @@ import forestry.core.GameMode; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; +import forestry.core.fluids.Fluids; import forestry.core.gadgets.BlockBase; import forestry.core.gadgets.MachineDefinition; import forestry.core.gadgets.MachineNBTDefinition; @@ -253,56 +255,58 @@ public class PluginFactory extends ForestryPlugin { protected void registerRecipes() { // / FABRICATOR - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 0), new Object[]{ + + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 0), new Object[]{ " X ", "#X#", "XXX", '#', Items.redstone, 'X', "ingotCopper"}); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 1), new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 1), new Object[]{ " X ", "#X#", "XXX", '#', Items.redstone, 'X', "ingotTin"}); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 2), new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 2), new Object[]{ " X ", "#X#", "XXX", '#', Items.redstone, 'X', "ingotBronze"}); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 3), new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 3), new Object[]{ " X ", "#X#", "XXX", '#', Items.redstone, 'X', Items.iron_ingot}); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 4), new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 4), new Object[]{ " X ", "#X#", "XXX", '#', Items.redstone, 'X', Items.gold_ingot}); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 5), new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 5), new Object[]{ " X ", "#X#", "XXX", '#', Items.redstone, 'X', Items.diamond}); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 6), new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 6), new Object[]{ " X ", "#X#", "XXX", '#', Items.redstone, 'X', Blocks.obsidian}); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 7), new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 7), new Object[]{ " X ", "#X#", "XXX", '#', Items.redstone, 'X', Items.blaze_powder}); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 9), new Object[]{ + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 9), new Object[]{ " X ", "#X#", "XXX", '#', Items.redstone, 'X', Items.emerald}); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 10), + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 10), new Object[]{" X ", "#X#", "XXX", '#', Items.redstone, 'X', "gemApatite"}); - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 11), + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 11), new Object[]{" X ", "#X#", "XXX", '#', Items.redstone, 'X', new ItemStack(Items.dye, 1, 4)}); String[] dyes = {"dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite"}; - if (PluginManager.Module.APICULTURE.isEnabled()) + if (PluginManager.Module.APICULTURE.isEnabled()) { + FluidStack liquidGlass = Fluids.GLASS.get(Defaults.BUCKET_VOLUME); for (int i = 0; i < 16; i++) - RecipeManagers.fabricatorManager.addRecipe(ForestryItem.waxCast.getItemStack(1, Defaults.WILDCARD), FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, - Defaults.BUCKET_VOLUME), ForestryBlock.glass.getItemStack(1, 15 - i), new Object[]{"#", "X", '#', dyes[i], - 'X', ForestryItem.propolis.getItemStack(1, Defaults.WILDCARD)}); + RecipeManagers.fabricatorManager.addRecipe(ForestryItem.waxCast.getItemStack(1, Defaults.WILDCARD), liquidGlass, ForestryBlock.glass.getItemStack(1, 15 - i), new Object[]{"#", "X", '#', dyes[i], + 'X', ForestryItem.propolis.getItemStack(1, Defaults.WILDCARD)}); + } // / SQUEEZER - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.apple)}, FluidRegistry.getFluidStack(Defaults.LIQUID_JUICE, GameMode.getGameMode().getIntegerSetting("squeezer.liquid.apple")), - ForestryItem.mulch.getItemStack(), GameMode.getGameMode().getIntegerSetting("squeezer.mulch.apple")); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.wheat_seeds)}, FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, GameMode - .getGameMode().getIntegerSetting("squeezer.liquid.seed"))); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.pumpkin_seeds)}, FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, GameMode - .getGameMode().getIntegerSetting("squeezer.liquid.seed"))); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.melon_seeds)}, FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, GameMode - .getGameMode().getIntegerSetting("squeezer.liquid.seed"))); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.cobblestone)}, - FluidRegistry.getFluidStack(Defaults.LIQUID_LAVA, 1600)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Blocks.cactus)}, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 500)); - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.snowball), ForestryItem.craftingMaterial.getItemStack(4, 5)}, - FluidRegistry.getFluidStack(Defaults.LIQUID_ICE, 4000)); + int appleMulchAmount = GameMode.getGameMode().getIntegerSetting("squeezer.mulch.apple"); + int appleJuiceAmount = GameMode.getGameMode().getIntegerSetting("squeezer.liquid.apple"); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.apple)}, Fluids.JUICE.get(appleJuiceAmount), + ForestryItem.mulch.getItemStack(), appleMulchAmount); + + int seedOilAmount = GameMode.getGameMode().getIntegerSetting("squeezer.liquid.seed"); + FluidStack seedOil = Fluids.SEEDOIL.get(seedOilAmount); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.wheat_seeds)}, seedOil); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.pumpkin_seeds)}, seedOil); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.melon_seeds)}, seedOil); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{ForestryItem.phosphor.getItemStack(2), new ItemStack(Blocks.cobblestone)}, Fluids.LAVA.get(1600)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Blocks.cactus)}, Fluids.WATER.get(500)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(Items.snowball), ForestryItem.craftingMaterial.getItemStack(4, 5)}, Fluids.ICE.get(4000)); // STILL - RecipeManagers.stillManager.addRecipe(Defaults.STILL_DESTILLATION_DURATION, FluidRegistry.getFluidStack(Defaults.LIQUID_BIOMASS, - Defaults.STILL_DESTILLATION_INPUT), FluidRegistry.getFluidStack(Defaults.LIQUID_ETHANOL, Defaults.STILL_DESTILLATION_OUTPUT)); + RecipeManagers.stillManager.addRecipe(Defaults.STILL_DESTILLATION_DURATION, Fluids.BIOMASS.get(Defaults.STILL_DESTILLATION_INPUT), + Fluids.BIOETHANOL.get(Defaults.STILL_DESTILLATION_OUTPUT)); // MOISTENER RecipeManagers.moistenerManager.addRecipe(new ItemStack(Items.wheat_seeds), new ItemStack(Blocks.mycelium), 5000); @@ -310,29 +314,28 @@ public class PluginFactory extends ForestryPlugin { RecipeManagers.moistenerManager.addRecipe(new ItemStack(Blocks.stonebrick), new ItemStack(Blocks.stonebrick, 1, 1), 20000); // FERMENTER - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.sapling, 1, 0), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.sapling, 1, 1), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.sapling, 1, 2), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.sapling, 1, 3), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS); + for (int i = 0; i < 4; i++) + RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.sapling, 1, i), GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.cactus), GameMode.getGameMode().getIntegerSetting("fermenter.yield.cactus"), Defaults.LIQUID_BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Items.wheat), GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Defaults.LIQUID_BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Items.reeds), GameMode.getGameMode().getIntegerSetting("fermenter.yield.cane"), Defaults.LIQUID_BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.brown_mushroom), GameMode.getGameMode().getIntegerSetting("fermenter.yield.mushroom"), Defaults.LIQUID_BIOMASS); - RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.red_mushroom), GameMode.getGameMode().getIntegerSetting("fermenter.yield.mushroom"), Defaults.LIQUID_BIOMASS); + RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.cactus), GameMode.getGameMode().getIntegerSetting("fermenter.yield.cactus"), Fluids.BIOMASS); + RecipeUtil.injectLeveledRecipe(new ItemStack(Items.wheat), GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat"), Fluids.BIOMASS); + RecipeUtil.injectLeveledRecipe(new ItemStack(Items.reeds), GameMode.getGameMode().getIntegerSetting("fermenter.yield.cane"), Fluids.BIOMASS); + RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.brown_mushroom), GameMode.getGameMode().getIntegerSetting("fermenter.yield.mushroom"), Fluids.BIOMASS); + RecipeUtil.injectLeveledRecipe(new ItemStack(Blocks.red_mushroom), GameMode.getGameMode().getIntegerSetting("fermenter.yield.mushroom"), Fluids.BIOMASS); // FABRICATOR - RecipeManagers.fabricatorManager.addSmelting(new ItemStack(Blocks.glass), FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 1000), 1000); - RecipeManagers.fabricatorManager.addSmelting(new ItemStack(Blocks.glass_pane), FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 375), 1000); - RecipeManagers.fabricatorManager.addSmelting(new ItemStack(Blocks.sand), FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 1000), 3000); + + RecipeManagers.fabricatorManager.addSmelting(new ItemStack(Blocks.glass), Fluids.GLASS.get(1000), 1000); + RecipeManagers.fabricatorManager.addSmelting(new ItemStack(Blocks.glass_pane), Fluids.GLASS.get(375), 1000); + RecipeManagers.fabricatorManager.addSmelting(new ItemStack(Blocks.sand), Fluids.GLASS.get(1000), 3000); // / CARPENTER - RecipeManagers.carpenterManager.addRecipe(50, FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, 250), null, ForestryItem.impregnatedCasing.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(50, Fluids.SEEDOIL.get(250), null, ForestryItem.impregnatedCasing.getItemStack(), "###", "# #", "###", '#', "logWood"); - RecipeManagers.carpenterManager.addRecipe(50, FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, 500), null, + RecipeManagers.carpenterManager.addRecipe(50, Fluids.SEEDOIL.get(500), null, ForestryBlock.core.getItemStack(1, Defaults.DEFINITION_ESCRITOIRE_META), "# ", "###", @@ -340,35 +343,35 @@ public class PluginFactory extends ForestryPlugin { '#', "plankWood"); // RESOURCES - RecipeManagers.carpenterManager.addRecipe(10, FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, 100), null, + RecipeManagers.carpenterManager.addRecipe(10, Fluids.SEEDOIL.get(100), null, ForestryItem.stickImpregnated.getItemStack(2), "#", "#", '#', "logWood"); - RecipeManagers.carpenterManager.addRecipe(5, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 250), null, + RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.get(250), null, ForestryItem.woodPulp.getItemStack(4), "#", '#', "logWood"); - RecipeManagers.carpenterManager.addRecipe(5, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 250), null, + RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.get(250), null, new ItemStack(Items.paper, 1), "#", "#", '#', "pulpWood"); - RecipeManagers.carpenterManager.addRecipe(5, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, + RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.get(1000), null, ForestryBlock.soil.getItemStack(9), "###", "#X#", "###", '#', Blocks.dirt, 'X', ForestryItem.mulch); - RecipeManagers.carpenterManager.addRecipe(5, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, + RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.get(1000), null, ForestryBlock.soil.getItemStack(8, 1), "#X#", "XYX", "#X#", '#', Blocks.dirt, 'X', Blocks.sand, 'Y', ForestryItem.mulch); - RecipeManagers.carpenterManager.addRecipe(75, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 5000), null, ForestryItem.hardenedCasing.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(75, Fluids.WATER.get(5000), null, ForestryItem.hardenedCasing.getItemStack(), "# #", " Y ", "# #", @@ -376,21 +379,21 @@ public class PluginFactory extends ForestryPlugin { 'Y', ForestryItem.sturdyCasing); // / CHIPSETS - RecipeManagers.carpenterManager.addRecipe(20, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.circuitboards.getItemStack(1, 0), + RecipeManagers.carpenterManager.addRecipe(20, Fluids.WATER.get(1000), null, ForestryItem.circuitboards.getItemStack(1, 0), "R R", "R#R", "R R", '#', "ingotTin", 'R', Items.redstone); - RecipeManagers.carpenterManager.addRecipe(40, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.circuitboards.getItemStack(1, 1), + RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.get(1000), null, ForestryItem.circuitboards.getItemStack(1, 1), "R#R", "R#R", "R#R", '#', "ingotBronze", 'R', Items.redstone); - RecipeManagers.carpenterManager.addRecipe(80, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.circuitboards.getItemStack(1, 2), + RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.get(1000), null, ForestryItem.circuitboards.getItemStack(1, 2), "R#R", "R#R", "R#R", '#', Items.iron_ingot, 'R', Items.redstone); - RecipeManagers.carpenterManager.addRecipe(80, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.circuitboards.getItemStack(1, 3), + RecipeManagers.carpenterManager.addRecipe(80, Fluids.WATER.get(1000), null, ForestryItem.circuitboards.getItemStack(1, 3), "R#R", "R#R", "R#R", '#', Items.gold_ingot, 'R', Items.redstone); - RecipeManagers.carpenterManager.addRecipe(40, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.solderingIron.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(40, Fluids.WATER.get(1000), null, ForestryItem.solderingIron.getItemStack(), " # ", "# #", " B", '#', Items.iron_ingot, 'B', "ingotBronze"); // ForestryCore.oreHandler.registerCarpenterRecipe(solderingIron); // RAIN SUBSTRATES if (PluginManager.Module.APICULTURE.isEnabled()) { - RecipeManagers.carpenterManager.addRecipe(5, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.iodineCharge.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.get(1000), null, ForestryItem.iodineCharge.getItemStack(), "Z#Z", "#Y#", "X#X", @@ -399,7 +402,7 @@ public class PluginFactory extends ForestryPlugin { 'Y', ForestryItem.canEmpty, 'Z', ForestryItem.honeyDrop); // ForestryCore.oreHandler.registerCarpenterRecipe(iodineCapsule); - RecipeManagers.carpenterManager.addRecipe(5, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.craftingMaterial.getItemStack(1, 4), + RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.get(1000), null, ForestryItem.craftingMaterial.getItemStack(1, 4), "Z#Z", "#Y#", "X#X", @@ -414,13 +417,13 @@ public class PluginFactory extends ForestryPlugin { RecipeManagers.carpenterManager.addRecipe(100, null, new ItemStack(Items.ender_pearl, 1), " # ", "###", " # ", '#', ForestryItem.craftingMaterial.getItemStack(1, 1)); // Woven Silk - RecipeManagers.carpenterManager.addRecipe(10, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 500), null, ForestryItem.craftingMaterial.getItemStack(1, 3), + RecipeManagers.carpenterManager.addRecipe(10, Fluids.WATER.get(500), null, ForestryItem.craftingMaterial.getItemStack(1, 3), "###", "###", "###", '#', ForestryItem.craftingMaterial.getItemStack(1, 2)); // Boxes - RecipeManagers.carpenterManager.addRecipe(5, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.carton.getItemStack(2), + RecipeManagers.carpenterManager.addRecipe(5, Fluids.WATER.get(1000), null, ForestryItem.carton.getItemStack(2), " # ", "# #", " # ", '#', "pulpWood"); - RecipeManagers.carpenterManager.addRecipe(20, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.crate.getItemStack(24), + RecipeManagers.carpenterManager.addRecipe(20, Fluids.WATER.get(1000), null, ForestryItem.crate.getItemStack(24), " # ", "# #", " # ", '#', "logWood"); // Assembly Kits diff --git a/src/main/java/forestry/plugins/PluginFood.java b/src/main/java/forestry/plugins/PluginFood.java index 3e68bed5d..47426ea22 100755 --- a/src/main/java/forestry/plugins/PluginFood.java +++ b/src/main/java/forestry/plugins/PluginFood.java @@ -20,6 +20,7 @@ import forestry.api.food.IBeverageEffect; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; +import forestry.core.fluids.Fluids; import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.ISaveEventHandler; import forestry.core.items.ItemForestryFood; @@ -69,8 +70,8 @@ public class PluginFood extends ForestryPlugin { ItemStack meadBottle = ForestryItem.beverage.getItemStack(); ((ItemBeverage) ForestryItem.beverage.item()).beverages[0].saveEffects(meadBottle, new IBeverageEffect[] { BeverageEffect.weakAlcoholic }); - LiquidHelper.getOrCreateLiquid(Defaults.LIQUID_MEAD); - LiquidHelper.injectLiquidContainer(Defaults.LIQUID_MEAD, Defaults.BUCKET_VOLUME, meadBottle, new ItemStack(Items.glass_bottle)); + Fluids.SHORT_MEAD.register(); + LiquidHelper.injectLiquidContainer(Fluids.SHORT_MEAD, Defaults.BUCKET_VOLUME, meadBottle, new ItemStack(Items.glass_bottle)); } @Override diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java index 1360c94f1..a0c9c382a 100644 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -38,6 +38,7 @@ import forestry.core.config.Configuration; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; +import forestry.core.fluids.Fluids; import forestry.core.gadgets.BlockBase; import forestry.core.gadgets.MachineDefinition; import forestry.core.items.ItemCrated; @@ -200,11 +201,11 @@ public class PluginIC2 extends ForestryPlugin { definitionEngineTin.register(); definitionGenerator.register(); - FluidStack ethanol = FluidRegistry.getFluidStack(Defaults.LIQUID_ETHANOL, 1); + FluidStack ethanol = Fluids.BIOETHANOL.get(1); GeneratorFuel ethanolFuel = new GeneratorFuel(ethanol, (int) (32 * GameMode.getGameMode().getFloatSetting("fuel.ethanol.generator")), 4); FuelManager.generatorFuel.put(ethanol.getFluid(), ethanolFuel); - FluidStack biomass = FluidRegistry.getFluidStack(Defaults.LIQUID_BIOMASS, 1); + FluidStack biomass = Fluids.BIOMASS.get(1); GeneratorFuel biomassFuel = new GeneratorFuel(biomass, (int) (8 * GameMode.getGameMode().getFloatSetting("fuel.biomass.generator")), 1); FuelManager.generatorFuel.put(biomass.getFluid(), biomassFuel); @@ -270,14 +271,14 @@ public class PluginIC2 extends ForestryPlugin { if (rubber != null) { for (Object rubberOreDict : RecipeUtil.getOreDictRecipeEquivalents(rubber)) { - RecipeManagers.fabricatorManager.addRecipe(null, FluidRegistry.getFluidStack(Defaults.LIQUID_GLASS, 500), ForestryItem.tubes.getItemStack(4, 8), + RecipeManagers.fabricatorManager.addRecipe(null, Fluids.GLASS.get(500), ForestryItem.tubes.getItemStack(4, 8), new Object[]{" X ", "#X#", "XXX", '#', Items.redstone, 'X', rubberOreDict}); } } if (plantBall != null && compressedPlantBall != null) { - RecipeUtil.injectLeveledRecipe(plantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 4, Defaults.LIQUID_BIOMASS); - RecipeUtil.injectLeveledRecipe(compressedPlantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 5, Defaults.LIQUID_BIOMASS); + RecipeUtil.injectLeveledRecipe(plantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 4, Fluids.BIOMASS); + RecipeUtil.injectLeveledRecipe(compressedPlantBall, GameMode.getGameMode().getIntegerSetting("fermenter.yield.wheat") * 5, Fluids.BIOMASS); } else { Proxies.log.fine("No IC2 plantballs found."); } @@ -288,7 +289,7 @@ public class PluginIC2 extends ForestryPlugin { Proxies.log.fine("Missing IC2 resin, skipping centrifuge recipe for propolis to resin."); if (rubbersapling != null) { - RecipeUtil.injectLeveledRecipe(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS); + RecipeUtil.injectLeveledRecipe(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS); } else Proxies.log.fine("Missing IC2 rubber sapling, skipping fermenter recipe for converting rubber sapling to biomass."); @@ -303,10 +304,10 @@ public class PluginIC2 extends ForestryPlugin { } if (lavaCell != null) - LiquidHelper.injectTinContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, lavaCell, emptyCell); + LiquidHelper.injectTinContainer(Fluids.LAVA, Defaults.BUCKET_VOLUME, lavaCell, emptyCell); if (waterCell != null) { - LiquidHelper.injectTinContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, waterCell, emptyCell); + LiquidHelper.injectTinContainer(Fluids.WATER, Defaults.BUCKET_VOLUME, waterCell, emptyCell); ItemStack bogEarthCan = GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"); if (bogEarthCan.stackSize > 0) diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index b2ad5d5bd..9f7eff777 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -18,7 +18,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.crafting.CraftingManager; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.RecipeSorter; import cpw.mods.fml.common.SidedProxy; @@ -39,6 +38,7 @@ import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.config.Property; +import forestry.core.fluids.Fluids; import forestry.core.gadgets.BlockBase; import forestry.core.gadgets.MachineDefinition; import forestry.core.genetics.Allele; @@ -149,7 +149,7 @@ public class PluginLepidopterology extends ForestryPlugin { protected void registerRecipes() { CraftingManager.getInstance().getRecipeList().add(new MatingRecipe()); - RecipeManagers.carpenterManager.addRecipe(100, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 2000), null, ForestryItem.flutterlyzer.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(100, Fluids.WATER.get(2000), null, ForestryItem.flutterlyzer.getItemStack(), "X#X", "X#X", "RDR", '#', Blocks.glass_pane, 'X', "ingotBronze", 'R', Items.redstone, 'D', Items.diamond); } diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index d3ac0b401..0a81a1899 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -16,8 +16,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; - import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.network.IGuiHandler; @@ -29,6 +27,7 @@ import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; +import forestry.core.fluids.Fluids; import forestry.core.gadgets.BlockBase; import forestry.core.gadgets.MachineDefinition; import forestry.core.interfaces.IOreDictionaryHandler; @@ -202,7 +201,7 @@ public class PluginMail extends ForestryPlugin { 'X', stampDefinitions[i].getCraftingIngredient(), '#', Items.paper, 'Z', stampGlue); - RecipeManagers.carpenterManager.addRecipe(10, FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, 300), null, ForestryItem.stamps.getItemStack(9, i), + RecipeManagers.carpenterManager.addRecipe(10, Fluids.SEEDOIL.get(300), null, ForestryItem.stamps.getItemStack(9, i), "XXX", "###", 'X', stampDefinitions[i].getCraftingIngredient(), '#', Items.paper); @@ -212,7 +211,7 @@ public class PluginMail extends ForestryPlugin { Proxies.common.addRecipe(new ItemStack(Items.paper), "###", '#', ForestryItem.letters.getItemStack(1, Defaults.WILDCARD)); // Carpenter - RecipeManagers.carpenterManager.addRecipe(10, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 250), null, ForestryItem.letters.getItemStack(), "###", "###", '#', ForestryItem.woodPulp); + RecipeManagers.carpenterManager.addRecipe(10, Fluids.WATER.get(250), null, ForestryItem.letters.getItemStack(), "###", "###", '#', ForestryItem.woodPulp); Proxies.common.addShapelessRecipe(ForestryItem.catalogue.getItemStack(), ForestryItem.stamps.getItemStack(1, Defaults.WILDCARD), new ItemStack(Items.book)); } diff --git a/src/main/java/forestry/plugins/PluginNatura.java b/src/main/java/forestry/plugins/PluginNatura.java index 0e5a07b95..5d2270cae 100755 --- a/src/main/java/forestry/plugins/PluginNatura.java +++ b/src/main/java/forestry/plugins/PluginNatura.java @@ -16,8 +16,6 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; - import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; @@ -25,6 +23,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; import forestry.core.GameMode; import forestry.core.config.Defaults; +import forestry.core.fluids.Fluids; import forestry.core.proxy.Proxies; @Plugin(pluginID = "Natura", name = "Natura", author = "SirSengir", url = Defaults.URL, unlocalizedDescription = "for.plugin.natura.description") @@ -86,8 +85,7 @@ public class PluginNatura extends ForestryPlugin { int amount = GameMode.getGameMode().getIntegerSetting("squeezer.liquid.seed"); for (ItemStack aSeedList : seedList) - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{aSeedList}, - FluidRegistry.getFluidStack(Defaults.LIQUID_SEEDOIL, amount)); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{aSeedList}, Fluids.SEEDOIL.get(amount)); ItemStack berryBlight = GameRegistry.findItemStack(NATURA, "berryBlight", 1); ItemStack berryDusk = GameRegistry.findItemStack(NATURA, "berryDusk", 1); @@ -119,8 +117,7 @@ public class PluginNatura extends ForestryPlugin { amount = GameMode.getGameMode().getIntegerSetting("squeezer.liquid.apple") / 25; amount = (amount > 1) ? amount : 1; // Produce at least 1 mb of juice. for (ItemStack berry : berries) - RecipeManagers.squeezerManager.addRecipe(3, new ItemStack[]{berry}, - FluidRegistry.getFluidStack(Defaults.LIQUID_JUICE, amount)); + RecipeManagers.squeezerManager.addRecipe(3, new ItemStack[]{berry}, Fluids.JUICE.get(amount)); } } diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index 94708ad26..0888e78c4 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -43,7 +43,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IShearable; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; @@ -60,6 +59,7 @@ import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.config.Property; +import forestry.core.fluids.Fluids; import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.IPickupHandler; import forestry.core.interfaces.IResupplyHandler; @@ -504,22 +504,22 @@ public class PluginStorage extends ForestryPlugin implements IOreDictionaryHandl // / CARPENTER // / BACKPACKS T2 - RecipeManagers.carpenterManager.addRecipe(200, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.minerBackpackT2.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(200, Fluids.WATER.get(1000), null, ForestryItem.minerBackpackT2.getItemStack(), "WXW", "WTW", "WWW", 'X', Items.diamond, 'W', ForestryItem.craftingMaterial.getItemStack(1, 3), 'T', ForestryItem.minerBackpack); - RecipeManagers.carpenterManager.addRecipe(200, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.diggerBackpackT2.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(200, Fluids.WATER.get(1000), null, ForestryItem.diggerBackpackT2.getItemStack(), "WXW", "WTW", "WWW", 'X', Items.diamond, 'W', ForestryItem.craftingMaterial.getItemStack(1, 3), 'T', ForestryItem.diggerBackpack); - RecipeManagers.carpenterManager.addRecipe(200, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.foresterBackpackT2.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(200, Fluids.WATER.get(1000), null, ForestryItem.foresterBackpackT2.getItemStack(), "WXW", "WTW", "WWW", 'X', Items.diamond, 'W', ForestryItem.craftingMaterial.getItemStack(1, 3), 'T', ForestryItem.foresterBackpack); - RecipeManagers.carpenterManager.addRecipe(200, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.hunterBackpackT2.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(200, Fluids.WATER.get(1000), null, ForestryItem.hunterBackpackT2.getItemStack(), "WXW", "WTW", "WWW", 'X', Items.diamond, 'W', ForestryItem.craftingMaterial.getItemStack(1, 3), 'T', ForestryItem.hunterBackpack); - RecipeManagers.carpenterManager.addRecipe(200, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.adventurerBackpackT2.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(200, Fluids.WATER.get(1000), null, ForestryItem.adventurerBackpackT2.getItemStack(), "WXW", "WTW", "WWW", 'X', Items.diamond, 'W', ForestryItem.craftingMaterial.getItemStack(1, 3), 'T', ForestryItem.adventurerBackpack); - RecipeManagers.carpenterManager.addRecipe(200, FluidRegistry.getFluidStack(Defaults.LIQUID_WATER, 1000), null, ForestryItem.builderBackpackT2.getItemStack(), + RecipeManagers.carpenterManager.addRecipe(200, Fluids.WATER.get(1000), null, ForestryItem.builderBackpackT2.getItemStack(), "WXW", "WTW", "WWW", 'X', Items.diamond, 'W', ForestryItem.craftingMaterial.getItemStack(1, 3), 'T', ForestryItem.builderBackpack); From 1b741eaac5ba4a82d26192b48a1d17d5da93fddd Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 13 Dec 2014 19:19:49 -0800 Subject: [PATCH 03/13] Remove vialEmpty, vialCatalyst --- lang | 2 +- .../forestry/core/config/ForestryItem.java | 2 -- .../forestry/plugins/PluginApiculture.java | 30 ------------------- .../java/forestry/plugins/PluginCore.java | 11 ------- 4 files changed, 1 insertion(+), 44 deletions(-) diff --git a/lang b/lang index 3c34adcc5..78a42965d 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 3c34adcc54f2e1dc0d06b6720261fcd77c4e2f24 +Subproject commit 78a42965de89d39804cccdaeed51ac2cf98f2919 diff --git a/src/main/java/forestry/core/config/ForestryItem.java b/src/main/java/forestry/core/config/ForestryItem.java index 6d586e14e..eb8838dae 100755 --- a/src/main/java/forestry/core/config/ForestryItem.java +++ b/src/main/java/forestry/core/config/ForestryItem.java @@ -43,8 +43,6 @@ public enum ForestryItem { wrench, pipette, bucketBiomass, - vialEmpty, - vialCatalyst, bucketBiofuel, // Crafting impregnatedCasing, diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index b3a009d30..3b66f571c 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -472,36 +472,6 @@ public class PluginApiculture extends ForestryPlugin { // / HABITAT LOCATOR //Proxies.common.addRecipe(ForestryItem.biomeFinder.getItemStack(), // new Object[] { " X ", "X#X", " X ", '#', Items.redstone, 'X', "ingotBronze" }); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(3), - "###", "YXY", - '#', ForestryItem.waxCapsule, - 'X', Items.bone, - 'Y', ForestryItem.pollenCluster); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(3), - "###", "YXY", - '#', ForestryItem.canEmpty, - 'X', Items.bone, - 'Y', ForestryItem.pollenCluster); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(), - "###", "YXY", "###", - '#', ForestryItem.honeyDrop, - 'Y', ForestryItem.fertilizerCompound, - 'X', ForestryItem.waxCapsule); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(), - "###", "YXY", "###", - '#', ForestryItem.honeyDrop, - 'Y', ForestryItem.fertilizerCompound, - 'X', ForestryItem.canEmpty); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(), - "###", "YXY", "###", - '#', ForestryItem.honeyDrop, - 'Y', ForestryItem.pollenCluster, - 'X', ForestryItem.waxCapsule); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(), - "###", "YXY", "###", - '#', ForestryItem.honeyDrop, - 'Y', ForestryItem.pollenCluster, - 'X', ForestryItem.canEmpty); // Bees Proxies.common.addRecipe(ForestryItem.scoop.getItemStack(1), diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index 411514819..f904f8b00 100755 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -193,13 +193,6 @@ public class PluginCore extends ForestryPlugin { /* ARMOR */ ForestryItem.naturalistHat.registerItem(new ItemArmorNaturalist(0), "naturalistHelmet"); - // / DISCONTINUED - // ForestryItem.vialEmpty = (new - // ItemForestry(Config.getOrCreateIntProperty("vialEmpty", - // Config.CATEGORY_ITEM, Defaults.ID_ITEM_VIAL_EMPTY))) - // .setItemName("vialEmpty").setIconIndex(10); - ForestryItem.vialCatalyst.registerItem((new ItemForestry()), "vialCatalyst"); - // / PEAT PRODUCTION ForestryItem.peat.registerItem((new ItemForestry()), "peat"); OreDictionary.registerOre("brickPeat", ForestryItem.peat.getItemStack()); @@ -432,10 +425,6 @@ public class PluginCore extends ForestryPlugin { Proxies.common.addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', ForestryItem.refractoryWater, 'Y', Blocks.sand); } - // Vials and catalyst - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(3), "###", "YXY", '#', ForestryItem.waxCapsule.item(), 'X', Items.bone, 'Y', ForestryItem.fertilizerCompound); - Proxies.common.addRecipe(ForestryItem.vialCatalyst.getItemStack(3), "###", "YXY", '#', ForestryItem.canEmpty.item(), 'X', Items.bone, 'Y', ForestryItem.fertilizerCompound); - // Crafting Material Proxies.common.addRecipe(new ItemStack(Items.string), "#", "#", "#", '#', ForestryItem.craftingMaterial.getItemStack(1, 2)); From a8b7098f391155f7808450db0c55e65ce3ff7077 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 13 Dec 2014 21:29:55 -0800 Subject: [PATCH 04/13] Implement spawn tree and spawn forest commands --- lang | 2 +- .../commands/CommandBeekeeping.java | 4 +- .../commands/CommandBeekeepingGiveBee.java | 19 +-- .../arboriculture/CommandSpawnForest.java | 49 ------ .../arboriculture/CommandSpawnTree.java | 52 ------- .../arboriculture/commands/CommandTrees.java | 23 +++ .../commands/CommandTreesSpawn.java | 141 ++++++++++++++++++ .../commands/CommandTreesSpawnForest.java | 44 ++++++ .../commands/CommandTreesSpawnTree.java | 31 ++++ .../worldgen/WorldGenArboriculture.java | 6 +- .../commands}/SpeciesNotFoundException.java | 4 +- .../commands}/TemplateNotFoundException.java | 2 +- .../forestry/core/worldgen/WorldGenBase.java | 8 +- .../forestry/plugins/PluginArboriculture.java | 9 +- 14 files changed, 268 insertions(+), 126 deletions(-) delete mode 100755 src/main/java/forestry/arboriculture/CommandSpawnForest.java delete mode 100755 src/main/java/forestry/arboriculture/CommandSpawnTree.java create mode 100644 src/main/java/forestry/arboriculture/commands/CommandTrees.java create mode 100644 src/main/java/forestry/arboriculture/commands/CommandTreesSpawn.java create mode 100644 src/main/java/forestry/arboriculture/commands/CommandTreesSpawnForest.java create mode 100644 src/main/java/forestry/arboriculture/commands/CommandTreesSpawnTree.java rename src/main/java/forestry/{apiculture => core/commands}/SpeciesNotFoundException.java (89%) mode change 100755 => 100644 rename src/main/java/forestry/{apiculture => core/commands}/TemplateNotFoundException.java (96%) mode change 100755 => 100644 diff --git a/lang b/lang index 78a42965d..76846d9c7 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 78a42965de89d39804cccdaeed51ac2cf98f2919 +Subproject commit 76846d9c7646a02c8ac28e673579f065d499b3b9 diff --git a/src/main/java/forestry/apiculture/commands/CommandBeekeeping.java b/src/main/java/forestry/apiculture/commands/CommandBeekeeping.java index f39dccc23..ceeb66d33 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeekeeping.java +++ b/src/main/java/forestry/apiculture/commands/CommandBeekeeping.java @@ -15,8 +15,8 @@ import forestry.core.commands.SubCommand; public class CommandBeekeeping extends SubCommand { public CommandBeekeeping() { - super("beekeeping"); - addAlias("bee"); + super("bee"); + addAlias("beekeeping"); addChildCommand(new CommandBeekeepingMode()); addChildCommand(new CommandBeekeepingSave()); addChildCommand(new CommandBeekeepingGiveBee()); diff --git a/src/main/java/forestry/apiculture/commands/CommandBeekeepingGiveBee.java b/src/main/java/forestry/apiculture/commands/CommandBeekeepingGiveBee.java index b82f4d9b5..4134d27ca 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeekeepingGiveBee.java +++ b/src/main/java/forestry/apiculture/commands/CommandBeekeepingGiveBee.java @@ -10,24 +10,25 @@ ******************************************************************************/ package forestry.apiculture.commands; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import forestry.apiculture.SpeciesNotFoundException; -import forestry.apiculture.TemplateNotFoundException; import forestry.core.commands.CommandHelpers; +import forestry.core.commands.SpeciesNotFoundException; import forestry.core.commands.SubCommand; +import forestry.core.commands.TemplateNotFoundException; import forestry.plugins.PluginApiculture; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; public class CommandBeekeepingGiveBee extends SubCommand { diff --git a/src/main/java/forestry/arboriculture/CommandSpawnForest.java b/src/main/java/forestry/arboriculture/CommandSpawnForest.java deleted file mode 100755 index 2cb959d0b..000000000 --- a/src/main/java/forestry/arboriculture/CommandSpawnForest.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture; - -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.gen.feature.WorldGenerator; - -import forestry.api.world.ITreeGenData; -import forestry.arboriculture.genetics.TreeTemplates; -import forestry.arboriculture.worldgen.WorldGenBalsa; -import forestry.core.utils.CommandMC; -import forestry.plugins.PluginArboriculture; - -public class CommandSpawnForest extends CommandMC { - - @Override - public String getCommandName() { - return "spawnforest"; - } - - @Override - public String getCommandUsage(ICommandSender sender) { - return "/" + getCommandName() + " "; - } - - @Override - public void processCommand(ICommandSender sender, String[] arguments) { - EntityPlayer player = getCommandSenderAsPlayer(sender); - - int x = (int) player.posX - 16; - int y = (int) (player.posY); - int z = (int) player.posZ - 16; - - WorldGenerator gen = new WorldGenBalsa((ITreeGenData) PluginArboriculture.treeInterface.getTree(player.worldObj, - TreeTemplates.templateAsGenome(PluginArboriculture.treeInterface.getTemplate("treeBalsa")))); - - for (int i = 0; i < 16; i++) - gen.generate(player.worldObj, player.worldObj.rand, x + player.worldObj.rand.nextInt(32), y, z + player.worldObj.rand.nextInt(32)); - } -} diff --git a/src/main/java/forestry/arboriculture/CommandSpawnTree.java b/src/main/java/forestry/arboriculture/CommandSpawnTree.java deleted file mode 100755 index 9ad8e744a..000000000 --- a/src/main/java/forestry/arboriculture/CommandSpawnTree.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture; - -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.gen.feature.WorldGenerator; - -import forestry.api.world.ITreeGenData; -import forestry.arboriculture.genetics.TreeTemplates; -import forestry.arboriculture.worldgen.WorldGenBalsa; -import forestry.core.utils.CommandMC; -import forestry.plugins.PluginArboriculture; - -public class CommandSpawnTree extends CommandMC { - - public CommandSpawnTree() { - } - - @Override - public String getCommandName() { - return "spawntree"; - } - - @Override - public String getCommandUsage(ICommandSender sender) { - return "/" + getCommandName() + " "; - } - - @Override - public void processCommand(ICommandSender sender, String[] arguments) { - EntityPlayer player = getCommandSenderAsPlayer(sender); - - int x = (int) player.posX; - int y = (int) (player.posY); - int z = (int) player.posZ; - - WorldGenerator gen = new WorldGenBalsa((ITreeGenData) PluginArboriculture.treeInterface.getTree(player.worldObj, - TreeTemplates.templateAsGenome(PluginArboriculture.treeInterface.getTemplate("treeBalsa")))); - - gen.generate(player.worldObj, player.worldObj.rand, x, y, z); - - } -} diff --git a/src/main/java/forestry/arboriculture/commands/CommandTrees.java b/src/main/java/forestry/arboriculture/commands/CommandTrees.java new file mode 100644 index 000000000..dc6da946e --- /dev/null +++ b/src/main/java/forestry/arboriculture/commands/CommandTrees.java @@ -0,0 +1,23 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.commands; + +import forestry.core.commands.SubCommand; + +public class CommandTrees extends SubCommand { + + public CommandTrees() { + super("tree"); + addChildCommand(new CommandTreesSpawnTree()); + addChildCommand(new CommandTreesSpawnForest()); + } + +} diff --git a/src/main/java/forestry/arboriculture/commands/CommandTreesSpawn.java b/src/main/java/forestry/arboriculture/commands/CommandTreesSpawn.java new file mode 100644 index 000000000..7a05b7964 --- /dev/null +++ b/src/main/java/forestry/arboriculture/commands/CommandTreesSpawn.java @@ -0,0 +1,141 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.commands; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.command.ICommandSender; +import net.minecraft.command.PlayerNotFoundException; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.gen.feature.WorldGenerator; + +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.core.commands.CommandHelpers; +import forestry.core.commands.SpeciesNotFoundException; +import forestry.core.commands.SubCommand; +import forestry.core.commands.TemplateNotFoundException; +import forestry.core.worldgen.WorldGenBase; +import forestry.plugins.PluginArboriculture; + +import org.apache.commons.lang3.StringUtils; + +public abstract class CommandTreesSpawn extends SubCommand { + + public CommandTreesSpawn(String name) { + super(name); + setPermLevel(PermLevel.ADMIN); + } + + @Override + public final void processSubCommand(ICommandSender sender, String[] arguments) { + if (arguments.length < 1 || arguments.length > 2) { + printHelp(sender); + return; + } + + EntityPlayer player; + String treeName; + try { + player = CommandHelpers.getPlayer(sender, arguments[arguments.length - 1]); + String[] argumentsWithoutPlayer = new String[arguments.length - 1]; + System.arraycopy(arguments, 0, argumentsWithoutPlayer, 0, arguments.length - 1); + treeName = StringUtils.join(argumentsWithoutPlayer, " "); + } catch (PlayerNotFoundException e) { + player = CommandHelpers.getPlayer(sender, sender.getCommandSenderName()); + treeName = StringUtils.join(arguments, " "); + } + + processSubCommand(sender, treeName, player); + } + + protected abstract void processSubCommand(ICommandSender sender, String treeName, EntityPlayer player); + + protected final WorldGenerator getWorldGen(String treeName, EntityPlayer player, int x, int y, int z) { + ITreeGenome treeGenome = getTreeGenome(treeName); + if (treeGenome == null) { + return null; + } + + ITree tree = PluginArboriculture.treeInterface.getTree(player.worldObj, treeGenome); + return tree.getTreeGenerator(player.worldObj, x, y, z, true); + } + + protected final void generateTree(WorldGenerator gen, EntityPlayer player, int x, int y, int z) { + if (gen instanceof WorldGenBase) { + ((WorldGenBase) gen).generate(player.worldObj, player.worldObj.rand, x, y, z, true); + } else { + gen.generate(player.worldObj, player.worldObj.rand, x, y, z); + } + } + + @Override + public List addTabCompletionOptions(ICommandSender sender, String[] parameters) { + if (parameters.length == 1) { + List tabCompletion = CommandHelpers.getListOfStringsMatchingLastWord(parameters, getSpecies()); + tabCompletion.add("help"); + return tabCompletion; + } else if (parameters.length == 2) { + return CommandHelpers.getListOfStringsMatchingLastWord(parameters, CommandHelpers.getPlayers()); + } + return null; + } + + private static String[] getSpecies() { + List species = new ArrayList(); + + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) + if (allele instanceof IAlleleTreeSpecies) + species.add(allele.getName().replaceAll("\\s", "")); + + return species.toArray(new String[species.size()]); + } + + private static ITreeGenome getTreeGenome(String speciesName) { + IAlleleTreeSpecies species = null; + + for (String uid : AlleleManager.alleleRegistry.getRegisteredAlleles().keySet()) { + + if (!uid.equals(speciesName)) + continue; + + IAllele allele = AlleleManager.alleleRegistry.getAllele(uid); + if (allele instanceof IAlleleTreeSpecies) { + species = (IAlleleTreeSpecies) allele; + break; + } + } + + if (species == null) { + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { + if (allele instanceof IAlleleTreeSpecies && allele.getName().replaceAll("\\s", "").equals(speciesName)) { + species = (IAlleleTreeSpecies) allele; + break; + } + } + } + + if (species == null) + throw new SpeciesNotFoundException(speciesName); + + IAllele[] template = PluginArboriculture.treeInterface.getTemplate(species.getUID()); + + if (template == null) + throw new TemplateNotFoundException(species); + + return PluginArboriculture.treeInterface.templateAsGenome(template); + } + +} diff --git a/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnForest.java b/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnForest.java new file mode 100644 index 000000000..450b3956a --- /dev/null +++ b/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnForest.java @@ -0,0 +1,44 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.commands; + +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.Vec3; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class CommandTreesSpawnForest extends CommandTreesSpawn { + + public CommandTreesSpawnForest() { + super("spawnForest"); + } + + protected void processSubCommand(ICommandSender sender, String treeName, EntityPlayer player) { + Vec3 look = player.getLookVec(); + + int x = (int)Math.round(player.posX + (16 * look.xCoord)); + int y = (int)Math.round(player.posY); + int z = (int)Math.round(player.posZ + (16 * look.zCoord)); + + for (int i = 0; i < 16; i++) { + int spawnX = x + player.worldObj.rand.nextInt(32) - 16; + int spawnZ = z + player.worldObj.rand.nextInt(32) - 16; + + WorldGenerator gen = getWorldGen(treeName, player, spawnX, y, spawnZ); + if (gen == null) { + printHelp(sender); + return; + } + generateTree(gen, player, spawnX, y, spawnZ); + } + } + +} diff --git a/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnTree.java b/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnTree.java new file mode 100644 index 000000000..54daa8061 --- /dev/null +++ b/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnTree.java @@ -0,0 +1,31 @@ +package forestry.arboriculture.commands; + +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.Vec3; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class CommandTreesSpawnTree extends CommandTreesSpawn { + + public CommandTreesSpawnTree() { + super("spawnTree"); + } + + @Override + protected void processSubCommand(ICommandSender sender, String treeName, EntityPlayer player) { + Vec3 look = player.getLookVec(); + + int x = (int)Math.round(player.posX + (3 * look.xCoord)); + int y = (int)Math.round(player.posY); + int z = (int)Math.round(player.posZ + (3 * look.zCoord)); + + WorldGenerator gen = getWorldGen(treeName, player, x, y, z); + if (gen == null) { + printHelp(sender); + return; + } + + generateTree(gen, player, x, y, z); + } + +} diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java index 8d4f87a4a..f93b72d7d 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java @@ -43,7 +43,7 @@ public abstract class WorldGenArboriculture extends WorldGenBase { } @Override - public boolean subGenerate(int x, int y, int z) { + public boolean subGenerate(int x, int y, int z, boolean forced) { this.startX = x; this.startY = y; this.startZ = z; @@ -53,9 +53,9 @@ public abstract class WorldGenArboriculture extends WorldGenBase { this.wood = getWood(); preGenerate(); - if (!canGrow()) + if (!forced && !canGrow()) { return false; - else { + } else { generate(); return true; } diff --git a/src/main/java/forestry/apiculture/SpeciesNotFoundException.java b/src/main/java/forestry/core/commands/SpeciesNotFoundException.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/forestry/apiculture/SpeciesNotFoundException.java rename to src/main/java/forestry/core/commands/SpeciesNotFoundException.java index 9e4308a12..c84501bf5 --- a/src/main/java/forestry/apiculture/SpeciesNotFoundException.java +++ b/src/main/java/forestry/core/commands/SpeciesNotFoundException.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture; +package forestry.core.commands; import net.minecraft.command.CommandException; @@ -17,7 +17,7 @@ public class SpeciesNotFoundException extends CommandException { private static final long serialVersionUID = 1L; public SpeciesNotFoundException(String title) { - super("Could not find bee species with Name or UID %s", title); + super("Could not find species with Name or UID %s", title); } } diff --git a/src/main/java/forestry/apiculture/TemplateNotFoundException.java b/src/main/java/forestry/core/commands/TemplateNotFoundException.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/forestry/apiculture/TemplateNotFoundException.java rename to src/main/java/forestry/core/commands/TemplateNotFoundException.java index 16a157084..06da28fc5 --- a/src/main/java/forestry/apiculture/TemplateNotFoundException.java +++ b/src/main/java/forestry/core/commands/TemplateNotFoundException.java @@ -8,7 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture; +package forestry.core.commands; import net.minecraft.command.CommandException; diff --git a/src/main/java/forestry/core/worldgen/WorldGenBase.java b/src/main/java/forestry/core/worldgen/WorldGenBase.java index 488863351..332e46770 100755 --- a/src/main/java/forestry/core/worldgen/WorldGenBase.java +++ b/src/main/java/forestry/core/worldgen/WorldGenBase.java @@ -42,15 +42,19 @@ public abstract class WorldGenBase extends WorldGenerator { @Override public final boolean generate(World world, Random random, int x, int y, int z) { + return generate(world, random, x, y, z, false); + } + + public final boolean generate(World world, Random random, int x, int y, int z, boolean forced) { this.world = world; this.rand = random; - boolean result = subGenerate(x, y, z); + boolean result = subGenerate(x, y, z, forced); this.world = null; this.rand = null; return result; } - public boolean subGenerate(int x, int y, int z) { + public boolean subGenerate(int x, int y, int z, boolean forced) { return false; } diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 58b0f989c..304e55b37 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -25,7 +25,6 @@ import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.IFuelHandler; @@ -47,8 +46,6 @@ import forestry.api.genetics.IClassification.EnumClassLevel; import forestry.api.genetics.IFruitFamily; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; -import forestry.arboriculture.CommandSpawnForest; -import forestry.arboriculture.CommandSpawnTree; import forestry.arboriculture.CommandTreekeepingMode; import forestry.arboriculture.EventHandlerArboriculture; import forestry.arboriculture.FruitProviderNone; @@ -60,6 +57,7 @@ import forestry.arboriculture.GuiHandlerArboriculture; import forestry.arboriculture.PacketHandlerArboriculture; import forestry.arboriculture.VillageHandlerArboriculture; import forestry.arboriculture.WoodType; +import forestry.arboriculture.commands.CommandTrees; import forestry.arboriculture.gadgets.BlockArbFence; import forestry.arboriculture.gadgets.BlockArbFence.FenceCat; import forestry.arboriculture.gadgets.BlockArbStairs; @@ -297,6 +295,8 @@ public class PluginArboriculture extends ForestryPlugin { validFences.add(Blocks.fence_gate); validFences.add(Blocks.nether_brick_fence); + // Commands + PluginCore.rootCommand.addChildCommand(new CommandTrees()); } @Override @@ -1104,8 +1104,7 @@ public class PluginArboriculture extends ForestryPlugin { @Override public ICommand[] getConsoleCommands() { - return new ICommand[]{new CommandSpawnTree(), new CommandSpawnForest(), - new CommandTreekeepingMode()}; + return new ICommand[]{new CommandTreekeepingMode()}; } @Override From a68cbc54e79368dfbd1288aeabf29cf3f5803947 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 13 Dec 2014 23:38:36 -0800 Subject: [PATCH 05/13] Fix and migrate Tree commands to new format. Remove CommandMC --- lang | 2 +- .../apiculture/commands/BeeModeHelper.java | 59 +++++ .../commands/BeeStatsSaveHelper.java | 78 ++++++ .../apiculture/commands/CommandBee.java | 32 +++ ...eepingGiveBee.java => CommandBeeGive.java} | 6 +- .../arboriculture/CommandTreekeepingMode.java | 247 ------------------ .../arboriculture/commands/CommandTree.java | 33 +++ ...dTreesSpawn.java => CommandTreeSpawn.java} | 73 +----- .../commands/CommandTreesSpawnTree.java | 31 --- ...eesSpawnForest.java => ForestSpawner.java} | 16 +- .../{CommandTrees.java => ITreeSpawner.java} | 11 +- .../arboriculture/commands/TreeGenHelper.java | 80 ++++++ .../commands/TreeModeHelper.java | 59 +++++ .../arboriculture/commands/TreeSpawner.java | 37 +++ .../commands/TreeStatsSaveHelper.java | 63 +++++ .../commands/CommandMode.java} | 14 +- .../commands/CommandModeInfo.java} | 62 ++--- .../commands/CommandModeSet.java} | 34 +-- .../commands/CommandSaveStats.java} | 113 ++++---- .../commands/ICommandModeHelper.java} | 22 +- .../core/commands/IStatsSaveHelper.java | 35 +++ .../java/forestry/core/utils/CommandMC.java | 53 ---- .../java/forestry/core/utils/StringUtil.java | 8 + .../forestry/plugins/PluginApiculture.java | 18 +- .../forestry/plugins/PluginArboriculture.java | 24 +- 25 files changed, 621 insertions(+), 589 deletions(-) create mode 100644 src/main/java/forestry/apiculture/commands/BeeModeHelper.java create mode 100644 src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java create mode 100644 src/main/java/forestry/apiculture/commands/CommandBee.java rename src/main/java/forestry/apiculture/commands/{CommandBeekeepingGiveBee.java => CommandBeeGive.java} (95%) delete mode 100755 src/main/java/forestry/arboriculture/CommandTreekeepingMode.java create mode 100644 src/main/java/forestry/arboriculture/commands/CommandTree.java rename src/main/java/forestry/arboriculture/commands/{CommandTreesSpawn.java => CommandTreeSpawn.java} (53%) delete mode 100644 src/main/java/forestry/arboriculture/commands/CommandTreesSpawnTree.java rename src/main/java/forestry/arboriculture/commands/{CommandTreesSpawnForest.java => ForestSpawner.java} (75%) rename src/main/java/forestry/arboriculture/commands/{CommandTrees.java => ITreeSpawner.java} (72%) create mode 100644 src/main/java/forestry/arboriculture/commands/TreeGenHelper.java create mode 100644 src/main/java/forestry/arboriculture/commands/TreeModeHelper.java create mode 100644 src/main/java/forestry/arboriculture/commands/TreeSpawner.java create mode 100644 src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java rename src/main/java/forestry/{apiculture/commands/CommandBeekeepingMode.java => core/commands/CommandMode.java} (68%) rename src/main/java/forestry/{apiculture/commands/CommandBeekeepingModeInfo.java => core/commands/CommandModeInfo.java} (53%) rename src/main/java/forestry/{apiculture/commands/CommandBeekeepingModeSet.java => core/commands/CommandModeSet.java} (60%) rename src/main/java/forestry/{apiculture/commands/CommandBeekeepingSave.java => core/commands/CommandSaveStats.java} (63%) rename src/main/java/forestry/{apiculture/commands/CommandBeekeeping.java => core/commands/ICommandModeHelper.java} (62%) create mode 100644 src/main/java/forestry/core/commands/IStatsSaveHelper.java delete mode 100755 src/main/java/forestry/core/utils/CommandMC.java diff --git a/lang b/lang index 76846d9c7..71f517c5a 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 76846d9c7646a02c8ac28e673579f065d499b3b9 +Subproject commit 71f517c5a6d4bb564b3996822b84da91bff791f3 diff --git a/src/main/java/forestry/apiculture/commands/BeeModeHelper.java b/src/main/java/forestry/apiculture/commands/BeeModeHelper.java new file mode 100644 index 000000000..396ed7229 --- /dev/null +++ b/src/main/java/forestry/apiculture/commands/BeeModeHelper.java @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.commands; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.world.World; + +import forestry.api.apiculture.IBeekeepingMode; +import forestry.core.commands.ICommandModeHelper; +import forestry.plugins.PluginApiculture; + +public class BeeModeHelper implements ICommandModeHelper { + + @Override + public String[] getModeNames() { + ArrayList beekeepingModes = PluginApiculture.beeInterface.getBeekeepingModes(); + int modeStringCount = beekeepingModes.size(); + List modeStrings = new ArrayList(modeStringCount); + for (IBeekeepingMode mode : beekeepingModes) + modeStrings.add(mode.getName()); + + return modeStrings.toArray(new String[modeStringCount]); + } + + @Override + public String getModeNameMatching(String desired) { + IBeekeepingMode mode = PluginApiculture.beeInterface.getBeekeepingMode(desired); + if (mode == null) + return null; + return mode.getName(); + } + + @Override + public String getModeName(World world) { + return PluginApiculture.beeInterface.getBeekeepingMode(world).getName(); + } + + @Override + public void setMode(World world, String modeName) { + PluginApiculture.beeInterface.setBeekeepingMode(world, modeName); + } + + @Override + public ArrayList getDescription(String modeName) { + IBeekeepingMode mode = PluginApiculture.beeInterface.getBeekeepingMode(modeName); + return mode.getDescription(); + } + +} diff --git a/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java b/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java new file mode 100644 index 000000000..6e69bd27f --- /dev/null +++ b/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java @@ -0,0 +1,78 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.commands; + +import java.util.ArrayList; +import java.util.Collection; + +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IApiaristTracker; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.core.commands.IStatsSaveHelper; +import forestry.core.utils.StringUtil; +import forestry.plugins.PluginApiculture; + +import com.mojang.authlib.GameProfile; + +public class BeeStatsSaveHelper implements IStatsSaveHelper { + + @Override + public String getUnlocalizedSaveStatsString() { + return "for.chat.command.forestry.bee.save.stats"; + } + + @Override + public void addExtraInfo(Collection statistics, IBreedingTracker breedingTracker) { + IApiaristTracker tracker = (IApiaristTracker)breedingTracker; + String discoveredLine = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.discovered") + ":"; + statistics.add(discoveredLine); + statistics.add(StringUtil.line(discoveredLine.length())); + + String queen = StatCollector.translateToLocal("for.bees.grammar.queen.type"); + String princess = StatCollector.translateToLocal("for.bees.grammar.princess.type"); + String drone = StatCollector.translateToLocal("for.bees.grammar.drone.type"); + statistics.add(queen + ":\t\t" + tracker.getQueenCount()); + statistics.add(princess + ":\t" + tracker.getPrincessCount()); + statistics.add(drone + ":\t\t" + tracker.getDroneCount()); + statistics.add(""); + } + + @Override + public String getModeName(World world) { + return PluginApiculture.beeInterface.getBeekeepingMode(world).getName(); + } + + @Override + public Collection getSpecies() { + Collection species = new ArrayList(); + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) + if (allele instanceof IAlleleBeeSpecies) + species.add((IAlleleBeeSpecies) allele); + return species; + } + + @Override + public String getFileSuffix() { + return "bees"; + } + + @Override + public IBreedingTracker getBreedingTracker(World world, GameProfile gameProfile) { + return PluginApiculture.beeInterface.getBreedingTracker(world, gameProfile); + } + +} diff --git a/src/main/java/forestry/apiculture/commands/CommandBee.java b/src/main/java/forestry/apiculture/commands/CommandBee.java new file mode 100644 index 000000000..baf36df83 --- /dev/null +++ b/src/main/java/forestry/apiculture/commands/CommandBee.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.apiculture.commands; + +import forestry.core.commands.CommandMode; +import forestry.core.commands.CommandSaveStats; +import forestry.core.commands.ICommandModeHelper; +import forestry.core.commands.IStatsSaveHelper; +import forestry.core.commands.SubCommand; + +public class CommandBee extends SubCommand { + + public CommandBee() { + super("bee"); + addAlias("beekeeping"); + + IStatsSaveHelper saveHelper = new BeeStatsSaveHelper(); + ICommandModeHelper modeHelper = new BeeModeHelper(); + + addChildCommand(new CommandMode(modeHelper)); + addChildCommand(new CommandSaveStats(saveHelper)); + addChildCommand(new CommandBeeGive()); + } +} diff --git a/src/main/java/forestry/apiculture/commands/CommandBeekeepingGiveBee.java b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java similarity index 95% rename from src/main/java/forestry/apiculture/commands/CommandBeekeepingGiveBee.java rename to src/main/java/forestry/apiculture/commands/CommandBeeGive.java index 4134d27ca..b8a72b595 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeekeepingGiveBee.java +++ b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java @@ -30,12 +30,12 @@ import forestry.core.commands.SubCommand; import forestry.core.commands.TemplateNotFoundException; import forestry.plugins.PluginApiculture; -public class CommandBeekeepingGiveBee extends SubCommand { +public class CommandBeeGive extends SubCommand { private final String beeTypeHelpString; private final String[] beeTypeArr; - public CommandBeekeepingGiveBee() { + public CommandBeeGive() { super("give"); setPermLevel(PermLevel.ADMIN); @@ -93,7 +93,7 @@ public class CommandBeekeepingGiveBee extends SubCommand { ItemStack beeStack = PluginApiculture.beeInterface.getMemberStack(bee, beeType.ordinal()); player.dropPlayerItemWithRandomChoice(beeStack, true); - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.give.given", player.getCommandSenderName(), bee.getGenome().getPrimary().getName(), beeType.getName()); + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.bee.give.given", player.getCommandSenderName(), bee.getGenome().getPrimary().getName(), beeType.getName()); } private static IBeeGenome getBeeGenome(String speciesName) { diff --git a/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java b/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java deleted file mode 100755 index d21ca6daa..000000000 --- a/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java +++ /dev/null @@ -1,247 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; -import java.text.DateFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Locale; - -import net.minecraft.command.CommandException; -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.command.WrongUsageException; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; - -import com.mojang.authlib.GameProfile; - -import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.IArboristTracker; -import forestry.api.arboriculture.ITreekeepingMode; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.core.config.Defaults; -import forestry.core.config.Version; -import forestry.core.proxy.Proxies; -import forestry.core.utils.CommandMC; -import forestry.core.utils.StringUtil; -import forestry.plugins.PluginArboriculture; - -public class CommandTreekeepingMode extends CommandMC { - - private final String[] modeStrings; - - public CommandTreekeepingMode() { - modeStrings = new String[PluginArboriculture.treeInterface.getTreekeepingModes().size()]; - for (int i = 0; i < PluginArboriculture.treeInterface.getTreekeepingModes().size(); i++) - modeStrings[i] = PluginArboriculture.treeInterface.getTreekeepingModes().get(i).getName(); - } - - @Override - public int compareTo(Object arg0) { - return this.getCommandName().compareTo(((ICommand) arg0).getCommandName()); - } - - @Override - public String getCommandName() { - return "treekeeping"; - } - - @Override - public String getCommandUsage(ICommandSender var1) { - return "/" + this.getCommandName() + " help"; - } - - @SuppressWarnings("rawtypes") - @Override - public List getCommandAliases() { - return null; - } - - @Override - public void processCommand(ICommandSender sender, String[] arguments) { - - if (arguments.length <= 0) - throw new WrongUsageException(StringUtil.localizeAndFormat("chat.help", this.getCommandUsage(sender))); - - if (arguments[0].matches("list")) - listModes(sender, arguments); - else if (arguments[0].matches("info")) - listModeInfo(sender, arguments); - else if (arguments[0].matches("set")) { - if (arguments.length <= 1) - throw new WrongUsageException("/" + this.getCommandName() + " set [] "); - - World world = getWorld(sender, arguments); - String desired = arguments[arguments.length - 1]; - - ITreekeepingMode mode = PluginArboriculture.treeInterface.getTreekeepingMode(desired); - if (mode == null) - throw new CommandException(StringUtil.localize("chat.trees.command.treekeeping.error"), desired); - - PluginArboriculture.treeInterface.setTreekeepingMode(world, mode.getName()); - func_152373_a(sender, this, StringUtil.localize("chat.trees.command.treekeeping.set"), mode.getName()); - - } else if (arguments[0].matches("save")) { - if (arguments.length <= 1) - throw new WrongUsageException("/" + this.getCommandName() + " save "); - - saveStatistics(sender, arguments); - } else if (arguments[0].matches("help")) { - sendChatMessage(sender, StringUtil.localizeAndFormat("chat.trees.command.help.0", this.getCommandName())); - sendChatMessage(sender, StringUtil.localize("chat.trees.command.help.1")); - sendChatMessage(sender, StringUtil.localize("chat.trees.command.help.2")); - sendChatMessage(sender, StringUtil.localize("chat.trees.command.help.3")); - sendChatMessage(sender, StringUtil.localize("chat.trees.command.help.4")); - sendChatMessage(sender, StringUtil.localize("chat.trees.command.help.5")); - } - } - - private void saveStatistics(ICommandSender sender, String[] arguments) { - - String newLine = System.getProperty("line.separator"); - World world = getWorld(sender, arguments); - - String player = arguments[1]; - Collection statistics = new ArrayList(); - - statistics.add(String.format("Treekeeping statistics for %s on %s:", player, DateFormat.getInstance().format(new Date()))); - statistics.add(""); - statistics.add("MODE: " + PluginArboriculture.treeInterface.getTreekeepingMode(world).getName()); - statistics.add(""); - - GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152655_a(player); - IArboristTracker tracker = PluginArboriculture.treeInterface.getBreedingTracker(world, profile); - if (tracker == null) - statistics.add("No statistics found."); - else { - statistics.add("BRED:"); - statistics.add("-----"); - statistics.add(""); - - Collection species = new ArrayList(); - for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) - if (allele instanceof IAlleleTreeSpecies) - species.add((IAlleleTreeSpecies) allele); - - statistics.add(String.format("SPECIES (%s):", species.size())); - statistics.add("-------------"); - statistics.add(""); - - for (IAlleleTreeSpecies allele : species) - statistics.add(generateSpeciesListEntry(allele, tracker)); - } - - File file = new File(Proxies.common.getForestryRoot(), "config/" + Defaults.MOD.toLowerCase(Locale.ENGLISH) + "/stats/" + player + ".log"); - try { - - if (file.getParentFile() != null) - file.getParentFile().mkdirs(); - - if (!file.exists() && !file.createNewFile()) { - sendChatMessage(sender, "Log file could not be created. Failed to save statistics."); - return; - } - - if (!file.canWrite()) { - sendChatMessage(sender, "Cannot write to log file. Failed to save statistics."); - return; - } - - FileOutputStream fileout = new FileOutputStream(file); - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fileout, "UTF-8")); - - writer.write("# " + Defaults.MOD + newLine + "# " + Version.getVersion() + newLine); - - for (String line : statistics) - writer.write(line + newLine); - - writer.close(); - - } catch (Exception ex) { - sendChatMessage(sender, "Write operation threw an exception. Failed to save statistics."); - ex.printStackTrace(); - } - - sendChatMessage(sender, "Saved statistics for player " + player); - } - - private String generateSpeciesListEntry(IAlleleTreeSpecies species, IArboristTracker tracker) { - String discovered = "[ ]"; - if (tracker.isDiscovered(species)) - discovered = "[ X ]"; - String blacklisted = "[ ]"; - if (AlleleManager.alleleRegistry.isBlacklisted(species.getUID())) - blacklisted = "[ BL ]"; - String notcounted = "[ ]"; - if (!species.isCounted()) - notcounted = "[ NC ]"; - - return String.format("%s %s %s\t%-40s %-20s %-20s", discovered, blacklisted, notcounted, species.getUID(), species.getName(), species.getAuthority()); - } - - private void listModes(ICommandSender sender, String[] arguments) { - World world = getWorld(sender, arguments); - - sendChatMessage(sender, "Current: " + PluginArboriculture.treeInterface.getTreekeepingMode(world).getName() + " (#" + world.getWorldInfo().getSaveVersion() - + ")"); - - String help = ""; - for (ITreekeepingMode mode : PluginArboriculture.treeInterface.getTreekeepingModes()) { - if (!help.isEmpty()) - help += ", "; - help += mode.getName(); - } - sendChatMessage(sender, "Available modes: " + help); - } - - private void listModeInfo(ICommandSender sender, String[] arguments) { - if (arguments.length <= 1) - throw new WrongUsageException("/" + this.getCommandName() + " info "); - - ITreekeepingMode found = null; - for (ITreekeepingMode mode : PluginArboriculture.treeInterface.getTreekeepingModes()) - if (mode.getName().equalsIgnoreCase(arguments[1])) { - found = mode; - break; - } - - if (found == null) - throw new CommandException("No treekeeping mode called '%s' is available.", arguments[1]); - - sendChatMessage(sender, "\u00A7aMode: " + found.getName()); - for (String desc : found.getDescription()) - sendChatMessage(sender, StringUtil.localize(desc)); - } - - @Override - public boolean canCommandSenderUseCommand(ICommandSender sender) { - if (sender instanceof EntityPlayer) - return Proxies.common.isOp((EntityPlayer) sender); - else - return sender.canCommandSenderUseCommand(4, getCommandName()); - } - - @SuppressWarnings("rawtypes") - @Override - public List addTabCompletionOptions(ICommandSender sender, String[] incomplete) { - return getListOfStringsMatchingLastWord(incomplete, modeStrings); - } - -} diff --git a/src/main/java/forestry/arboriculture/commands/CommandTree.java b/src/main/java/forestry/arboriculture/commands/CommandTree.java new file mode 100644 index 000000000..88c86d8b3 --- /dev/null +++ b/src/main/java/forestry/arboriculture/commands/CommandTree.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.commands; + +import forestry.core.commands.CommandMode; +import forestry.core.commands.CommandSaveStats; +import forestry.core.commands.ICommandModeHelper; +import forestry.core.commands.IStatsSaveHelper; +import forestry.core.commands.SubCommand; + +public class CommandTree extends SubCommand { + + public CommandTree() { + super("tree"); + + IStatsSaveHelper saveHelper = new TreeStatsSaveHelper(); + ICommandModeHelper modeHelper = new TreeModeHelper(); + + addChildCommand(new CommandTreeSpawn("spawnTree", new TreeSpawner())); + addChildCommand(new CommandTreeSpawn("spawnForest", new ForestSpawner())); + addChildCommand(new CommandMode(modeHelper)); + addChildCommand(new CommandSaveStats(saveHelper)); + } + +} diff --git a/src/main/java/forestry/arboriculture/commands/CommandTreesSpawn.java b/src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java similarity index 53% rename from src/main/java/forestry/arboriculture/commands/CommandTreesSpawn.java rename to src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java index 7a05b7964..39341c665 100644 --- a/src/main/java/forestry/arboriculture/commands/CommandTreesSpawn.java +++ b/src/main/java/forestry/arboriculture/commands/CommandTreeSpawn.java @@ -16,27 +16,23 @@ import java.util.List; import net.minecraft.command.ICommandSender; import net.minecraft.command.PlayerNotFoundException; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.gen.feature.WorldGenerator; import forestry.api.arboriculture.IAlleleTreeSpecies; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.core.commands.CommandHelpers; -import forestry.core.commands.SpeciesNotFoundException; import forestry.core.commands.SubCommand; -import forestry.core.commands.TemplateNotFoundException; -import forestry.core.worldgen.WorldGenBase; -import forestry.plugins.PluginArboriculture; import org.apache.commons.lang3.StringUtils; -public abstract class CommandTreesSpawn extends SubCommand { +public final class CommandTreeSpawn extends SubCommand { - public CommandTreesSpawn(String name) { + private final ITreeSpawner treeSpawner; + + public CommandTreeSpawn(String name, ITreeSpawner treeSpawner) { super(name); setPermLevel(PermLevel.ADMIN); + this.treeSpawner = treeSpawner; } @Override @@ -58,27 +54,9 @@ public abstract class CommandTreesSpawn extends SubCommand { treeName = StringUtils.join(arguments, " "); } - processSubCommand(sender, treeName, player); - } - - protected abstract void processSubCommand(ICommandSender sender, String treeName, EntityPlayer player); - - protected final WorldGenerator getWorldGen(String treeName, EntityPlayer player, int x, int y, int z) { - ITreeGenome treeGenome = getTreeGenome(treeName); - if (treeGenome == null) { - return null; - } - - ITree tree = PluginArboriculture.treeInterface.getTree(player.worldObj, treeGenome); - return tree.getTreeGenerator(player.worldObj, x, y, z, true); - } - - protected final void generateTree(WorldGenerator gen, EntityPlayer player, int x, int y, int z) { - if (gen instanceof WorldGenBase) { - ((WorldGenBase) gen).generate(player.worldObj, player.worldObj.rand, x, y, z, true); - } else { - gen.generate(player.worldObj, player.worldObj.rand, x, y, z); - } + boolean success = treeSpawner.spawn(sender, treeName, player); + if (!success) + printHelp(sender); } @Override @@ -103,39 +81,4 @@ public abstract class CommandTreesSpawn extends SubCommand { return species.toArray(new String[species.size()]); } - private static ITreeGenome getTreeGenome(String speciesName) { - IAlleleTreeSpecies species = null; - - for (String uid : AlleleManager.alleleRegistry.getRegisteredAlleles().keySet()) { - - if (!uid.equals(speciesName)) - continue; - - IAllele allele = AlleleManager.alleleRegistry.getAllele(uid); - if (allele instanceof IAlleleTreeSpecies) { - species = (IAlleleTreeSpecies) allele; - break; - } - } - - if (species == null) { - for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { - if (allele instanceof IAlleleTreeSpecies && allele.getName().replaceAll("\\s", "").equals(speciesName)) { - species = (IAlleleTreeSpecies) allele; - break; - } - } - } - - if (species == null) - throw new SpeciesNotFoundException(speciesName); - - IAllele[] template = PluginArboriculture.treeInterface.getTemplate(species.getUID()); - - if (template == null) - throw new TemplateNotFoundException(species); - - return PluginArboriculture.treeInterface.templateAsGenome(template); - } - } diff --git a/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnTree.java b/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnTree.java deleted file mode 100644 index 54daa8061..000000000 --- a/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnTree.java +++ /dev/null @@ -1,31 +0,0 @@ -package forestry.arboriculture.commands; - -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.Vec3; -import net.minecraft.world.gen.feature.WorldGenerator; - -public class CommandTreesSpawnTree extends CommandTreesSpawn { - - public CommandTreesSpawnTree() { - super("spawnTree"); - } - - @Override - protected void processSubCommand(ICommandSender sender, String treeName, EntityPlayer player) { - Vec3 look = player.getLookVec(); - - int x = (int)Math.round(player.posX + (3 * look.xCoord)); - int y = (int)Math.round(player.posY); - int z = (int)Math.round(player.posZ + (3 * look.zCoord)); - - WorldGenerator gen = getWorldGen(treeName, player, x, y, z); - if (gen == null) { - printHelp(sender); - return; - } - - generateTree(gen, player, x, y, z); - } - -} diff --git a/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnForest.java b/src/main/java/forestry/arboriculture/commands/ForestSpawner.java similarity index 75% rename from src/main/java/forestry/arboriculture/commands/CommandTreesSpawnForest.java rename to src/main/java/forestry/arboriculture/commands/ForestSpawner.java index 450b3956a..002f9b962 100644 --- a/src/main/java/forestry/arboriculture/commands/CommandTreesSpawnForest.java +++ b/src/main/java/forestry/arboriculture/commands/ForestSpawner.java @@ -15,13 +15,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.Vec3; import net.minecraft.world.gen.feature.WorldGenerator; -public class CommandTreesSpawnForest extends CommandTreesSpawn { +public class ForestSpawner implements ITreeSpawner { - public CommandTreesSpawnForest() { - super("spawnForest"); - } - - protected void processSubCommand(ICommandSender sender, String treeName, EntityPlayer player) { + public boolean spawn(ICommandSender sender, String treeName, EntityPlayer player) { Vec3 look = player.getLookVec(); int x = (int)Math.round(player.posX + (16 * look.xCoord)); @@ -32,13 +28,13 @@ public class CommandTreesSpawnForest extends CommandTreesSpawn { int spawnX = x + player.worldObj.rand.nextInt(32) - 16; int spawnZ = z + player.worldObj.rand.nextInt(32) - 16; - WorldGenerator gen = getWorldGen(treeName, player, spawnX, y, spawnZ); + WorldGenerator gen = TreeGenHelper.getWorldGen(treeName, player, spawnX, y, spawnZ); if (gen == null) { - printHelp(sender); - return; + return false; } - generateTree(gen, player, spawnX, y, spawnZ); + TreeGenHelper.generateTree(gen, player, spawnX, y, spawnZ); } + return true; } } diff --git a/src/main/java/forestry/arboriculture/commands/CommandTrees.java b/src/main/java/forestry/arboriculture/commands/ITreeSpawner.java similarity index 72% rename from src/main/java/forestry/arboriculture/commands/CommandTrees.java rename to src/main/java/forestry/arboriculture/commands/ITreeSpawner.java index dc6da946e..ddeec9b99 100644 --- a/src/main/java/forestry/arboriculture/commands/CommandTrees.java +++ b/src/main/java/forestry/arboriculture/commands/ITreeSpawner.java @@ -10,14 +10,11 @@ ******************************************************************************/ package forestry.arboriculture.commands; -import forestry.core.commands.SubCommand; +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayer; -public class CommandTrees extends SubCommand { +public interface ITreeSpawner { - public CommandTrees() { - super("tree"); - addChildCommand(new CommandTreesSpawnTree()); - addChildCommand(new CommandTreesSpawnForest()); - } + boolean spawn(ICommandSender sender, String treeName, EntityPlayer player); } diff --git a/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java b/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java new file mode 100644 index 000000000..870b7d1b6 --- /dev/null +++ b/src/main/java/forestry/arboriculture/commands/TreeGenHelper.java @@ -0,0 +1,80 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.commands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.gen.feature.WorldGenerator; + +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.core.commands.SpeciesNotFoundException; +import forestry.core.commands.TemplateNotFoundException; +import forestry.core.worldgen.WorldGenBase; +import forestry.plugins.PluginArboriculture; + +public final class TreeGenHelper { + + public static WorldGenerator getWorldGen(String treeName, EntityPlayer player, int x, int y, int z) { + ITreeGenome treeGenome = getTreeGenome(treeName); + if (treeGenome == null) { + return null; + } + + ITree tree = PluginArboriculture.treeInterface.getTree(player.worldObj, treeGenome); + return tree.getTreeGenerator(player.worldObj, x, y, z, true); + } + + public static void generateTree(WorldGenerator gen, EntityPlayer player, int x, int y, int z) { + if (gen instanceof WorldGenBase) { + ((WorldGenBase) gen).generate(player.worldObj, player.worldObj.rand, x, y, z, true); + } else { + gen.generate(player.worldObj, player.worldObj.rand, x, y, z); + } + } + + private static ITreeGenome getTreeGenome(String speciesName) { + IAlleleTreeSpecies species = null; + + for (String uid : AlleleManager.alleleRegistry.getRegisteredAlleles().keySet()) { + + if (!uid.equals(speciesName)) + continue; + + IAllele allele = AlleleManager.alleleRegistry.getAllele(uid); + if (allele instanceof IAlleleTreeSpecies) { + species = (IAlleleTreeSpecies) allele; + break; + } + } + + if (species == null) { + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { + if (allele instanceof IAlleleTreeSpecies && allele.getName().replaceAll("\\s", "").equals(speciesName)) { + species = (IAlleleTreeSpecies) allele; + break; + } + } + } + + if (species == null) + throw new SpeciesNotFoundException(speciesName); + + IAllele[] template = PluginArboriculture.treeInterface.getTemplate(species.getUID()); + + if (template == null) + throw new TemplateNotFoundException(species); + + return PluginArboriculture.treeInterface.templateAsGenome(template); + } +} diff --git a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java new file mode 100644 index 000000000..c0a13ee1f --- /dev/null +++ b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.commands; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.world.World; + +import forestry.api.arboriculture.ITreekeepingMode; +import forestry.core.commands.ICommandModeHelper; +import forestry.plugins.PluginArboriculture; + +public class TreeModeHelper implements ICommandModeHelper { + + @Override + public String[] getModeNames() { + ArrayList treekeepingModes = PluginArboriculture.treeInterface.getTreekeepingModes(); + int modeStringCount = treekeepingModes.size(); + List modeStrings = new ArrayList(modeStringCount); + for (ITreekeepingMode mode : treekeepingModes) + modeStrings.add(mode.getName()); + + return modeStrings.toArray(new String[modeStringCount]); + } + + @Override + public String getModeNameMatching(String desired) { + ITreekeepingMode mode = PluginArboriculture.treeInterface.getTreekeepingMode(desired); + if (mode == null) + return null; + return mode.getName(); + } + + @Override + public String getModeName(World world) { + return PluginArboriculture.treeInterface.getTreekeepingMode(world).getName(); + } + + @Override + public void setMode(World world, String modeName) { + PluginArboriculture.treeInterface.setTreekeepingMode(world, modeName); + } + + @Override + public ArrayList getDescription(String modeName) { + ITreekeepingMode mode = PluginArboriculture.treeInterface.getTreekeepingMode(modeName); + return mode.getDescription(); + } + +} diff --git a/src/main/java/forestry/arboriculture/commands/TreeSpawner.java b/src/main/java/forestry/arboriculture/commands/TreeSpawner.java new file mode 100644 index 000000000..6e47c368a --- /dev/null +++ b/src/main/java/forestry/arboriculture/commands/TreeSpawner.java @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.commands; + +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.Vec3; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class TreeSpawner implements ITreeSpawner { + + @Override + public boolean spawn(ICommandSender sender, String treeName, EntityPlayer player) { + Vec3 look = player.getLookVec(); + + int x = (int)Math.round(player.posX + (3 * look.xCoord)); + int y = (int)Math.round(player.posY); + int z = (int)Math.round(player.posZ + (3 * look.zCoord)); + + WorldGenerator gen = TreeGenHelper.getWorldGen(treeName, player, x, y, z); + if (gen == null) { + return false; + } + + TreeGenHelper.generateTree(gen, player, x, y, z); + return true; + } + +} diff --git a/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java b/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java new file mode 100644 index 000000000..6a1b2e568 --- /dev/null +++ b/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java @@ -0,0 +1,63 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.commands; + +import java.util.ArrayList; +import java.util.Collection; + +import net.minecraft.world.World; + +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.core.commands.IStatsSaveHelper; +import forestry.plugins.PluginArboriculture; + +import com.mojang.authlib.GameProfile; + +public class TreeStatsSaveHelper implements IStatsSaveHelper { + + @Override + public String getUnlocalizedSaveStatsString() { + return "for.chat.command.forestry.tree.save.stats"; + } + + @Override + public void addExtraInfo(Collection statistics, IBreedingTracker breedingTracker) { + } + + @Override + public String getModeName(World world) { + return PluginArboriculture.treeInterface.getTreekeepingMode(world).getName(); + } + + @Override + public Collection getSpecies() { + Collection species = new ArrayList(); + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) + if (allele instanceof IAlleleTreeSpecies) + species.add((IAlleleTreeSpecies) allele); + return species; + } + + @Override + public String getFileSuffix() { + return "trees"; + } + + @Override + public IBreedingTracker getBreedingTracker(World world, GameProfile gameProfile) { + return PluginArboriculture.treeInterface.getBreedingTracker(world, gameProfile); + } + +} diff --git a/src/main/java/forestry/apiculture/commands/CommandBeekeepingMode.java b/src/main/java/forestry/core/commands/CommandMode.java similarity index 68% rename from src/main/java/forestry/apiculture/commands/CommandBeekeepingMode.java rename to src/main/java/forestry/core/commands/CommandMode.java index 0502deb12..ee3c2cc16 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeekeepingMode.java +++ b/src/main/java/forestry/core/commands/CommandMode.java @@ -4,19 +4,17 @@ * are made available under the terms of the GNU Lesser Public License v3 * which accompanies this distribution, and is available at * http://www.gnu.org/licenses/lgpl-3.0.txt - * + * * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.commands; +package forestry.core.commands; -import forestry.core.commands.SubCommand; +public class CommandMode extends SubCommand { -public class CommandBeekeepingMode extends SubCommand { - - public CommandBeekeepingMode() { + public CommandMode(ICommandModeHelper modeHelper) { super("mode"); - addChildCommand(new CommandBeekeepingModeInfo()); - addChildCommand(new CommandBeekeepingModeSet()); + addChildCommand(new CommandModeInfo(modeHelper)); + addChildCommand(new CommandModeSet(modeHelper)); } } diff --git a/src/main/java/forestry/apiculture/commands/CommandBeekeepingModeInfo.java b/src/main/java/forestry/core/commands/CommandModeInfo.java similarity index 53% rename from src/main/java/forestry/apiculture/commands/CommandBeekeepingModeInfo.java rename to src/main/java/forestry/core/commands/CommandModeInfo.java index dce83b61b..419e5cd09 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeekeepingModeInfo.java +++ b/src/main/java/forestry/core/commands/CommandModeInfo.java @@ -8,45 +8,28 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.commands; +package forestry.core.commands; + +import java.util.List; -import forestry.api.apiculture.IBeekeepingMode; -import forestry.core.commands.CommandHelpers; -import forestry.core.commands.SubCommand; -import forestry.plugins.PluginApiculture; import net.minecraft.command.ICommandSender; import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -public class CommandBeekeepingModeInfo extends SubCommand { +import org.apache.commons.lang3.StringUtils; +public class CommandModeInfo extends SubCommand { private final String[] modeStringArr; private final String helpString; + private final ICommandModeHelper modeHelper; - public CommandBeekeepingModeInfo() { + public CommandModeInfo(ICommandModeHelper modeHelper) { super("info"); - List modeStrings = new ArrayList(); - for (IBeekeepingMode mode : PluginApiculture.beeInterface.getBeekeepingModes()) - modeStrings.add(mode.getName()); - - modeStringArr = modeStrings.toArray(new String[modeStrings.size()]); - - StringBuilder help = new StringBuilder(); - String separator = ", "; - - Iterator iter = modeStrings.iterator(); - while (iter.hasNext()) { - help.append(iter.next()); - if (iter.hasNext()) - help.append(separator); - } - helpString = help.toString(); + this.modeHelper = modeHelper; + modeStringArr = modeHelper.getModeNames(); + helpString = StringUtils.join(modeStringArr, ", "); } @Override @@ -56,42 +39,33 @@ public class CommandBeekeepingModeInfo extends SubCommand { return; } - String modeName = args[0]; + String modeName = modeHelper.getModeNameMatching(args[0]); - IBeekeepingMode found = findModeWithName(modeName); - if (found == null) { - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.mode.info.error", modeName); + if (modeName == null) { + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.mode.info.error", args[0]); printHelp(sender); return; } ChatStyle green = new ChatStyle(); green.setColor(EnumChatFormatting.GREEN); - CommandHelpers.sendLocalizedChatMessage(sender, green, found.getName()); + CommandHelpers.sendLocalizedChatMessage(sender, green, modeName); - for (String desc : found.getDescription()) + for (String desc : modeHelper.getDescription(modeName)) CommandHelpers.sendLocalizedChatMessage(sender, "for." + desc); } - private IBeekeepingMode findModeWithName(String name) { - for (IBeekeepingMode mode : PluginApiculture.beeInterface.getBeekeepingModes()) { - if (mode.getName().equalsIgnoreCase(name)) - return mode; - } - return null; - } - @Override public void printHelp(ICommandSender sender) { super.printHelp(sender); World world = CommandHelpers.getWorld(sender, this); - String modeName = PluginApiculture.beeInterface.getBeekeepingMode(world).getName(); + String modeName = modeHelper.getModeName(world); String worldName = String.valueOf(world.getWorldInfo().getSaveVersion()); - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.mode.info.current", modeName, worldName); - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.mode.info.available", helpString); + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.mode.info.current", modeName, worldName); + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.mode.info.available", helpString); } @Override diff --git a/src/main/java/forestry/apiculture/commands/CommandBeekeepingModeSet.java b/src/main/java/forestry/core/commands/CommandModeSet.java similarity index 60% rename from src/main/java/forestry/apiculture/commands/CommandBeekeepingModeSet.java rename to src/main/java/forestry/core/commands/CommandModeSet.java index 13aa6bb34..1fd50ba9d 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeekeepingModeSet.java +++ b/src/main/java/forestry/core/commands/CommandModeSet.java @@ -8,30 +8,24 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.commands; +package forestry.core.commands; + +import java.util.List; -import forestry.api.apiculture.IBeekeepingMode; -import forestry.core.commands.CommandHelpers; -import forestry.core.commands.SubCommand; -import forestry.plugins.PluginApiculture; import net.minecraft.command.ICommandSender; import net.minecraft.world.World; -import java.util.ArrayList; -import java.util.List; - -public class CommandBeekeepingModeSet extends SubCommand { +public final class CommandModeSet extends SubCommand { private final String[] modeStringArr; + private final ICommandModeHelper modeSetter; - public CommandBeekeepingModeSet() { + public CommandModeSet(ICommandModeHelper modeSetter) { super("set"); setPermLevel(PermLevel.ADMIN); - int modeStringCount = PluginApiculture.beeInterface.getBeekeepingModes().size(); - List modeStrings = new ArrayList(modeStringCount); - for (IBeekeepingMode mode : PluginApiculture.beeInterface.getBeekeepingModes()) - modeStrings.add(mode.getName()); - modeStringArr = modeStrings.toArray(new String[modeStringCount]); + this.modeSetter = modeSetter; + modeStringArr = modeSetter.getModeNames(); + } @Override @@ -49,15 +43,15 @@ public class CommandBeekeepingModeSet extends SubCommand { String desired = args[args.length - 1]; - IBeekeepingMode mode = PluginApiculture.beeInterface.getBeekeepingMode(desired); - if (mode == null) { - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.mode.set.error", desired); + String modeName = modeSetter.getModeNameMatching(desired); + if (modeName == null) { + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.mode.set.error", desired); printHelp(sender); return; } - PluginApiculture.beeInterface.setBeekeepingMode(world, mode.getName()); - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.mode.set.success", mode.getName()); + modeSetter.setMode(world, modeName); + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.mode.set.success", modeName); } @Override diff --git a/src/main/java/forestry/apiculture/commands/CommandBeekeepingSave.java b/src/main/java/forestry/core/commands/CommandSaveStats.java similarity index 63% rename from src/main/java/forestry/apiculture/commands/CommandBeekeepingSave.java rename to src/main/java/forestry/core/commands/CommandSaveStats.java index 60423d3c8..18f3ea606 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeekeepingSave.java +++ b/src/main/java/forestry/core/commands/CommandSaveStats.java @@ -8,23 +8,7 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.commands; - -import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IApiaristTracker; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.core.commands.CommandHelpers; -import forestry.core.commands.SubCommand; -import forestry.core.config.Defaults; -import forestry.core.config.Version; -import forestry.core.proxy.Proxies; -import forestry.plugins.PluginApiculture; -import net.minecraft.command.ICommandSender; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; +package forestry.core.commands; import java.io.BufferedWriter; import java.io.File; @@ -38,17 +22,32 @@ import java.util.Date; import java.util.List; import java.util.Locale; -public class CommandBeekeepingSave extends SubCommand { +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; +import forestry.core.config.Defaults; +import forestry.core.config.Version; +import forestry.core.proxy.Proxies; +import forestry.core.utils.StringUtil; + +public final class CommandSaveStats extends SubCommand { private final String discoveredSymbol; private final String blacklistedSymbol; private final String notCountedSymbol; + private final IStatsSaveHelper saveHelper; - public CommandBeekeepingSave() { + public CommandSaveStats(IStatsSaveHelper saveHelper) { super("save"); - discoveredSymbol = StatCollector.translateToLocal("for.chat.command.forestry.beekeeping.save.key.discovered.symbol"); - blacklistedSymbol = StatCollector.translateToLocal("for.chat.command.forestry.beekeeping.save.key.blacklisted.symbol"); - notCountedSymbol = StatCollector.translateToLocal("for.chat.command.forestry.beekeeping.save.key.notCounted.symbol"); + discoveredSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.discovered.symbol"); + blacklistedSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.blacklisted.symbol"); + notCountedSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.notCounted.symbol"); + this.saveHelper = saveHelper; } @Override @@ -58,7 +57,7 @@ public class CommandBeekeepingSave extends SubCommand { @Override public void processSubCommand(ICommandSender sender, String[] args) { - if (args.length != 1) { + if (args.length > 1) { printHelp(sender); return; } @@ -66,76 +65,66 @@ public class CommandBeekeepingSave extends SubCommand { String newLine = System.getProperty("line.separator"); World world = CommandHelpers.getWorld(sender, this); - String player = args[0]; + EntityPlayerMP player; + if (args.length > 0) + player = CommandHelpers.getPlayer(sender, args[0]); + else + player = CommandHelpers.getPlayer(sender, sender.getCommandSenderName()); + Collection statistics = new ArrayList(); String date = DateFormat.getInstance().format(new Date()); - statistics.add(StatCollector.translateToLocalFormatted("for.chat.command.forestry.beekeeping.save.stats", player, date)); + statistics.add(StatCollector.translateToLocalFormatted(saveHelper.getUnlocalizedSaveStatsString(), player.getDisplayName(), date)); statistics.add(""); - String modeName = PluginApiculture.beeInterface.getBeekeepingMode(world).getName(); - statistics.add(StatCollector.translateToLocalFormatted("for.chat.command.forestry.beekeeping.save.mode", modeName)); + statistics.add(StatCollector.translateToLocalFormatted("for.chat.command.forestry.stats.save.mode", saveHelper.getModeName(world))); statistics.add(""); - GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152655_a(player); - IApiaristTracker tracker = PluginApiculture.beeInterface.getBreedingTracker(world, profile); + IBreedingTracker tracker = saveHelper.getBreedingTracker(world, player.getGameProfile()); if (tracker == null) - statistics.add(StatCollector.translateToLocal("for.chat.command.forestry.beekeeping.save.error4")); + statistics.add(StatCollector.translateToLocal("for.chat.command.forestry.stats.save.error4")); else { - String discoveredLine = StatCollector.translateToLocal("for.chat.command.forestry.beekeeping.save.key.discovered") + ":"; - statistics.add(discoveredLine); - statistics.add(line(discoveredLine.length())); + saveHelper.addExtraInfo(statistics, tracker); - String queen = StatCollector.translateToLocal("for.bees.grammar.queen.type"); - String princess = StatCollector.translateToLocal("for.bees.grammar.princess.type"); - String drone = StatCollector.translateToLocal("for.bees.grammar.drone.type"); - statistics.add(queen + ":\t\t" + tracker.getQueenCount()); - statistics.add(princess + ":\t" + tracker.getPrincessCount()); - statistics.add(drone + ":\t\t" + tracker.getDroneCount()); - statistics.add(""); - - Collection species = new ArrayList(); - for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) - if (allele instanceof IAlleleBeeSpecies) - species.add((IAlleleBeeSpecies) allele); + Collection species = saveHelper.getSpecies(); String speciesCount = StatCollector.translateToLocal("for.gui.speciescount"); String speciesCountLine = String.format("%s (%s):", speciesCount, species.size()); statistics.add(speciesCountLine); - statistics.add(line(speciesCountLine.length())); + statistics.add(StringUtil.line(speciesCountLine.length())); - statistics.add(discoveredSymbol + ": " + StatCollector.translateToLocal("for.chat.command.forestry.beekeeping.save.key.discovered")); - statistics.add(blacklistedSymbol + ": " + StatCollector.translateToLocal("for.chat.command.forestry.beekeeping.save.key.blacklisted")); - statistics.add(notCountedSymbol + ": " + StatCollector.translateToLocal("for.chat.command.forestry.beekeeping.save.key.notCounted")); + statistics.add(discoveredSymbol + ": " + StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.discovered")); + statistics.add(blacklistedSymbol + ": " + StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.blacklisted")); + statistics.add(notCountedSymbol + ": " + StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.notCounted")); statistics.add(""); String header = generateSpeciesListHeader(); statistics.add(header); - statistics.add(line(header.length())); + statistics.add(StringUtil.line(header.length())); statistics.add(""); - for (IAlleleBeeSpecies allele : species) + for (IAlleleSpecies allele : species) statistics.add(generateSpeciesListEntry(allele, tracker)); } - File file = new File(Proxies.common.getForestryRoot(), "config/" + Defaults.MOD.toLowerCase(Locale.ENGLISH) + "/stats/" + player + ".log"); + File file = new File(Proxies.common.getForestryRoot(), "config/" + Defaults.MOD.toLowerCase(Locale.ENGLISH) + "/stats/" + player.getDisplayName() + "-" + saveHelper.getFileSuffix() + ".log"); try { File folder = file.getParentFile(); if (folder != null && !folder.exists()) { boolean success = file.getParentFile().mkdirs(); if (!success) { - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.save.error1"); + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.stats.save.error1"); return; } } if (!file.exists() && !file.createNewFile()) { - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.save.error1"); + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.stats.save.error1"); return; } if (!file.canWrite()) { - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.save.error2"); + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.stats.save.error2"); return; } @@ -151,20 +140,12 @@ public class CommandBeekeepingSave extends SubCommand { } catch (IOException ex) { - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.save.error3"); + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.stats.save.error3"); ex.printStackTrace(); return; } - CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.beekeeping.save.saved", player); - } - - private String line(int length) { - StringBuilder line = new StringBuilder(); - for (int i = 0; i < length; i++) - line.append("-"); - - return line.toString(); + CommandHelpers.sendLocalizedChatMessage(sender, "for.chat.command.forestry.stats.save.saved", player.getDisplayName()); } private String generateSpeciesListHeader() { @@ -173,7 +154,7 @@ public class CommandBeekeepingSave extends SubCommand { return speciesListEntry(discoveredSymbol, blacklistedSymbol, notCountedSymbol, "UID", species, authority); } - private String generateSpeciesListEntry(IAlleleBeeSpecies species, IApiaristTracker tracker) { + private String generateSpeciesListEntry(IAlleleSpecies species, IBreedingTracker tracker) { String discovered = ""; if (tracker.isDiscovered(species)) discovered = discoveredSymbol; diff --git a/src/main/java/forestry/apiculture/commands/CommandBeekeeping.java b/src/main/java/forestry/core/commands/ICommandModeHelper.java similarity index 62% rename from src/main/java/forestry/apiculture/commands/CommandBeekeeping.java rename to src/main/java/forestry/core/commands/ICommandModeHelper.java index ceeb66d33..3e57fa387 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeekeeping.java +++ b/src/main/java/forestry/core/commands/ICommandModeHelper.java @@ -8,17 +8,19 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.apiculture.commands; +package forestry.core.commands; -import forestry.core.commands.SubCommand; +import java.util.ArrayList; -public class CommandBeekeeping extends SubCommand { +import net.minecraft.world.World; - public CommandBeekeeping() { - super("bee"); - addAlias("beekeeping"); - addChildCommand(new CommandBeekeepingMode()); - addChildCommand(new CommandBeekeepingSave()); - addChildCommand(new CommandBeekeepingGiveBee()); - } +public interface ICommandModeHelper { + String[] getModeNames(); + + String getModeNameMatching(String desired); + + String getModeName(World world); + void setMode(World world, String modeName); + + ArrayList getDescription(String modeName); } diff --git a/src/main/java/forestry/core/commands/IStatsSaveHelper.java b/src/main/java/forestry/core/commands/IStatsSaveHelper.java new file mode 100644 index 000000000..3cc6092fc --- /dev/null +++ b/src/main/java/forestry/core/commands/IStatsSaveHelper.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.commands; + +import java.util.Collection; + +import net.minecraft.world.World; + +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IBreedingTracker; + +import com.mojang.authlib.GameProfile; + +public interface IStatsSaveHelper { + + String getUnlocalizedSaveStatsString(); + + void addExtraInfo(Collection statistics, IBreedingTracker breedingTracker); + + String getModeName(World world); + + Collection getSpecies(); + + String getFileSuffix(); + + IBreedingTracker getBreedingTracker(World world, GameProfile gameProfile); +} diff --git a/src/main/java/forestry/core/utils/CommandMC.java b/src/main/java/forestry/core/utils/CommandMC.java deleted file mode 100755 index 138fb83c0..000000000 --- a/src/main/java/forestry/core/utils/CommandMC.java +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.utils; - -import net.minecraft.command.CommandBase; -import net.minecraft.command.ICommandSender; -import net.minecraft.command.WrongUsageException; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.world.World; - -@Deprecated -public abstract class CommandMC extends CommandBase { - - protected World getWorld(ICommandSender sender, String[] arguments) { - - // Handle passed in world argument - if (arguments.length > 2) { - int dim = 0; - try { - dim = Integer.parseInt(arguments[1]); - } catch (Exception ex) { - throw new WrongUsageException("/" + getCommandName() + " set [] "); - } - - return MinecraftServer.getServer().worldServerForDimension(dim); - } - - if (sender instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) sender; - return player.worldObj; - } else - return MinecraftServer.getServer().worldServerForDimension(0); - - } - - protected String[] getPlayers() { - return MinecraftServer.getServer().getAllUsernames(); - } - - protected void sendChatMessage(ICommandSender sender, String message) { - sender.addChatMessage(new ChatComponentText(message)); - } -} diff --git a/src/main/java/forestry/core/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java index cfbd90c70..75698486a 100755 --- a/src/main/java/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -89,4 +89,12 @@ public class StringUtil { public static String floatAsPercent(float val) { return (int) (val * 100) + " %"; } + + public static String line(int length) { + StringBuilder line = new StringBuilder(); + for (int i = 0; i < length; i++) + line.append("-"); + + return line.toString(); + } } diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 3b66f571c..4a6d187a8 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -30,7 +30,6 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.FMLCommonHandler; @@ -73,7 +72,7 @@ import forestry.apiculture.GuiHandlerApiculture; import forestry.apiculture.PacketHandlerApiculture; import forestry.apiculture.SaveEventHandlerApiculture; import forestry.apiculture.VillageHandlerApiculture; -import forestry.apiculture.commands.CommandBeekeeping; +import forestry.apiculture.commands.CommandBee; import forestry.apiculture.gadgets.BlockAlveary; import forestry.apiculture.gadgets.BlockBeehives; import forestry.apiculture.gadgets.BlockCandle; @@ -269,8 +268,15 @@ public class PluginApiculture extends ForestryPlugin { // Register village components with the Structure registry. VillageHandlerApiculture.registerVillageComponents(); + // Modes + PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.easy); + PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.normal); + PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.hard); + PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.hardcore); + PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.insane); + // Commands - PluginCore.rootCommand.addChildCommand(new CommandBeekeeping()); + PluginCore.rootCommand.addChildCommand(new CommandBee()); } @Override @@ -306,12 +312,6 @@ public class PluginApiculture extends ForestryPlugin { createMutations(); registerBeehiveDrops(); - PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.easy); - PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.normal); - PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.hard); - PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.hardcore); - PluginApiculture.beeInterface.registerBeekeepingMode(BeekeepingMode.insane); - // Inducers for swarmer BeeManager.inducers.put(ForestryItem.royalJelly.getItemStack(), 10); diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 304e55b37..1a3ad311b 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -16,7 +16,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.command.ICommand; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -46,7 +45,6 @@ import forestry.api.genetics.IClassification.EnumClassLevel; import forestry.api.genetics.IFruitFamily; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; -import forestry.arboriculture.CommandTreekeepingMode; import forestry.arboriculture.EventHandlerArboriculture; import forestry.arboriculture.FruitProviderNone; import forestry.arboriculture.FruitProviderPod; @@ -57,7 +55,7 @@ import forestry.arboriculture.GuiHandlerArboriculture; import forestry.arboriculture.PacketHandlerArboriculture; import forestry.arboriculture.VillageHandlerArboriculture; import forestry.arboriculture.WoodType; -import forestry.arboriculture.commands.CommandTrees; +import forestry.arboriculture.commands.CommandTree; import forestry.arboriculture.gadgets.BlockArbFence; import forestry.arboriculture.gadgets.BlockArbFence.FenceCat; import forestry.arboriculture.gadgets.BlockArbStairs; @@ -295,8 +293,15 @@ public class PluginArboriculture extends ForestryPlugin { validFences.add(Blocks.fence_gate); validFences.add(Blocks.nether_brick_fence); + // Modes + PluginArboriculture.treeInterface.registerTreekeepingMode(TreekeepingMode.easy); + PluginArboriculture.treeInterface.registerTreekeepingMode(TreekeepingMode.normal); + PluginArboriculture.treeInterface.registerTreekeepingMode(TreekeepingMode.hard); + PluginArboriculture.treeInterface.registerTreekeepingMode(TreekeepingMode.hardcore); + PluginArboriculture.treeInterface.registerTreekeepingMode(TreekeepingMode.insane); + // Commands - PluginCore.rootCommand.addChildCommand(new CommandTrees()); + PluginCore.rootCommand.addChildCommand(new CommandTree()); } @Override @@ -313,12 +318,6 @@ public class PluginArboriculture extends ForestryPlugin { registerTemplates(); registerErsatzGenomes(); - PluginArboriculture.treeInterface.registerTreekeepingMode(TreekeepingMode.easy); - PluginArboriculture.treeInterface.registerTreekeepingMode(TreekeepingMode.normal); - PluginArboriculture.treeInterface.registerTreekeepingMode(TreekeepingMode.hard); - PluginArboriculture.treeInterface.registerTreekeepingMode(TreekeepingMode.hardcore); - PluginArboriculture.treeInterface.registerTreekeepingMode(TreekeepingMode.insane); - MinecraftForge.EVENT_BUS.register(new EventHandlerArboriculture()); VillagerRegistry.instance().registerVillagerId(Defaults.ID_VILLAGER_LUMBERJACK); @@ -1102,11 +1101,6 @@ public class PluginArboriculture extends ForestryPlugin { return new GuiHandlerArboriculture(); } - @Override - public ICommand[] getConsoleCommands() { - return new ICommand[]{new CommandTreekeepingMode()}; - } - @Override public IFuelHandler getFuelHandler() { return new IFuelHandler() { From d8beaa92b94776d2b476c20fb2547e7cb5ebf692 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 14 Dec 2014 13:54:47 -0800 Subject: [PATCH 06/13] Fix #367 Fix fabricator crash --- .../java/forestry/factory/gadgets/MachineFabricator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index 8e10ad22e..6bf4f9f12 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -412,14 +412,13 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial public boolean hasWork() { ItemStack itemToMelt = inventory.getStackInSlot(SLOT_METAL); Smelting smelting = RecipeManager.findMatchingSmelting(itemToMelt); - FluidStack liquid = smelting.getProduct(); - if (moltenTank.fill(liquid, false) > 0) + if (smelting != null && moltenTank.fill(smelting.getProduct(), false) > 0) return true; ItemStack plan = inventory.getStackInSlot(SLOT_PLAN); ItemStack[] resources = inventory.getStacks(SLOT_CRAFTING_1, SLOT_CRAFTING_COUNT); - return RecipeManager.findMatchingRecipe(plan, liquid, resources) != null; + return RecipeManager.findMatchingRecipe(plan, moltenTank.getFluid(), resources) != null; } public int getHeatScaled(int i) { From 3d4ba157519ab0b93c189b1340b16e54fce8c421 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 14 Dec 2014 14:46:25 -0800 Subject: [PATCH 07/13] Minor Cleanup bee and tree commands --- .../apiculture/commands/BeeModeHelper.java | 2 +- .../commands/BeeStatsSaveHelper.java | 5 ----- .../apiculture/commands/CommandBee.java | 2 +- .../arboriculture/commands/CommandTree.java | 2 +- .../commands/TreeModeHelper.java | 2 +- .../commands/TreeStatsSaveHelper.java | 5 ----- .../core/commands/CommandSaveStats.java | 21 ++++++++++++------- .../core/commands/ICommandModeHelper.java | 4 +--- .../core/commands/IStatsSaveHelper.java | 2 -- 9 files changed, 18 insertions(+), 27 deletions(-) diff --git a/src/main/java/forestry/apiculture/commands/BeeModeHelper.java b/src/main/java/forestry/apiculture/commands/BeeModeHelper.java index 396ed7229..5352e23c5 100644 --- a/src/main/java/forestry/apiculture/commands/BeeModeHelper.java +++ b/src/main/java/forestry/apiculture/commands/BeeModeHelper.java @@ -51,7 +51,7 @@ public class BeeModeHelper implements ICommandModeHelper { } @Override - public ArrayList getDescription(String modeName) { + public Iterable getDescription(String modeName) { IBeekeepingMode mode = PluginApiculture.beeInterface.getBeekeepingMode(modeName); return mode.getDescription(); } diff --git a/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java b/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java index 6e69bd27f..ed2e020b2 100644 --- a/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java +++ b/src/main/java/forestry/apiculture/commands/BeeStatsSaveHelper.java @@ -51,11 +51,6 @@ public class BeeStatsSaveHelper implements IStatsSaveHelper { statistics.add(""); } - @Override - public String getModeName(World world) { - return PluginApiculture.beeInterface.getBeekeepingMode(world).getName(); - } - @Override public Collection getSpecies() { Collection species = new ArrayList(); diff --git a/src/main/java/forestry/apiculture/commands/CommandBee.java b/src/main/java/forestry/apiculture/commands/CommandBee.java index baf36df83..9cf050973 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBee.java +++ b/src/main/java/forestry/apiculture/commands/CommandBee.java @@ -26,7 +26,7 @@ public class CommandBee extends SubCommand { ICommandModeHelper modeHelper = new BeeModeHelper(); addChildCommand(new CommandMode(modeHelper)); - addChildCommand(new CommandSaveStats(saveHelper)); + addChildCommand(new CommandSaveStats(saveHelper, modeHelper)); addChildCommand(new CommandBeeGive()); } } diff --git a/src/main/java/forestry/arboriculture/commands/CommandTree.java b/src/main/java/forestry/arboriculture/commands/CommandTree.java index 88c86d8b3..f15d86448 100644 --- a/src/main/java/forestry/arboriculture/commands/CommandTree.java +++ b/src/main/java/forestry/arboriculture/commands/CommandTree.java @@ -27,7 +27,7 @@ public class CommandTree extends SubCommand { addChildCommand(new CommandTreeSpawn("spawnTree", new TreeSpawner())); addChildCommand(new CommandTreeSpawn("spawnForest", new ForestSpawner())); addChildCommand(new CommandMode(modeHelper)); - addChildCommand(new CommandSaveStats(saveHelper)); + addChildCommand(new CommandSaveStats(saveHelper, modeHelper)); } } diff --git a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java index c0a13ee1f..61c4b5fc1 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeModeHelper.java @@ -51,7 +51,7 @@ public class TreeModeHelper implements ICommandModeHelper { } @Override - public ArrayList getDescription(String modeName) { + public Iterable getDescription(String modeName) { ITreekeepingMode mode = PluginArboriculture.treeInterface.getTreekeepingMode(modeName); return mode.getDescription(); } diff --git a/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java b/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java index 6a1b2e568..8eae52876 100644 --- a/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java +++ b/src/main/java/forestry/arboriculture/commands/TreeStatsSaveHelper.java @@ -36,11 +36,6 @@ public class TreeStatsSaveHelper implements IStatsSaveHelper { public void addExtraInfo(Collection statistics, IBreedingTracker breedingTracker) { } - @Override - public String getModeName(World world) { - return PluginArboriculture.treeInterface.getTreekeepingMode(world).getName(); - } - @Override public Collection getSpecies() { Collection species = new ArrayList(); diff --git a/src/main/java/forestry/core/commands/CommandSaveStats.java b/src/main/java/forestry/core/commands/CommandSaveStats.java index 18f3ea606..658d15086 100644 --- a/src/main/java/forestry/core/commands/CommandSaveStats.java +++ b/src/main/java/forestry/core/commands/CommandSaveStats.java @@ -37,17 +37,22 @@ import forestry.core.utils.StringUtil; public final class CommandSaveStats extends SubCommand { - private final String discoveredSymbol; - private final String blacklistedSymbol; - private final String notCountedSymbol; - private final IStatsSaveHelper saveHelper; - - public CommandSaveStats(IStatsSaveHelper saveHelper) { - super("save"); + private static final String discoveredSymbol; + private static final String blacklistedSymbol; + private static final String notCountedSymbol; + static { discoveredSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.discovered.symbol"); blacklistedSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.blacklisted.symbol"); notCountedSymbol = StatCollector.translateToLocal("for.chat.command.forestry.stats.save.key.notCounted.symbol"); + } + + private final IStatsSaveHelper saveHelper; + private final ICommandModeHelper modeHelper; + + public CommandSaveStats(IStatsSaveHelper saveHelper, ICommandModeHelper modeHelper) { + super("save"); this.saveHelper = saveHelper; + this.modeHelper = modeHelper; } @Override @@ -76,7 +81,7 @@ public final class CommandSaveStats extends SubCommand { String date = DateFormat.getInstance().format(new Date()); statistics.add(StatCollector.translateToLocalFormatted(saveHelper.getUnlocalizedSaveStatsString(), player.getDisplayName(), date)); statistics.add(""); - statistics.add(StatCollector.translateToLocalFormatted("for.chat.command.forestry.stats.save.mode", saveHelper.getModeName(world))); + statistics.add(StatCollector.translateToLocalFormatted("for.chat.command.forestry.stats.save.mode", modeHelper.getModeName(world))); statistics.add(""); IBreedingTracker tracker = saveHelper.getBreedingTracker(world, player.getGameProfile()); diff --git a/src/main/java/forestry/core/commands/ICommandModeHelper.java b/src/main/java/forestry/core/commands/ICommandModeHelper.java index 3e57fa387..f5670c7d2 100644 --- a/src/main/java/forestry/core/commands/ICommandModeHelper.java +++ b/src/main/java/forestry/core/commands/ICommandModeHelper.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.commands; -import java.util.ArrayList; - import net.minecraft.world.World; public interface ICommandModeHelper { @@ -22,5 +20,5 @@ public interface ICommandModeHelper { String getModeName(World world); void setMode(World world, String modeName); - ArrayList getDescription(String modeName); + Iterable getDescription(String modeName); } diff --git a/src/main/java/forestry/core/commands/IStatsSaveHelper.java b/src/main/java/forestry/core/commands/IStatsSaveHelper.java index 3cc6092fc..51ab4d130 100644 --- a/src/main/java/forestry/core/commands/IStatsSaveHelper.java +++ b/src/main/java/forestry/core/commands/IStatsSaveHelper.java @@ -25,8 +25,6 @@ public interface IStatsSaveHelper { void addExtraInfo(Collection statistics, IBreedingTracker breedingTracker); - String getModeName(World world); - Collection getSpecies(); String getFileSuffix(); From 344e842764d03b520cbd42811bb77899de422e76 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 14 Dec 2014 18:07:57 -0800 Subject: [PATCH 08/13] Fix some mail glitches. Check valid addresses for writing letters --- api | 2 +- .../core/proxy/ClientProxyNetwork.java | 6 ++++- src/main/java/forestry/mail/MailAddress.java | 23 ++++++++++--------- src/main/java/forestry/mail/PostRegistry.java | 16 +++++++++++++ .../forestry/mail/gadgets/MachineTrader.java | 1 - .../forestry/mail/gui/ContainerLetter.java | 21 ++++++++++++----- .../forestry/mail/gui/ContainerTradeName.java | 4 ++-- .../java/forestry/mail/gui/GuiLetter.java | 5 +++- 8 files changed, 55 insertions(+), 23 deletions(-) diff --git a/api b/api index d6d724bbd..c2f49cd4d 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit d6d724bbd787f432e08a38304ba6bac3cf5bf303 +Subproject commit c2f49cd4d292a7023d2310d81c24c54269b15d14 diff --git a/src/main/java/forestry/core/proxy/ClientProxyNetwork.java b/src/main/java/forestry/core/proxy/ClientProxyNetwork.java index b8c649194..b55ad8e65 100755 --- a/src/main/java/forestry/core/proxy/ClientProxyNetwork.java +++ b/src/main/java/forestry/core/proxy/ClientProxyNetwork.java @@ -10,12 +10,16 @@ ******************************************************************************/ package forestry.core.proxy; +import net.minecraft.client.network.NetHandlerPlayClient; + import forestry.core.network.ForestryPacket; public class ClientProxyNetwork extends ProxyNetwork { @Override public void sendToServer(ForestryPacket packet) { - Proxies.common.getClientInstance().getNetHandler().addToSendQueue(packet.getPacket()); + NetHandlerPlayClient netHandler = Proxies.common.getClientInstance().getNetHandler(); + if (netHandler != null) + netHandler.addToSendQueue(packet.getPacket()); } } diff --git a/src/main/java/forestry/mail/MailAddress.java b/src/main/java/forestry/mail/MailAddress.java index d5ea3a8fd..1f2e65e87 100644 --- a/src/main/java/forestry/mail/MailAddress.java +++ b/src/main/java/forestry/mail/MailAddress.java @@ -10,23 +10,24 @@ ******************************************************************************/ package forestry.mail; -import com.mojang.authlib.GameProfile; -import forestry.api.core.INBTTagable; -import forestry.api.mail.EnumAddressee; -import forestry.api.mail.IMailAddress; -import forestry.core.network.EntityNetData; -import forestry.core.utils.PlayerUtil; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; - import java.util.Locale; import java.util.UUID; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; + +import com.mojang.authlib.GameProfile; + +import forestry.api.core.INBTTagable; +import forestry.api.mail.EnumAddressee; +import forestry.api.mail.IMailAddress; +import forestry.core.network.PacketPayload; +import forestry.core.utils.PlayerUtil; + public class MailAddress implements INBTTagable, IMailAddress { private static final GameProfile invalidGameProfile = new GameProfile(new UUID(0, 0), ""); - @EntityNetData + private EnumAddressee type; - @EntityNetData private GameProfile gameProfile; // gameProfile is a fake GameProfile for traders, and real for players public MailAddress() { diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index 507f78daf..6199ce05d 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -16,6 +16,7 @@ import java.util.Map; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -163,11 +164,26 @@ public class PostRegistry implements IPostRegistry { return new MailAddress(gameProfile); } + public IMailAddress getValidMailAddress(World world, GameProfile gameProfile) { + IMailAddress address = new MailAddress(gameProfile);; + if (getPOBox(world, address) != null) + return address; + return null; + } + @Override public IMailAddress getMailAddress(String traderName) { return new MailAddress(traderName); } + @Override + public IMailAddress getValidMailAddress(World world, String traderName) { + IMailAddress address = new MailAddress(traderName); + if (getTradeStation(world, address) != null) + return address; + return null; + } + /* CARRIER */ private final HashMap carriers = new HashMap(); diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 224a2d780..fa0790c47 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -41,7 +41,6 @@ import java.util.LinkedList; public class MachineTrader extends TileBase implements ISidedInventory { - @EntityNetData private MailAddress address; public MachineTrader() { diff --git a/src/main/java/forestry/mail/gui/ContainerLetter.java b/src/main/java/forestry/mail/gui/ContainerLetter.java index 679ce4f37..16252c599 100755 --- a/src/main/java/forestry/mail/gui/ContainerLetter.java +++ b/src/main/java/forestry/mail/gui/ContainerLetter.java @@ -156,14 +156,14 @@ public class ContainerLetter extends ContainerItemInventory { String typeName = packet.payload.stringPayload[1]; EnumAddressee type = EnumAddressee.fromString(typeName); - IMailAddress recipient; + IMailAddress recipient = null; if (type == EnumAddressee.PLAYER) { GameProfile gameProfile = MinecraftServer.getServer().func_152358_ax().func_152655_a(recipientName); if (gameProfile == null) gameProfile = new GameProfile(new UUID(0, 0), recipientName); - recipient = PostManager.postRegistry.getMailAddress(gameProfile); + recipient = PostManager.postRegistry.getValidMailAddress(player.worldObj, gameProfile); } else if (type == EnumAddressee.TRADER) { - recipient = PostManager.postRegistry.getMailAddress(recipientName); + recipient = PostManager.postRegistry.getValidMailAddress(player.worldObj, recipientName); } else { return; } @@ -171,7 +171,8 @@ public class ContainerLetter extends ContainerItemInventory { getLetter().setRecipient(recipient); // Update the trading info - updateTradeInfo(player.worldObj, recipient); + if (recipient == null || recipient.isTrader()) + updateTradeInfo(player.worldObj, recipient); // Update info on client Proxies.net.sendToPlayer(new PacketLetterInfo(PacketIds.LETTER_INFO, type, tradeInfo, recipient), player); @@ -210,12 +211,16 @@ public class ContainerLetter extends ContainerItemInventory { if (!Proxies.common.isSimulating(world)) return; - if (address.isPlayer()) + if (address == null) { + setTradeInfo(null); return; + } ITradeStation station = PostManager.postRegistry.getTradeStation(world, address); - if (station == null) + if (station == null) { + setTradeInfo(null); return; + } setTradeInfo(station.getTradeInfo()); } @@ -235,5 +240,9 @@ public class ContainerLetter extends ContainerItemInventory { private void setTradeInfo(TradeStationInfo info) { this.tradeInfo = info; + if (tradeInfo == null) + getLetter().setRecipient(null); + else + getLetter().setRecipient(tradeInfo.address); } } diff --git a/src/main/java/forestry/mail/gui/ContainerTradeName.java b/src/main/java/forestry/mail/gui/ContainerTradeName.java index b97913f2e..8dd4a5e57 100755 --- a/src/main/java/forestry/mail/gui/ContainerTradeName.java +++ b/src/main/java/forestry/mail/gui/ContainerTradeName.java @@ -51,13 +51,13 @@ public class ContainerTradeName extends ContainerForestry { PacketUpdate packet = new PacketUpdate(PacketIds.TRADING_ADDRESS_SET, payload); Proxies.net.sendToServer(packet); - IMailAddress address = PostManager.postRegistry.getMailAddress(addressName); + IMailAddress address = PostManager.postRegistry.getValidMailAddress(machine.getWorld(), addressName); machine.setAddress(address); } public void handleSetAddress(PacketUpdate packet) { String addressName = packet.payload.stringPayload[0]; - IMailAddress address = PostManager.postRegistry.getMailAddress(addressName); + IMailAddress address = PostManager.postRegistry.getValidMailAddress(machine.getWorld(), addressName); machine.setAddress(address); } diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index 25fd670d9..f5af7a737 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -154,6 +154,9 @@ public class GuiLetter extends GuiForestry { if(!isProcessedLetter && !checkedSessionVars) { checkedSessionVars = true; setFromSessionVars(); + String recipient = this.address.getText(); + EnumAddressee recipientType = container.getCarrierType(); + setRecipient(recipient, recipientType); } // Check for focus changes @@ -247,7 +250,7 @@ public class GuiLetter extends GuiForestry { address.setText(recipient); EnumAddressee type = EnumAddressee.fromString(typeName); - setRecipient(recipient, type); + container.setCarrierType(type); } SessionVars.clearStringVar("mail.letter.recipient"); From 84da3cc9393c2b2026afde0117468b53f4e94361 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 14 Dec 2014 18:28:38 -0800 Subject: [PATCH 09/13] Remove ClassMap and EntityNetData --- src/main/java/forestry/core/gadgets/Mill.java | 23 +- .../forestry/core/gadgets/TileAnalyzer.java | 12 +- .../java/forestry/core/gadgets/TileBase.java | 33 +-- .../forestry/core/gadgets/TilePowered.java | 51 +--- .../java/forestry/core/network/ClassMap.java | 232 ------------------ .../forestry/core/network/EntityNetData.java | 23 -- .../energy/gadgets/MachineGenerator.java | 12 +- .../factory/gadgets/MachineBottler.java | 51 ++-- .../factory/gadgets/MachineCarpenter.java | 3 - .../factory/gadgets/MachineFermenter.java | 4 - .../factory/gadgets/MachineMoistener.java | 34 +-- .../factory/gadgets/MachineSqueezer.java | 44 ++-- .../factory/gadgets/MachineStill.java | 3 - .../forestry/mail/gadgets/MachineTrader.java | 29 ++- 14 files changed, 118 insertions(+), 436 deletions(-) delete mode 100755 src/main/java/forestry/core/network/ClassMap.java delete mode 100755 src/main/java/forestry/core/network/EntityNetData.java diff --git a/src/main/java/forestry/core/gadgets/Mill.java b/src/main/java/forestry/core/gadgets/Mill.java index 67f1291a1..a6f15aa7f 100755 --- a/src/main/java/forestry/core/gadgets/Mill.java +++ b/src/main/java/forestry/core/gadgets/Mill.java @@ -10,15 +10,12 @@ ******************************************************************************/ package forestry.core.gadgets; -import forestry.core.network.EntityNetData; +import forestry.core.network.PacketPayload; public abstract class Mill extends TileBase { - @EntityNetData public int charge = 0; - @EntityNetData public float speed; - @EntityNetData public int stage = 0; public float progress; @@ -36,6 +33,24 @@ public abstract class Mill extends TileBase { update(true); } + @Override + public PacketPayload getPacketPayload() { + PacketPayload payload = new PacketPayload(2, 1, 0); + payload.intPayload[0] = charge; + payload.intPayload[1] = stage; + + payload.floatPayload[0] = speed; + return payload; + } + + @Override + public void fromPacketPayload(PacketPayload payload) { + charge = payload.intPayload[0]; + stage = payload.intPayload[1]; + + speed = payload.floatPayload[0]; + } + private void update(boolean isSimulating) { // Stop gracefully if discharged. diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index 22a1c007b..daa496611 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -15,6 +15,7 @@ import java.util.Stack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -25,25 +26,23 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import forestry.api.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; -import forestry.api.core.EnumErrorCode; -import forestry.core.fluids.TankManager; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.fluids.FluidHelper; import forestry.core.fluids.Fluids; -import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.network.EntityNetData; -import forestry.core.network.GuiId; +import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.inventory.InvTools; import forestry.core.inventory.wrappers.IInvSlot; import forestry.core.inventory.wrappers.InventoryIterator; import forestry.core.inventory.wrappers.InventoryMapper; +import forestry.core.network.GuiId; import forestry.core.utils.InventoryAdapter; -import net.minecraft.inventory.IInventory; public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankContainer { @@ -61,7 +60,6 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui private int analyzeTime; - @EntityNetData public final FilteredTank resourceTank; private final TankManager tankManager; diff --git a/src/main/java/forestry/core/gadgets/TileBase.java b/src/main/java/forestry/core/gadgets/TileBase.java index a88799bae..7ae581a4c 100755 --- a/src/main/java/forestry/core/gadgets/TileBase.java +++ b/src/main/java/forestry/core/gadgets/TileBase.java @@ -10,15 +10,14 @@ ******************************************************************************/ package forestry.core.gadgets; +import net.minecraft.entity.player.EntityPlayer; + import forestry.core.interfaces.IHintSource; -import forestry.core.network.ClassMap; -import forestry.core.network.IndexInPayload; import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumAccess; import forestry.core.utils.PlayerUtil; import forestry.core.utils.Utils; -import net.minecraft.entity.player.EntityPlayer; public abstract class TileBase extends TileForestry implements IHintSource { @@ -52,37 +51,11 @@ public abstract class TileBase extends TileForestry implements IHintSource { /* NETWORK */ @Override public PacketPayload getPacketPayload() { - if (!ClassMap.classMappers.containsKey(this.getClass())) - ClassMap.classMappers.put(this.getClass(), new ClassMap(this.getClass())); - - ClassMap classmap = ClassMap.classMappers.get(this.getClass()); - PacketPayload payload = new PacketPayload(classmap.intSize, classmap.floatSize, classmap.stringSize); - - try { - classmap.setData(this, payload.intPayload, payload.floatPayload, payload.stringPayload, new IndexInPayload(0, 0, 0)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - - return payload; + return null; } @Override public void fromPacketPayload(PacketPayload payload) { - - if (payload.isEmpty()) - return; - - if (!ClassMap.classMappers.containsKey(this.getClass())) - ClassMap.classMappers.put(this.getClass(), new ClassMap(this.getClass())); - - ClassMap classmap = ClassMap.classMappers.get(this.getClass()); - - try { - classmap.fromData(this, payload.intPayload, payload.floatPayload, payload.stringPayload, new IndexInPayload(0, 0, 0)); - } catch (Exception ex) { - ex.printStackTrace(); - } } /* INTERACTION */ diff --git a/src/main/java/forestry/core/gadgets/TilePowered.java b/src/main/java/forestry/core/gadgets/TilePowered.java index 895539cb1..b62b23fb6 100644 --- a/src/main/java/forestry/core/gadgets/TilePowered.java +++ b/src/main/java/forestry/core/gadgets/TilePowered.java @@ -10,62 +10,25 @@ ******************************************************************************/ package forestry.core.gadgets; -import buildcraft.api.tiles.IHasWork; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.common.util.ForgeDirection; + import cpw.mods.fml.common.Optional; -import forestry.core.fluids.tanks.StandardTank; + import forestry.core.interfaces.IPowerHandler; import forestry.core.interfaces.IRenderableMachine; -import forestry.core.network.ClassMap; -import forestry.core.network.IndexInPayload; -import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; import forestry.energy.EnergyManager; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; + +import buildcraft.api.tiles.IHasWork; @Optional.Interface(iface = "buildcraft.api.tiles.IHasWork", modid = "BuildCraftAPI|tiles") public abstract class TilePowered extends TileBase implements IRenderableMachine, IPowerHandler, IHasWork { public static final int WORK_CYCLES = 4; - @Override - public PacketPayload getPacketPayload() { - if (!ClassMap.classMappers.containsKey(this.getClass())) - ClassMap.classMappers.put(this.getClass(), new ClassMap(this.getClass())); - - ClassMap classmap = ClassMap.classMappers.get(this.getClass()); - PacketPayload payload = new PacketPayload(classmap.intSize, classmap.floatSize, classmap.stringSize); - - try { - classmap.setData(this, payload.intPayload, payload.floatPayload, payload.stringPayload, new IndexInPayload(0, 0, 0)); - } catch (Exception ex) { - ex.printStackTrace(); - } - - return payload; - } - - @Override - public void fromPacketPayload(PacketPayload payload) { - - if (payload.isEmpty()) - return; - - if (!ClassMap.classMappers.containsKey(this.getClass())) - ClassMap.classMappers.put(this.getClass(), new ClassMap(this.getClass())); - - ClassMap classmap = ClassMap.classMappers.get(this.getClass()); - - try { - classmap.fromData(this, payload.intPayload, payload.floatPayload, payload.stringPayload, new IndexInPayload(0, 0, 0)); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - protected final EnergyManager energyManager; public TilePowered(int maxTransfer, int energyPerWork, int capacity) { diff --git a/src/main/java/forestry/core/network/ClassMap.java b/src/main/java/forestry/core/network/ClassMap.java deleted file mode 100755 index 02fb6b930..000000000 --- a/src/main/java/forestry/core/network/ClassMap.java +++ /dev/null @@ -1,232 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.network; - -import java.lang.reflect.Field; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.UUID; - -import com.mojang.authlib.GameProfile; - -import forestry.core.gadgets.TileForestry; - -public class ClassMap { - - @SuppressWarnings("rawtypes") - public static final HashMap classMappers = new HashMap(); - - private final LinkedList intMember = new LinkedList(); - private final LinkedList floatMember = new LinkedList(); - private final LinkedList booleanMember = new LinkedList(); - private final LinkedList stringMember = new LinkedList(); - private final LinkedList enumMember = new LinkedList(); - private final LinkedList gameProfileMember = new LinkedList(); - private final LinkedList objectMember = new LinkedList(); - - public int intSize; - public int floatSize; - public int stringSize; - - private Field field; - - /** - * Writes the actual data to the packet payload - * - * @param obj - * {@link TileForestry} to write to packet - * @param intPayload - * @param floatPayload - * @param stringPayload - * @param index - */ - @SuppressWarnings("rawtypes") - public void setData(Object obj, int[] intPayload, float[] floatPayload, String[] stringPayload, IndexInPayload index) throws IllegalAccessException { - for (Field member : intMember) { - intPayload[index.intIndex] = member.getInt(obj); - index.intIndex++; - } - for (Field member : floatMember) { - floatPayload[index.floatIndex] = member.getFloat(obj); - index.floatIndex++; - } - for (Field member : booleanMember) { - if (member.getBoolean(obj)) - floatPayload[index.intIndex] = 1; - else - floatPayload[index.intIndex] = 0; - index.intIndex++; - } - for (Field member : stringMember) { - stringPayload[index.stringIndex] = (String) member.get(obj); - index.stringIndex++; - } - for (Field member : enumMember) { - intPayload[index.intIndex] = ((Enum) member.get(obj)).ordinal(); - index.intIndex++; - } - for (Field member : gameProfileMember) { - GameProfile profile = (GameProfile) member.get(obj); - UUID profileID = profile.getId(); - if (profileID == null) - profileID = new UUID(0,0); - intPayload[index.intIndex] = (int) (profileID.getMostSignificantBits() >>> 32); - intPayload[index.intIndex + 1] = (int) profileID.getMostSignificantBits(); - intPayload[index.intIndex + 2] = (int) (profileID.getLeastSignificantBits() >>> 32); - intPayload[index.intIndex + 3] = (int) profileID.getLeastSignificantBits(); - index.intIndex += 4; - stringPayload[index.stringIndex] = profile.getName(); - index.stringIndex++; - } - - // Handle subobjects - for (ClassMap submap : objectMember) { - Object source = submap.field.get(obj); - - if (source == null) { - intPayload[index.intIndex] = 0; - index.intIndex++; - - index.intIndex += submap.intSize; - index.floatIndex += submap.floatSize; - index.stringIndex += submap.stringSize; - } else { - intPayload[index.intIndex] = 1; - index.intIndex++; - submap.setData(source, intPayload, floatPayload, stringPayload, index); - } - } - } - - /** - * Updates the given object with the data from the passed payload arrays - * - * @param obj - * @param intPayload - * @param floatPayload - * @param stringPayload - * @param index - * @throws IllegalAccessException - */ - @SuppressWarnings("rawtypes") - public void fromData(Object obj, int[] intPayload, float[] floatPayload, String[] stringPayload, IndexInPayload index) throws IllegalAccessException { - - for (Field member : intMember) { - member.setInt(obj, intPayload[index.intIndex]); - index.intIndex++; - } - - for (Field member : booleanMember) { - member.setBoolean(obj, intPayload[index.intIndex] == 1); - index.intIndex++; - } - - for (Field member : enumMember) { - member.set(obj, ((Class) member.getGenericType()).getEnumConstants()[intPayload[index.intIndex]]); - index.intIndex++; - } - - for (Field member : floatMember) { - member.setFloat(obj, floatPayload[index.floatIndex]); - index.floatIndex++; - } - for (Field member : stringMember) { - member.set(obj, stringPayload[index.stringIndex]); - index.stringIndex++; - } - for (Field member : gameProfileMember) { - GameProfile profile = new GameProfile(new UUID((long) intPayload[index.intIndex] << 32 | intPayload[index.intIndex + 1], - (long) intPayload[index.intIndex + 2] << 32 | intPayload[index.intIndex + 3]), - stringPayload[index.stringIndex]); - index.intIndex += 4; - index.stringIndex++; - - member.set(obj, profile); - } - - for (ClassMap map : objectMember) { - boolean isNull = intPayload[index.intIndex] == 0; - index.intIndex++; - - if (isNull) { - index.intIndex += map.intSize; - index.floatIndex += map.floatSize; - index.stringIndex += map.stringSize; - } else { - map.field.get(obj); - map.fromData(map.field.get(obj), intPayload, floatPayload, stringPayload, index); - } - } - } - - @SuppressWarnings("rawtypes") - public ClassMap(final Class targetClass) { - Field[] fields = targetClass.getDeclaredFields(); - - try { - for (Field field : fields) { - // We only handle fields marked with EntityNetData - if (!isNetworkedMember(field)) - continue; - - field.setAccessible(true); - Type type = field.getGenericType(); - - if (type instanceof Class && !((Class) type).isArray()) { - Class memberClass = (Class) type; - if (memberClass.equals(int.class)) { - intSize++; - intMember.add(field); - } else if (memberClass.equals(float.class)) { - floatSize++; - floatMember.add(field); - } else if (memberClass.equals(boolean.class)) { - intSize++; - booleanMember.add(field); - } else if (memberClass.equals(String.class)) { - stringSize++; - stringMember.add(field); - } else if (Enum.class.isAssignableFrom(memberClass)) { - intSize++; - enumMember.add(field); - } else if (GameProfile.class.isAssignableFrom(memberClass)) { - intSize += 4; - stringSize++; - gameProfileMember.add(field); - } else { - // If we are none of the above we assume to be another - // mapable object - // Might not be true and fail! - ClassMap mapper = new ClassMap(memberClass); - mapper.field = field; - - objectMember.add(mapper); - intSize++; - - intSize += mapper.intSize; - floatSize += mapper.floatSize; - stringSize += mapper.stringSize; - } - } else if (type instanceof Class && ((Class) type).isArray()) - // We don't handle arrays currently. Throw exception - throw new RuntimeException("Tried to map class " + targetClass.toString() + " but it requested mapping of an array. Not handled!"); - } - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } - } - - private boolean isNetworkedMember(Field member) { - return member.getAnnotation(EntityNetData.class) != null; - } - -} diff --git a/src/main/java/forestry/core/network/EntityNetData.java b/src/main/java/forestry/core/network/EntityNetData.java deleted file mode 100755 index 311bdc863..000000000 --- a/src/main/java/forestry/core/network/EntityNetData.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.network; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -/** - * Simple annotation to mark a field for synchronization in SMP. - */ -@Retention(RetentionPolicy.RUNTIME) -public @interface EntityNetData { - // Needs to be set for arrays - int staticSize() default -1; -} diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index c34933a55..487c65598 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -19,29 +19,28 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; -import ic2.api.energy.prefab.BasicSource; - +import forestry.api.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; import forestry.api.fuels.GeneratorFuel; -import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.FluidHelper; -import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.interfaces.IRenderableMachine; -import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.Utils; import forestry.plugins.PluginIC2; -import net.minecraftforge.fluids.FluidTankInfo; + +import ic2.api.energy.prefab.BasicSource; public class MachineGenerator extends TileBase implements ISpecialInventory, ILiquidTankContainer, IRenderableMachine { @@ -49,7 +48,6 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi public static final short SLOT_CAN = 0; public static final int maxEnergy = 30000; - @EntityNetData public final FilteredTank resourceTank; private final TankManager tankManager; private int tickCount = 0; diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index e9228a06e..1b64b721e 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -10,8 +10,31 @@ ******************************************************************************/ package forestry.factory.gadgets; -import buildcraft.api.statements.ITriggerExternal; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.Stack; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import cpw.mods.fml.common.Optional; + import forestry.api.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICraftingProvider; @@ -23,36 +46,13 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.InventoryAdapter; -import forestry.core.utils.LiquidHelper; -import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; import forestry.factory.triggers.FactoryTriggers; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; -import java.util.Stack; +import buildcraft.api.statements.ITriggerExternal; public class MachineBottler extends TilePowered implements ISidedInventory, ILiquidTankContainer { @@ -140,7 +140,6 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq } } - @EntityNetData public final StandardTank resourceTank; private final TankManager tankManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index cef212e38..e1f88dbf6 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -29,7 +29,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -46,7 +45,6 @@ import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; @@ -211,7 +209,6 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } /* MEMBER */ - @EntityNetData public final FilteredTank resourceTank; private final TankManager tankManager; private final TileInventoryAdapter craftingInventory; diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index d70e068a1..6f4061e27 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -27,7 +27,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -48,7 +47,6 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.InventoryAdapter; @@ -185,9 +183,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL return recipeList; } } - @EntityNetData public final FilteredTank resourceTank; - @EntityNetData public final FilteredTank productTank; private final TankManager tankManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 10d635ced..1e70d4b3f 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -10,6 +10,23 @@ ******************************************************************************/ package forestry.factory.gadgets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + import forestry.api.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; @@ -24,27 +41,11 @@ import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.interfaces.IRenderableMachine; -import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; public class MachineMoistener extends TileBase implements ISpecialInventory, ISidedInventory, ILiquidTankContainer, IRenderableMachine { @@ -119,7 +120,6 @@ public class MachineMoistener extends TileBase implements ISpecialInventory, ISi } } - @EntityNetData public final FilteredTank resourceTank; private final TankManager tankManager; private final InventoryAdapter inventory = new InventoryAdapter(12, "Items"); diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 62b618155..2760641a6 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -10,10 +10,30 @@ ******************************************************************************/ package forestry.factory.gadgets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Stack; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; + +import forestry.api.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.ISqueezerManager; -import forestry.api.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.FluidHelper; @@ -23,33 +43,12 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.InventoryAdapter; -import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Stack; public class MachineSqueezer extends TilePowered implements ISpecialInventory, ISidedInventory, ILiquidTankContainer { @@ -131,7 +130,6 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I /* MEMBER */ private final TankManager tankManager; - @EntityNetData public final FilteredTank productTank; private final InventoryAdapter inventory = new InventoryAdapter(12, "Items"); diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index 132f242fb..60f9d3ea8 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -40,7 +40,6 @@ import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; import forestry.core.utils.InventoryAdapter; @@ -118,9 +117,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid } /* MEMBER */ - @EntityNetData public final FilteredTank resourceTank; - @EntityNetData public final FilteredTank productTank; private final TankManager tankManager; diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index fa0790c47..afce32272 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -10,15 +10,27 @@ ******************************************************************************/ package forestry.mail.gadgets; -import buildcraft.api.statements.ITriggerExternal; +import java.util.Collection; +import java.util.LinkedList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + +import net.minecraftforge.common.util.ForgeDirection; + import cpw.mods.fml.common.Optional; + +import forestry.api.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; -import forestry.api.core.EnumErrorCode; import forestry.core.gadgets.TileBase; -import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumAccess; @@ -27,17 +39,8 @@ import forestry.core.utils.StackUtils; import forestry.mail.MailAddress; import forestry.mail.TradeStation; import forestry.plugins.PluginMail; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import java.util.Collection; -import java.util.LinkedList; +import buildcraft.api.statements.ITriggerExternal; public class MachineTrader extends TileBase implements ISidedInventory { From 364ed4cf53ae0711d6395dab69a832ecf57d5092 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 14 Dec 2014 18:35:14 -0800 Subject: [PATCH 10/13] Remove unused defaults --- .../java/forestry/core/config/Defaults.java | 44 ------------------- 1 file changed, 44 deletions(-) diff --git a/src/main/java/forestry/core/config/Defaults.java b/src/main/java/forestry/core/config/Defaults.java index 4cf2e08e5..97122bd75 100755 --- a/src/main/java/forestry/core/config/Defaults.java +++ b/src/main/java/forestry/core/config/Defaults.java @@ -29,7 +29,6 @@ public class Defaults { public static final int NET_MAX_UPDATE_DISTANCE = 50; - public static final String DEFAULT_POWER_FRAMEWORK = "forestry.energy.BioPowerFramework"; public static final int BUCKET_VOLUME = 1000; public static final int FLUID_PER_HONEY_DROP = 100; @@ -51,20 +50,12 @@ public class Defaults { public static final String TEXTURE_PATH_ITEMS = "textures/items"; public static final String TEXTURE_PATH_ENTITIES = "textures/entity"; - public static final String TEXTURE_BLOCKS = TEXTURE_PATH_BLOCKS + "/blocks.png"; - public static final String TEXTURE_ARBORICULTURE = TEXTURE_PATH_BLOCKS + "/arboriculture.png"; - public static final String TEXTURE_PODS = TEXTURE_PATH_BLOCKS + "/pods.png"; - public static final String TEXTURE_FARM = TEXTURE_PATH_BLOCKS + "/farm.png"; - public static final String TEXTURE_APIARIST_ARMOR_PRIMARY = TEXTURE_PATH_ITEMS + "/apiarist_armor_1.png"; public static final String TEXTURE_APIARIST_ARMOR_SECONDARY = TEXTURE_PATH_ITEMS + "/apiarist_armor_2.png"; public static final String TEXTURE_NATURALIST_ARMOR_PRIMARY = TEXTURE_PATH_ITEMS + "/naturalist_armor_1.png"; public static final String TEXTURE_SKIN_BEEKPEEPER = TEXTURE_PATH_ENTITIES + "/beekeeper.png"; public static final String TEXTURE_SKIN_LUMBERJACK = TEXTURE_PATH_ENTITIES + "/lumberjack.png"; - public static final String TEXTURE_ICONS_MINECRAFT = "/gui/items.png"; - public static final String TEXTURE_BLOCKS_MINECRAFT = "/terrain.png"; - // Villagers public static final int ID_VILLAGER_BEEKEEPER = 80; public static final int ID_VILLAGER_LUMBERJACK = 81; @@ -146,13 +137,6 @@ public class Defaults { public static final int FOOD_HONEY_HEAL = 2; public static final float FOOD_HONEY_SATURATION = 0.2f; - // IndustrialCraft 2 - public static final int ID_IC2_FUELCAN_DAMAGE = 6480; - - // BuildCraft - public static final int BUILDCRAFT_BLOCKID_ENGINE = 161; - public static final int BUILDCRAFT_BLOCKID_PIPE = 166; - public static final int APIARY_MIN_LEVEL_LIGHT = 11; public static final int APIARY_BREEDING_TIME = 100; @@ -219,32 +203,4 @@ public class Defaults { public static final int CARPENTER_CRATING_CYCLES = 5; public static final int CARPENTER_UNCRATING_CYCLES = 5; public static final int CARPENTER_CRATING_LIQUID_QUANTITY = 100; - - // SMP gui ids - public static final int ID_GUI_ARBORETUM = 90; - public static final int ID_GUI_BOTTLER = 91; - public static final int ID_GUI_ENGINE_BRONZE = 92; - public static final int ID_GUI_FARM = 93; - public static final int ID_GUI_FERMENTER = 94; - public static final int ID_GUI_FORESTER = 95; - public static final int ID_GUI_PLANTATION = 96; - public static final int ID_GUI_PUMPKIN_FARM = 97; - public static final int ID_GUI_PEAT_BOG = 98; - public static final int ID_GUI_STILL = 99; - public static final int ID_GUI_ENGINE_COPPER = 89; - public static final int ID_GUI_RAINTANK = 88; - public static final int ID_GUI_GENERATOR = 87; - public static final int ID_GUI_CARPENTER = 86; - public static final int ID_GUI_MOISTENER = 85; - public static final int ID_GUI_MUSHROOM_FARM = 84; - public static final int ID_GUI_APIARY = 83; - public static final int ID_GUI_CENTRIFUGE = 82; - public static final int ID_GUI_APIARIST_INVENTORY = 81; - public static final int ID_GUI_BACKPACK = 80; - public static final int ID_GUI_SQUEEZER = 79; - public static final int ID_GUI_NETHER_FARM = 78; - public static final int ID_GUI_BEEALYZER = 100; - public static final int ID_GUI_BACKPACK_T2 = 101; - public static final int ID_GUI_BIOME_FINDER = 102; - // ID 100 used by bucket filler. } From ccdcce47cc77eb24102234c55d6d52ec7df89d50 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Mon, 15 Dec 2014 07:45:10 -0800 Subject: [PATCH 11/13] Fixes #369 The Solding Iron and other Cicruit stuff should no longer crash if no layouts are defined. The fix kind of grew out of control because I had to add a new EnumErrorCode and didn't want to keep breaking the API every time I did that. So I needed to decouple the ErrorStates from EnumErrorCode. --- api | 2 +- lang | 2 +- .../forestry/apiculture/BeekeepingLogic.java | 7 +- .../apiculture/gadgets/TileAlvearyPlain.java | 7 +- .../apiculture/gadgets/TileBeehouse.java | 4 +- .../genetics/AlleleEffectThrottled.java | 12 +- .../forestry/apiculture/genetics/Bee.java | 2 +- .../apiculture/items/ItemBeealyzer.java | 2 +- .../apiculture/items/ItemBiomefinder.java | 2 +- .../trigger/TriggerMissingDrone.java | 2 +- .../trigger/TriggerMissingQueen.java | 2 +- .../arboriculture/gadgets/TileLeaves.java | 5 +- .../arboriculture/items/ItemTreealyzer.java | 2 +- .../java/forestry/core/EnumErrorCode.java | 105 ++++++++++++++++++ .../java/forestry/core/EventHandlerCore.java | 4 +- src/main/java/forestry/core/ForestryCore.java | 2 + .../core/circuits/CircuitBoardManager.java | 14 --- .../forestry/core/circuits/CircuitLayout.java | 4 +- .../core/circuits/CircuitRegistry.java | 29 +++-- .../core/circuits/ItemSolderingIron.java | 81 ++++++-------- .../forestry/core/gadgets/TileAnalyzer.java | 2 +- .../forestry/core/gadgets/TileForestry.java | 10 +- .../java/forestry/core/gui/ErrorLedger.java | 12 +- .../core/interfaces/IErrorSource.java | 4 +- .../core/network/PacketTileUpdate.java | 23 ++-- .../java/forestry/core/proxy/ProxyLog.java | 31 ++++++ .../forestry/core/utils/RevolvingList.java | 69 ++++++++++++ .../forestry/energy/gadgets/EngineBronze.java | 2 +- .../forestry/energy/gadgets/EngineCopper.java | 2 +- .../forestry/energy/gadgets/EngineTin.java | 2 +- .../energy/gadgets/MachineGenerator.java | 2 +- .../factory/gadgets/MachineBottler.java | 2 +- .../factory/gadgets/MachineCarpenter.java | 2 +- .../factory/gadgets/MachineCentrifuge.java | 2 +- .../factory/gadgets/MachineFabricator.java | 2 +- .../factory/gadgets/MachineFermenter.java | 2 +- .../factory/gadgets/MachineMoistener.java | 2 +- .../factory/gadgets/MachineRaintank.java | 2 +- .../factory/gadgets/MachineSqueezer.java | 2 +- .../factory/gadgets/MachineStill.java | 2 +- .../farming/gadgets/TileFarmPlain.java | 2 +- .../forestry/farming/gadgets/TileGearbox.java | 2 +- .../items/ItemFlutterlyzer.java | 2 +- .../forestry/mail/gadgets/MachineTrader.java | 2 +- .../java/forestry/mail/items/ItemLetter.java | 2 +- .../textures/items/errors/noCircuitLayout.png | Bin 0 -> 370 bytes 46 files changed, 336 insertions(+), 141 deletions(-) create mode 100644 src/main/java/forestry/core/EnumErrorCode.java delete mode 100755 src/main/java/forestry/core/circuits/CircuitBoardManager.java create mode 100644 src/main/java/forestry/core/utils/RevolvingList.java create mode 100644 src/main/resources/assets/forestry/textures/items/errors/noCircuitLayout.png diff --git a/api b/api index c2f49cd4d..89067121c 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit c2f49cd4d292a7023d2310d81c24c54269b15d14 +Subproject commit 89067121c057bda5c535bf7a46c0112e245e311b diff --git a/lang b/lang index 71f517c5a..ab16b1a2e 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 71f517c5a6d4bb564b3996822b84da91bff791f3 +Subproject commit ab16b1a2efc80aa48e70d81c8859fd83e143a98f diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index fa1c70e86..19ccf272f 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -23,10 +23,12 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IIndividual; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; +import forestry.api.core.IErrorState; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.proxy.Proxies; +import forestry.core.proxy.ProxyLog; import forestry.plugins.PluginApiculture; public class BeekeepingLogic implements IBeekeepingLogic { @@ -261,7 +263,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { try { boolean canWork = true; // Not while raining, at night or without light - EnumErrorCode state = queen.canWork(housing); + IErrorState state = queen.canWork(housing); if (state != EnumErrorCode.OK) { housing.setErrorState(state); canWork = false; @@ -270,6 +272,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { } return canWork; } catch (Error e) { + Proxies.log.logErrorAPI("Forestry", e, IBee.class); return queenCanWorkDeprecated(); } } diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index 13c3ff600..4b1dd4b44 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -18,10 +18,11 @@ import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.core.BiomeHelper; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; +import forestry.api.core.IErrorState; import forestry.api.core.ISpecialInventory; import forestry.api.core.ITileStructure; import forestry.api.genetics.IIndividual; @@ -424,7 +425,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IS @Override public int getErrorOrdinal() { - return getErrorState().ordinal(); + return getErrorState().getID(); } @Override @@ -803,7 +804,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IS /* IERRORSOURCE */ @Override - public EnumErrorCode getErrorState() { + public IErrorState getErrorState() { if (hasMaster()) { ITileStructure tile = this.getCentralTE(); if (tile != null) diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java index d343f4a03..337d16656 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java @@ -15,7 +15,7 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeekeepingLogic; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; @@ -351,7 +351,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised { @Override public int getErrorOrdinal() { - return getErrorState().ordinal(); + return getErrorState().getID(); } @Override diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java index dfd554053..4fe7543a8 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java @@ -16,7 +16,7 @@ import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.genetics.Allele; import forestry.core.genetics.EffectData; import forestry.core.utils.Vect; @@ -55,14 +55,14 @@ public abstract class AlleleEffectThrottled extends Allele implements IAlleleBee public boolean isHalted(IEffectData storedData, IBeeHousing housing) { - if (requiresWorkingQueen && housing.getErrorOrdinal() != EnumErrorCode.OK.ordinal()) + if (requiresWorkingQueen && housing.getErrorState() != EnumErrorCode.OK) return true; - int throttle = storedData.getInteger(0); - throttle++; - storedData.setInteger(0, throttle); + int throt = storedData.getInteger(0); + throt++; + storedData.setInteger(0, throt); - if (throttle < getThrottle()) + if (throt < getThrottle()) return true; // Reset since we are done throttling. diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 9a774a9bd..ea52b7f6e 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -20,7 +20,7 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeMutation; import forestry.api.apiculture.IBeekeepingMode; import forestry.api.core.BiomeHelper; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; diff --git a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java index d5a8210d5..fc74aa51b 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java +++ b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java @@ -19,7 +19,7 @@ import net.minecraft.world.World; import forestry.api.apiculture.IBee; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; diff --git a/src/main/java/forestry/apiculture/items/ItemBiomefinder.java b/src/main/java/forestry/apiculture/items/ItemBiomefinder.java index a77af1765..a7c8b1909 100755 --- a/src/main/java/forestry/apiculture/items/ItemBiomefinder.java +++ b/src/main/java/forestry/apiculture/items/ItemBiomefinder.java @@ -30,7 +30,7 @@ import forestry.api.apiculture.IBee; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.apiculture.render.TextureBiomefinder; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; diff --git a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java index 7a8199113..5d3e99c2b 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingDrone.java @@ -12,7 +12,7 @@ package forestry.apiculture.trigger; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.triggers.Trigger; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java b/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java index 12f38c772..89c2005a4 100644 --- a/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java +++ b/src/main/java/forestry/apiculture/trigger/TriggerMissingQueen.java @@ -12,7 +12,7 @@ package forestry.apiculture.trigger; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.triggers.Trigger; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java index 21c07f8ce..0c474ea9b 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java @@ -17,9 +17,10 @@ import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ILeafTickHandler; import forestry.api.arboriculture.ITree; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorState; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IFruitBearer; @@ -442,7 +443,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru @Override public void setErrorState(int state) {} @Override - public void setErrorState(EnumErrorCode state) { + public void setErrorState(IErrorState state) { } @Override public int getErrorOrdinal() { return 0; } diff --git a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java index d9156069e..15a63b279 100755 --- a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java +++ b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java @@ -19,7 +19,7 @@ import forestry.core.utils.AlyzerInventory; import forestry.api.arboriculture.ITree; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; diff --git a/src/main/java/forestry/core/EnumErrorCode.java b/src/main/java/forestry/core/EnumErrorCode.java new file mode 100644 index 000000000..6fcaa0fa8 --- /dev/null +++ b/src/main/java/forestry/core/EnumErrorCode.java @@ -0,0 +1,105 @@ +/******************************************************************************* + * Copyright 2011-2014 SirSengir + * + * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. + ******************************************************************************/ +package forestry.core; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.ErrorStateRegistry; +import forestry.api.core.IErrorState; + +public enum EnumErrorCode implements IErrorState { + + UNKNOWN("unknown"), + OK("ok"), + INVALIDBIOME("invalidBiome"), + ISRAINING("isRaining"), + NOTRAINING("notRaining"), + NOFUEL("noFuel"), // Biogas & Peat-fired + NOHEAT("noHeat"), // Biogas engine + NODISPOSAL("noDisposal"), + NORESOURCE("noResource"), + NOTGLOOMY("notGloomy"), + NOTLUCID("notLucid"), + NOTDAY("notDay"), + NOTNIGHT("notNight"), + NOFLOWER("noFlower"), + NOQUEEN("noQueen"), + NODRONE("noDrone"), + NOSKY("noSky"), + NOSPACE("noSpace"), + NORECIPE("noRecipe"), + NOENERGYNET("noEnergyNet"), + NOTHINGANALYZE("noSpecimen"), + FORCEDCOOLDOWN("forcedCooldown"), + NOHONEY("noHoney"), + NOTPOSTPAID("notPostpaid", "noStamps"), + NORECIPIENT("noRecipient"), + NOTALPHANUMERIC("notAlphaNumeric"), + NOTUNIQUE("notUnique"), + NOSTAMPS("noStamps"), + NOCIRCUITBOARD("noCircuitBoard"), + NOCIRCUITLAYOUT("noCircuitLayout"), + WRONGSTACKSIZE("wrongStacksize"), + NOFERTILIZER("noFertilizer"), + NOFARMLAND("noFarmland"), + CIRCUITMISMATCH("circuitMismatch"), + NOLIQUID("noLiquid"), + NOPAPER("noPaper"), + NOSTAMPSNOPAPER("noStampsNoPaper", "noStamps"), + NOSUPPLIES("noSupplies", "noResource"), + NOTRADE("noTrade", "noResource"), + NOPOWER("noPower"); + + private String name; + private String iconName; + @SideOnly(Side.CLIENT) + private IIcon icon; + + private EnumErrorCode(String name) { + this(name, name); + } + + private EnumErrorCode(String name, String iconName) { + this.name = name; + this.iconName = iconName; + } + + @Override + public String getDescription() { + return "errors." + name + ".desc"; + } + + @Override + public String getHelp() { + return "errors." + name + ".help"; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister register) { + icon = register.registerIcon("forestry:errors/" + iconName); + } + + @SideOnly(Side.CLIENT) + @Override + public IIcon getIcon() { + return icon; + } + + @Override + public short getID() { + return (short) ordinal(); + } + + public static void init() { + for (IErrorState code : values()) { + ErrorStateRegistry.registerErrorState(code); + } + } +} diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index c3b3df08c..13c061bac 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -21,8 +21,8 @@ import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.ErrorStateRegistry; -import forestry.api.core.EnumErrorCode; import forestry.core.fluids.Fluids; import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.IPickupHandler; @@ -87,7 +87,7 @@ public class EventHandlerCore { @SideOnly(Side.CLIENT) public void handleTextureRemap(TextureStitchEvent.Pre event) { if(event.map.getTextureType() == 1) { - EnumErrorCode.initIcons(event.map); + ErrorStateRegistry.initIcons(event.map); TextureManager.getInstance().initDefaultIcons(event.map); } else if(event.map.getTextureType() == 0) Fluids.resetFluidIcons(event.map); diff --git a/src/main/java/forestry/core/ForestryCore.java b/src/main/java/forestry/core/ForestryCore.java index 29f61b83a..2b797d3af 100755 --- a/src/main/java/forestry/core/ForestryCore.java +++ b/src/main/java/forestry/core/ForestryCore.java @@ -58,6 +58,8 @@ public class ForestryCore { Config.load(); if (!Config.disableVersionCheck) Version.versionCheck(); + + EnumErrorCode.init(); PluginManager.runPreInit(); } diff --git a/src/main/java/forestry/core/circuits/CircuitBoardManager.java b/src/main/java/forestry/core/circuits/CircuitBoardManager.java deleted file mode 100755 index 7de2ccfdd..000000000 --- a/src/main/java/forestry/core/circuits/CircuitBoardManager.java +++ /dev/null @@ -1,14 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.circuits; - -public class CircuitBoardManager { -} diff --git a/src/main/java/forestry/core/circuits/CircuitLayout.java b/src/main/java/forestry/core/circuits/CircuitLayout.java index e649a9017..60cb2d29d 100755 --- a/src/main/java/forestry/core/circuits/CircuitLayout.java +++ b/src/main/java/forestry/core/circuits/CircuitLayout.java @@ -28,11 +28,11 @@ public class CircuitLayout implements ICircuitLayout { @Override public String getName() { - return StringUtil.localize("layout." + this.uid); + return StringUtil.localize("circuit.layout." + this.uid + ".name"); } @Override public String getUsage() { - return StringUtil.localize("usage." + this.uid); + return StringUtil.localize("circuit.layout." + this.uid + ".usage"); } } diff --git a/src/main/java/forestry/core/circuits/CircuitRegistry.java b/src/main/java/forestry/core/circuits/CircuitRegistry.java index bfcac9040..3d316449f 100755 --- a/src/main/java/forestry/core/circuits/CircuitRegistry.java +++ b/src/main/java/forestry/core/circuits/CircuitRegistry.java @@ -23,12 +23,19 @@ import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitLibrary; import forestry.api.circuits.ICircuitRegistry; import forestry.core.config.ForestryItem; +import java.util.Map; public class CircuitRegistry implements ICircuitRegistry { - private final LinkedHashMap layoutMap = new LinkedHashMap(); - private final LinkedHashMap circuitMap = new LinkedHashMap(); - private final HashMap legacyMap = new HashMap(); + public static final ICircuitLayout DUMMY_LAYOUT = new CircuitLayout("dummy"); + public static final Map DUMMY_MAP = new LinkedHashMap(); + private final Map layoutMap = new LinkedHashMap(); + private final Map circuitMap = new LinkedHashMap(); + private final Map legacyMap = new HashMap(); + + static { + DUMMY_MAP.put("dummy", DUMMY_LAYOUT); + } @Override public ICircuitLibrary getCircuitLibrary(World world, String playername) { @@ -47,12 +54,16 @@ public class CircuitRegistry implements ICircuitRegistry { public ICircuitLayout getDefaultLayout() { if (layoutMap.containsKey("forestry.engine.tin")) return layoutMap.get("forestry.engine.tin"); - else + else if (!layoutMap.isEmpty()) return layoutMap.values().iterator().next(); + else + return DUMMY_LAYOUT; } @Override - public LinkedHashMap getRegisteredLayouts() { + public Map getRegisteredLayouts() { + if (layoutMap.isEmpty()) + return DUMMY_MAP; return layoutMap; } @@ -71,7 +82,7 @@ public class CircuitRegistry implements ICircuitRegistry { /* CIRCUITS */ @Override - public HashMap getRegisteredCircuits() { + public Map getRegisteredCircuits() { return circuitMap; } @@ -100,14 +111,12 @@ public class CircuitRegistry implements ICircuitRegistry { public void initialize() { } - - - + @Override public boolean isChipset(ItemStack itemstack) { return ForestryItem.circuitboards.isItemEqual(itemstack); } - + @Override public ICircuitBoard getCircuitboard(ItemStack itemstack) { NBTTagCompound nbttagcompound = itemstack.getTagCompound(); diff --git a/src/main/java/forestry/core/circuits/ItemSolderingIron.java b/src/main/java/forestry/core/circuits/ItemSolderingIron.java index 0a6e3413e..3c213d4fb 100755 --- a/src/main/java/forestry/core/circuits/ItemSolderingIron.java +++ b/src/main/java/forestry/core/circuits/ItemSolderingIron.java @@ -12,8 +12,6 @@ package forestry.core.circuits; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; -import java.util.Map.Entry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -25,16 +23,19 @@ import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ISolderManager; import forestry.api.core.ForestryAPI; -import forestry.api.core.EnumErrorCode; +import forestry.api.core.IErrorState; +import forestry.core.EnumErrorCode; import forestry.core.interfaces.IErrorSource; import forestry.core.items.ItemForestry; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemInventory; +import forestry.core.utils.RevolvingList; public class ItemSolderingIron extends ItemForestry implements ISolderingIron { public static class CircuitRecipe { + private final ICircuitLayout layout; private final ItemStack resource; public final ICircuit circuit; @@ -54,6 +55,7 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { } public static class SolderManager implements ISolderManager { + public static final ArrayList recipes = new ArrayList(); @Override @@ -71,9 +73,10 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { if (layout == null || resource == null) return null; - for (CircuitRecipe recipe : recipes) + for (CircuitRecipe recipe : recipes) { if (recipe.matches(layout, resource)) return recipe; + } return null; } @@ -82,7 +85,7 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { // / INVENTORY MANAGMENT public static class SolderingInventory extends ItemInventory implements IErrorSource { - private ICircuitLayout layout; + private final RevolvingList layouts = new RevolvingList(ChipsetManager.circuitRegistry.getRegisteredLayouts().values()); private EnumErrorCode errorState; private final short blankSlot = 0; @@ -91,57 +94,32 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { public SolderingInventory() { super(ItemSolderingIron.class, 6); - layout = ChipsetManager.circuitRegistry.getDefaultLayout(); + init(); } public SolderingInventory(ItemStack itemstack) { super(ItemSolderingIron.class, 6, itemstack); - layout = ChipsetManager.circuitRegistry.getDefaultLayout(); + init(); + } + + private void init() { + layouts.setCurrent(ChipsetManager.circuitRegistry.getDefaultLayout()); } public ICircuitLayout getLayout() { - return this.layout; + return layouts.getCurrent(); } public void setLayout(String uid) { - this.layout = ChipsetManager.circuitRegistry.getLayout(uid); + layouts.setCurrent(ChipsetManager.circuitRegistry.getLayout(uid)); } public void advanceLayout() { - Iterator> it = ChipsetManager.circuitRegistry.getRegisteredLayouts().entrySet().iterator(); - while (it.hasNext()) { - Entry entry = it.next(); - if (entry.getKey().equals(layout.getUID())) { - - if (it.hasNext()) - layout = it.next().getValue(); - else - layout = ChipsetManager.circuitRegistry.getRegisteredLayouts().entrySet().iterator().next().getValue(); - - break; - } - } + layouts.rotateRight(); } public void regressLayout() { - Iterator> it = ChipsetManager.circuitRegistry.getRegisteredLayouts().entrySet().iterator(); - - ICircuitLayout previous = null; - while (it.hasNext()) { - Entry entry = it.next(); - if (entry.getKey().equals(layout.getUID())) { - - if (previous != null) - layout = previous; - else - while (it.hasNext()) - layout = it.next().getValue(); - - break; - } - - previous = entry.getValue(); - } + layouts.rotateLeft(); } private Collection getCircuits(EnumCircuitBoardType type, boolean doConsume) { @@ -153,7 +131,7 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { if (ingredient == null) continue; - CircuitRecipe recipe = SolderManager.getMatchingRecipe(layout, ingredient); + CircuitRecipe recipe = SolderManager.getMatchingRecipe(layouts.getCurrent(), ingredient); if (recipe == null) continue; @@ -170,16 +148,18 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { } public void trySolder() { - - // Requires blank slot - if (inventoryStacks[blankSlot] == null) + if (layouts.getCurrent() == CircuitRegistry.DUMMY_LAYOUT) return; - if (inventoryStacks[blankSlot].stackSize > 1) + + ItemStack blank = inventoryStacks[blankSlot]; + // Requires blank slot + if (blank == null) + return; + if (blank.stackSize > 1) return; if (inventoryStacks[finishedSlot] != null) return; - ItemStack blank = inventoryStacks[blankSlot]; // Need a chipset item if (!ChipsetManager.circuitRegistry.isChipset(blank)) return; @@ -199,15 +179,16 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { } circuits = getCircuits(type, true); - inventoryStacks[finishedSlot] = ItemCircuitBoard.createCircuitboard(type, layout, circuits.toArray(new ICircuit[circuits.size()])); + inventoryStacks[finishedSlot] = ItemCircuitBoard.createCircuitboard(type, layouts.getCurrent(), circuits.toArray(new ICircuit[circuits.size()])); inventoryStacks[blankSlot] = null; } public int getCount(ICircuit circuit, ArrayList circuits) { int count = 0; - for (ICircuit other : circuits) + for (ICircuit other : circuits) { if (other.getUID().equals(circuit.getUID())) count++; + } return count; } @@ -231,7 +212,9 @@ public class ItemSolderingIron extends ItemForestry implements ISolderingIron { } @Override - public EnumErrorCode getErrorState() { + public IErrorState getErrorState() { + if (layouts.getCurrent() == CircuitRegistry.DUMMY_LAYOUT) + return EnumErrorCode.NOCIRCUITLAYOUT; if (inventoryStacks[blankSlot] == null) return EnumErrorCode.NOCIRCUITBOARD; if (inventoryStacks[blankSlot].stackSize > 1) diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index daa496611..537fe6a03 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -26,7 +26,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index a6e1aedcd..bc49ad212 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -16,7 +16,8 @@ import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.Optional; -import forestry.api.core.EnumErrorCode; +import forestry.api.core.IErrorState; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.interfaces.IErrorSource; @@ -186,9 +187,9 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit this.sendNetworkUpdate(); } // / ERROR HANDLING - public EnumErrorCode errorState = EnumErrorCode.OK; + public IErrorState errorState = EnumErrorCode.OK; - public void setErrorState(EnumErrorCode state) { + public void setErrorState(IErrorState state) { if (this.errorState == state) return; this.errorState = state; @@ -201,7 +202,7 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit } @Override - public EnumErrorCode getErrorState() { + public IErrorState getErrorState() { return errorState; } // / OWNERSHIP @@ -288,6 +289,7 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit /** * Gets the tile's unlocalized name, based on the block at the location of this entity (client-only). + * @return */ public String getUnlocalizedName() { String blockUnlocalizedName = getBlockType().getUnlocalizedName().replace("tile.for.",""); diff --git a/src/main/java/forestry/core/gui/ErrorLedger.java b/src/main/java/forestry/core/gui/ErrorLedger.java index 7c1ffc88e..7ea4c454b 100755 --- a/src/main/java/forestry/core/gui/ErrorLedger.java +++ b/src/main/java/forestry/core/gui/ErrorLedger.java @@ -10,7 +10,8 @@ ******************************************************************************/ package forestry.core.gui; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; +import forestry.api.core.IErrorState; import forestry.core.interfaces.IErrorSource; import forestry.core.utils.StringUtil; @@ -30,7 +31,7 @@ public class ErrorLedger extends Ledger { @Override public void draw(int x, int y) { - EnumErrorCode state = tile.getErrorState(); + IErrorState state = tile.getErrorState(); if (state == EnumErrorCode.OK) return; @@ -52,11 +53,8 @@ public class ErrorLedger extends Ledger { @Override public boolean isVisible() { - EnumErrorCode state = tile.getErrorState(); - if (state == EnumErrorCode.OK) - return false; - else - return true; + IErrorState state = tile.getErrorState(); + return state != EnumErrorCode.OK; } @Override diff --git a/src/main/java/forestry/core/interfaces/IErrorSource.java b/src/main/java/forestry/core/interfaces/IErrorSource.java index 342a2ad35..019c03f78 100755 --- a/src/main/java/forestry/core/interfaces/IErrorSource.java +++ b/src/main/java/forestry/core/interfaces/IErrorSource.java @@ -10,12 +10,12 @@ ******************************************************************************/ package forestry.core.interfaces; -import forestry.api.core.EnumErrorCode; +import forestry.api.core.IErrorState; public interface IErrorSource { boolean throwsErrors(); - EnumErrorCode getErrorState(); + IErrorState getErrorState(); } diff --git a/src/main/java/forestry/core/network/PacketTileUpdate.java b/src/main/java/forestry/core/network/PacketTileUpdate.java index e9443ca13..819d94eb7 100755 --- a/src/main/java/forestry/core/network/PacketTileUpdate.java +++ b/src/main/java/forestry/core/network/PacketTileUpdate.java @@ -18,15 +18,17 @@ import java.util.UUID; import net.minecraftforge.common.util.ForgeDirection; import com.mojang.authlib.GameProfile; +import forestry.api.core.ErrorStateRegistry; +import forestry.api.core.IErrorState; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.gadgets.TileForestry; import forestry.core.utils.EnumAccess; public class PacketTileUpdate extends PacketUpdate { private ForgeDirection orientation = ForgeDirection.WEST; - private EnumErrorCode errorState = EnumErrorCode.OK; + private IErrorState errorState = EnumErrorCode.OK; private boolean isOwnable = false; private EnumAccess access = EnumAccess.SHARED; @@ -57,11 +59,14 @@ public class PacketTileUpdate extends PacketUpdate { data.writeInt(posY); data.writeInt(posZ); - data.writeInt(this.orientation.ordinal()); - data.writeInt(this.errorState.ordinal()); + data.writeByte(this.orientation.ordinal()); + data.writeShort(this.errorState.getID()); + // TODO: Should this really be sent to the client? Huge network cost. + // As far as I know, only GUIs need it, and there are better ways to get the information to a GUI. + // -CovertJaguar if (isOwnable) { - data.writeInt(access.ordinal()); + data.writeByte(access.ordinal()); if (owner == null) { data.writeBoolean(false); } else { @@ -83,10 +88,10 @@ public class PacketTileUpdate extends PacketUpdate { posY = data.readInt(); posZ = data.readInt(); - orientation = ForgeDirection.values()[data.readInt()]; - errorState = EnumErrorCode.values()[data.readInt()]; + orientation = ForgeDirection.getOrientation(data.readByte()); + errorState = ErrorStateRegistry.getErrorStateFromCode(data.readShort()); - int ordinal = data.readInt(); + int ordinal = data.readByte(); isOwnable = ordinal >= 0; if (isOwnable) { access = EnumAccess.values()[ordinal]; @@ -105,7 +110,7 @@ public class PacketTileUpdate extends PacketUpdate { return this.orientation; } - public EnumErrorCode getErrorState() { + public IErrorState getErrorState() { return this.errorState; } diff --git a/src/main/java/forestry/core/proxy/ProxyLog.java b/src/main/java/forestry/core/proxy/ProxyLog.java index 4d6d21c1f..7b4e168dc 100755 --- a/src/main/java/forestry/core/proxy/ProxyLog.java +++ b/src/main/java/forestry/core/proxy/ProxyLog.java @@ -101,4 +101,35 @@ public class ProxyLog { LogManager.getLogger(Defaults.MOD).log(logLevel, new MessageFormatMessage(String.format(message, params), params)); } + /* EXCEPTIONS */ + public void logThrowable(String msg, Throwable error, Object... args) { + logThrowable(Level.ERROR, msg, 3, error, args); + } + + public void logThrowable(String msg, int lines, Throwable error, Object... args) { + logThrowable(Level.ERROR, msg, lines, error, args); + } + + public void logThrowable(Level level, String msg, int lines, Throwable error, Object... args) { + StackTraceElement[] oldtrace = error.getStackTrace(); + if (lines < oldtrace.length) { + StackTraceElement[] newtrace = new StackTraceElement[lines]; + System.arraycopy(oldtrace, 0, newtrace, 0, newtrace.length); + error.setStackTrace(newtrace); + } + LogManager.getLogger(Defaults.MOD).log(level, new MessageFormatMessage(msg, args), error); + } + + public void logErrorAPI(String mod, Throwable error, Class classFile) { + StringBuilder msg = new StringBuilder(mod); + msg.append(" API error, please update your mods. Error: ").append(error); + logThrowable(Level.ERROR, msg.toString(), 2, error); + + if (classFile != null) { + msg = new StringBuilder(mod); + msg.append(" API error: ").append(classFile.getSimpleName()).append(" is loaded from ").append(classFile.getProtectionDomain().getCodeSource().getLocation()); + log(Level.ERROR, msg.toString()); + } + } + } diff --git a/src/main/java/forestry/core/utils/RevolvingList.java b/src/main/java/forestry/core/utils/RevolvingList.java new file mode 100644 index 000000000..7a5a385f2 --- /dev/null +++ b/src/main/java/forestry/core/utils/RevolvingList.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.utils; + +import com.google.common.collect.ForwardingCollection; +import java.util.*; + +/** + * + * @author CovertJaguar + * @param + */ +public class RevolvingList extends ForwardingCollection { + + private final Deque list = new LinkedList(); + + public RevolvingList() { + } + + public RevolvingList(Collection collection) { + list.addAll(collection); + } + + @Override + protected Collection delegate() { + return list; + } + + public void rotateLeft() { + if (list.isEmpty()) + return; + list.addFirst(list.removeLast()); + } + + public void rotateRight() { + if (list.isEmpty()) + return; + list.addLast(list.removeFirst()); + } + + public T getCurrent() { + if (list.isEmpty()) + return null; + return list.getFirst(); + } + + public void setCurrent(T e) { + if (!contains(e)) + return; + + if (e == null) + while (getCurrent() != null) { + rotateRight(); + } + else + while (getCurrent() == null || !getCurrent().equals(e)) { + rotateRight(); + } + } + +} diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index b26ba5d61..ab9d9b245 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -24,7 +24,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index 9e98ee7f9..6bb079f48 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -13,7 +13,7 @@ package forestry.energy.gadgets; import buildcraft.api.statements.ITriggerExternal; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameData; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.core.TemperatureState; diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java index e584daadc..f8bfb5ec7 100755 --- a/src/main/java/forestry/energy/gadgets/EngineTin.java +++ b/src/main/java/forestry/energy/gadgets/EngineTin.java @@ -22,7 +22,7 @@ import ic2.api.energy.prefab.BasicSink; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitBoard; import forestry.api.core.ForestryAPI; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.TemperatureState; import forestry.core.config.Config; import forestry.core.config.Defaults; diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index 487c65598..4b45022ae 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -21,7 +21,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index 1b64b721e..f2c7d15ac 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -35,7 +35,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import cpw.mods.fml.common.Optional; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICraftingProvider; import forestry.core.config.Config; diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index e1f88dbf6..43f02f007 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -32,7 +32,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.recipes.ICarpenterManager; import forestry.core.config.Config; diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index cf1b0a6e7..5aeb1a73e 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -15,7 +15,7 @@ import cpw.mods.fml.common.Optional; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.ICentrifugeManager; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.gadgets.TileBase; diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index 6bf4f9f12..4e6388855 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.factory.gadgets; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.IFabricatorManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index 6f4061e27..146562792 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -32,7 +32,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import cpw.mods.fml.common.Optional; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.fuels.FuelManager; import forestry.api.recipes.IFermenterManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 1e70d4b3f..d27cec204 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -27,7 +27,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index b9ddcf208..b909c1ad6 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -25,7 +25,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.core.BiomeHelper; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.core.config.Config; import forestry.core.config.Defaults; diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 2760641a6..7408793ea 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -30,7 +30,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.ISqueezerManager; diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index 60f9d3ea8..35c136765 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -27,7 +27,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.recipes.IStillManager; diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 31543a143..d5e2eebc8 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -35,7 +35,7 @@ import net.minecraftforge.fluids.FluidStack; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitBoard; import forestry.api.core.BiomeHelper; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.farming.ICrop; diff --git a/src/main/java/forestry/farming/gadgets/TileGearbox.java b/src/main/java/forestry/farming/gadgets/TileGearbox.java index 059268bf1..dd5d4ddef 100644 --- a/src/main/java/forestry/farming/gadgets/TileGearbox.java +++ b/src/main/java/forestry/farming/gadgets/TileGearbox.java @@ -12,7 +12,7 @@ package forestry.farming.gadgets; import forestry.api.core.ITileStructure; import forestry.api.farming.IFarmHousing; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.gadgets.TileForestry; import forestry.core.interfaces.IPowerHandler; import forestry.energy.EnergyManager; diff --git a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java index a7f66e480..8d037ae50 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java @@ -19,7 +19,7 @@ import forestry.core.utils.AlyzerInventory; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.api.lepidopterology.IButterfly; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IErrorSource; diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index afce32272..bf69b9644 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -25,7 +25,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.api.core.ForestryAPI; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index d143399e1..fbdfc755d 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -25,7 +25,7 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.ForestryAPI; import forestry.api.mail.ILetter; -import forestry.api.core.EnumErrorCode; +import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; diff --git a/src/main/resources/assets/forestry/textures/items/errors/noCircuitLayout.png b/src/main/resources/assets/forestry/textures/items/errors/noCircuitLayout.png new file mode 100644 index 0000000000000000000000000000000000000000..3c458744ff9222380bf9d81555c02bdeadc3f06f GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ=4@yqg0@p$DS^ZAr}70C$_C`PxkaY`MHV$Aix}X>98Yb9s`Fp1Fy@p z_DnZJh9~wZt|!&G+D6ifRwA@t~BEX;UARK+r21*t@YsH zU=<02&8H_DF;6f(Y!Jw%Gvh(?BF?)8O^qFEB%Vo?I2TAYtkF0W&wZ3ZTR2n1*?`Ak z8cU{wf2Wum%Os;sX(c?TxE0PO^k^F&v{3jjc*tO@z@Pby45o1&R;r$NeSqF&@O1Ta JS?83{1OR0LfFu9_ literal 0 HcmV?d00001 From d4b8c6b5032d1c813f265a5b6797493a25e3c915 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Mon, 15 Dec 2014 07:45:25 -0800 Subject: [PATCH 12/13] Bump version --- application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application.properties b/application.properties index 3e5aeb49f..8c91f8142 100644 --- a/application.properties +++ b/application.properties @@ -1,6 +1,6 @@ mcversion=1.7.10 forgeversion=10.13.0.1207 version_major=3 -version_minor=1 -version_patch=1 +version_minor=3 +version_patch=0 From aaa00d01842b7c9be16f7c53d7dccb88cf7d2d8b Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Mon, 15 Dec 2014 07:46:28 -0800 Subject: [PATCH 13/13] For whatever reason the Potion.isBadEffect() reflection was giving me generics related compile errors. This fixes it. --- .../apiculture/genetics/AlleleEffectPotion.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java index c55961d14..1ca3a1674 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java @@ -51,21 +51,21 @@ public class AlleleEffectPotion extends AlleleEffectThrottled { EntityPlayer player = (EntityPlayer) entity; - int duration = this.duration; + int dur = this.duration; if (isBadEffect) { // Players are not attacked if they wear a full set of apiarist's armor. int count = ItemArmorApiarist.wearsItems((EntityPlayer) entity, getUID(), true); if (count >= 4) continue; // Full set, no damage/effect else if (count == 3) - duration = this.duration / 4; + dur = this.duration / 4; else if (count == 2) - duration = this.duration / 2; + dur = this.duration / 2; else if (count == 1) - duration = this.duration * 3 / 4; + dur = this.duration * 3 / 4; } - player.addPotionEffect(new PotionEffect(potion.getId(), duration, 0)); + player.addPotionEffect(new PotionEffect(potion.getId(), dur, 0)); } return storedData; @@ -74,7 +74,7 @@ public class AlleleEffectPotion extends AlleleEffectThrottled { //FIXME: remove when Potion.isBadEffect() is available server-side private static boolean isBadEffect(Potion potion) { try { - return ReflectionHelper.getPrivateValue(Potion.class, potion, "field_76418_K", "isBadEffect"); + return (Boolean) ReflectionHelper.getPrivateValue(Potion.class, potion, "field_76418_K", "isBadEffect"); } catch (ReflectionHelper.UnableToFindFieldException e) { Proxies.log.severe("Could not access potion field isBadEffect."); return false;