From 7666e965421c1a802dea1b2e0baee1dfe85d5783 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 24 Jan 2017 18:41:35 +0100 Subject: [PATCH] Clean Up extra tree modules and add wood fences and fence gates --- src/main/java/binnie/Binnie.java | 14 +- .../botany/ceramic/BlockStainedGlass.java | 14 +- .../binnie/botany/ceramic/PigmentRecipe.java | 4 +- .../binnie/botany/core/BotanyTexture.java | 2 +- .../java/binnie/botany/core/ModuleCore.java | 6 +- .../craftgui/PageSpeciesFlowerGenome.java | 8 +- .../craftgui/WindowBotanistDatabase.java | 2 +- .../binnie/botany/farm/CircuitGarden.java | 6 +- .../java/binnie/botany/farm/GardenLogic.java | 2 +- .../java/binnie/botany/flower/ItemBotany.java | 18 +- .../botany/flower/TileEntityFlower.java | 6 +- .../binnie/botany/gardening/BlockSoil.java | 4 +- .../binnie/botany/gardening/ItemSoil.java | 2 +- .../botany/gardening/ItemSoilMeter.java | 10 +- .../binnie/botany/gardening/ItemWeed.java | 2 +- .../botany/gardening/ModuleGardening.java | 2 +- .../botany/genetics/BotanistTracker.java | 2 +- .../botany/genetics/FlowerBreedingSystem.java | 14 +- .../binnie/botany/genetics/FlowerGenome.java | 6 +- .../botany/genetics/ModuleGenetics.java | 2 +- .../java/binnie/botany/network/PacketID.java | 8 +- src/main/java/binnie/core/AbstractMod.java | 2 +- src/main/java/binnie/core/BinnieCore.java | 8 +- src/main/java/binnie/core/ManagerBase.java | 2 +- .../java/binnie/core/block/BlockMetadata.java | 94 +++---- .../binnie/core/block/IBlockMetadata.java | 13 +- .../java/binnie/core/block/ItemMetadata.java | 12 +- .../binnie/core/block/TileEntityMetadata.java | 3 - .../core/circuits/BinnieCircuitLayout.java | 4 +- .../core/genetics/BeeBreedingSystem.java | 14 +- .../binnie/core/genetics/BreedingSystem.java | 10 +- .../binnie/core/genetics/EnumBeeModifier.java | 2 +- .../binnie/core/genetics/ForestryAllele.java | 2 +- src/main/java/binnie/core/genetics/Gene.java | 4 +- .../core/genetics/IBreedingMessage.java | 6 +- .../binnie/core/genetics/ManagerGenetics.java | 2 +- .../core/genetics/MothBreedingSystem.java | 20 +- .../core/genetics/TreeBreedingSystem.java | 14 +- .../core/liquid/ItemFluidContainer.java | 4 +- .../core/machines/MachineComponent.java | 4 +- .../binnie/core/machines/MachineGroup.java | 2 +- .../binnie/core/machines/MachinePackage.java | 4 +- .../binnie/core/machines/MachineUtil.java | 1 - .../core/machines/TileEntityMachine.java | 2 +- .../machines/inventory/InventorySlot.java | 2 +- .../core/machines/inventory/TankSlot.java | 2 +- .../machines/inventory/TankValidator.java | 2 +- .../machines/inventory/ValidatorIcon.java | 4 +- .../core/network/packet/PacketMetadata.java | 1 - .../binnie/core/proxy/BinnieModProxy.java | 4 +- .../java/binnie/core/resource/BinnieIcon.java | 2 +- .../core/texture/BinnieCoreTexture.java | 2 +- .../binnie/core/util/OreDictionaryUtil.java | 1 - .../craftgui/binniecore/WindowFieldKit.java | 10 +- .../craftgui/binniecore/WindowGenesis.java | 12 +- .../dictionary/ControlBreweryProgress.java | 1 - .../dictionary/ControlDistilleryProgress.java | 1 - .../dictionary/ControlFruitPressProgress.java | 6 - .../dictionary/ControlTileSelect.java | 2 +- .../dictionary/PageSpeciesTreeGenome.java | 6 +- .../dictionary/WindowArboristDatabase.java | 2 +- .../WindowLepidopteristDatabase.java | 2 +- .../genetics/machine/ControlGene.java | 4 +- .../genetics/machine/ControlGeneScroll.java | 2 +- .../genetics/machine/WindowGeneBank.java | 12 +- .../binnie/craftgui/minecraft/GUIIcon.java | 2 +- .../craftgui/minecraft/GuiCraftGUI.java | 1 - .../binnie/craftgui/minecraft/Window.java | 2 +- .../ControlDatabaseIndividualDisplay.java | 4 +- .../craftgui/mod/database/DatabaseTab.java | 4 +- .../mod/database/PageBranchOverview.java | 8 +- .../mod/database/PageBranchSpecies.java | 2 +- .../craftgui/mod/database/PageBreeder.java | 8 +- .../mod/database/PageBreederStats.java | 2 +- .../mod/database/PageSpeciesMutations.java | 2 +- .../mod/database/PageSpeciesOverview.java | 6 +- .../mod/database/PageSpeciesResultant.java | 2 +- .../apiary/machine/AlvearyFrame.java | 2 +- .../apiary/machine/AlvearyHatchery.java | 6 +- .../binnie/extrabees/core/ExtraBeeItems.java | 2 +- .../extrabees/core/ExtraBeeTexture.java | 2 +- .../binnie/extrabees/core/ModuleCore.java | 2 +- .../extrabees/genetics/ExtraBeeMutation.java | 6 +- .../extrabees/genetics/ExtraBeesSpecies.java | 6 +- .../extrabees/genetics/ModuleGenetics.java | 4 +- .../genetics/effect/ExtraBeesEffect.java | 2 +- .../extrabees/gui/database/ControlBiomes.java | 4 +- .../gui/database/ControlClimateBar.java | 4 +- .../gui/database/ControlProductsBox.java | 6 +- .../gui/database/PageSpeciesGenome.java | 6 +- .../gui/database/WindowApiaristDatabase.java | 2 +- .../extrabees/liquids/ExtraBeeLiquid.java | 2 +- .../extrabees/liquids/ModuleLiquids.java | 2 +- .../extrabees/products/EnumHoneyDrop.java | 2 +- .../extrabees/products/EnumPropolis.java | 4 +- .../binnie/extrabees/worldgen/HiveDrop.java | 6 +- .../java/binnie/extratrees/ExtraTrees.java | 102 +++---- .../binnie/extratrees/alcohol/Alcohol.java | 2 +- .../binnie/extratrees/alcohol/Glassware.java | 2 +- .../java/binnie/extratrees/alcohol/Juice.java | 2 +- .../binnie/extratrees/alcohol/Liqueur.java | 2 +- .../binnie/extratrees/alcohol/MiscFluid.java | 2 +- .../extratrees/alcohol/ModuleAlcohol.java | 20 +- .../binnie/extratrees/alcohol/Spirit.java | 2 +- .../extratrees/alcohol/drink/DrinkLiquid.java | 2 +- .../binnie/extratrees/block/BlockETDoor.java | 39 +-- .../binnie/extratrees/block/IPlankType.java | 3 + .../binnie/extratrees/block/ModuleBlocks.java | 194 ++++++++----- .../binnie/extratrees/block/PlankType.java | 26 +- .../extratrees/block/StairItemRenderer.java | 87 ------ .../extratrees/block/StairsRenderer.java | 69 ----- .../binnie/extratrees/block/WoodManager.java | 17 +- .../{BlockGate.java => BlockETFenceGate.java} | 75 +++-- .../extratrees/block/decor/BlockFence.java | 121 ++++---- .../extratrees/block/decor/BlockHedge.java | 265 ++++++++++-------- .../block/decor/BlockMultiFence.java | 4 +- .../extratrees/block/plank/ItemETPlank.java | 26 -- .../block/property/ETWoodTypePredicate.java | 1 - .../block/property/PropertyETWoodType.java | 5 +- .../extratrees/block/stairs/ItemETStairs.java | 25 -- .../extratrees/block/wood/BlockETFence.java | 54 ++++ .../block/{log => wood}/BlockETLog.java | 2 +- .../block/{plank => wood}/BlockETPlank.java | 2 +- .../block/{slab => wood}/BlockETSlab.java | 2 +- .../ItemBlockETWood.java} | 9 +- .../block/{slab => wood}/ItemETSlab.java | 2 +- .../extratrees/carpentry/BlockCarpentry.java | 2 +- .../carpentry/BlockCarpentryPanel.java | 4 +- .../extratrees/carpentry/BlockDesign.java | 17 +- .../carpentry/BlockStainedDesign.java | 2 +- .../extratrees/carpentry/ModuleCarpentry.java | 26 +- .../extratrees/core/ExtraTreeTexture.java | 2 +- .../extratrees/genetics/AlleleETFruit.java | 2 +- .../extratrees/genetics/ButterflySpecies.java | 4 +- .../genetics/ExtraTreeMutation.java | 6 +- .../extratrees/genetics/ModuleGenetics.java | 2 +- .../jei/brewery/BreweryRecipeMaker.java | 5 - .../brewery/DistilleryRecipeCategory.java | 5 - .../lumbermill/LumbermillRecipeWrapper.java | 7 +- .../extratrees/item/ExtraTreeItems.java | 3 +- .../extratrees/item/ExtraTreeLiquid.java | 2 +- .../java/binnie/extratrees/item/Food.java | 3 +- .../binnie/extratrees/item/ModuleItems.java | 52 ++-- .../extratrees/kitchen/KitchenMachine.java | 2 +- .../extratrees/kitchen/ModuleKitchen.java | 6 +- .../extratrees/machines/DesignerType.java | 9 +- .../extratrees/machines/ExtraTreeMachine.java | 5 +- .../extratrees/machines/ModuleMachine.java | 6 +- .../machines/brewery/BrewedGrainRecipe.java | 3 +- .../binnie/extratrees/proxy/ProxyClient.java | 12 +- .../binnie/genetics/core/GeneticsTexture.java | 4 +- .../genetics/genetics/GeneArrayItem.java | 6 +- .../binnie/genetics/genetics/GeneItem.java | 2 +- .../genetics/gui/AnalystPageBehaviour.java | 2 +- .../genetics/gui/AnalystPageBiology.java | 2 +- .../binnie/genetics/gui/AnalystPageFruit.java | 4 +- .../genetics/gui/AnalystPageGenome.java | 2 +- .../genetics/gui/AnalystPageGrowth.java | 4 +- .../genetics/gui/AnalystPageKaryogram.java | 2 +- .../genetics/gui/AnalystPageMutations.java | 2 +- .../genetics/gui/AnalystPageProducts.java | 6 +- .../gui/ControlAnalystChromosome.java | 2 +- .../genetics/gui/ControlChromoPicker.java | 2 +- .../genetics/gui/ControlChromosome.java | 16 +- .../gui/ControlIndividualDisplay.java | 2 +- .../binnie/genetics/gui/WindowAnalyst.java | 10 +- .../incubator/LarvaeIncubatorRecipeMaker.java | 4 +- .../jei/inoculator/InoculatorRecipeMaker.java | 2 +- .../binnie/genetics/item/GeneticLiquid.java | 2 +- .../java/binnie/genetics/item/ItemGene.java | 6 +- .../binnie/genetics/item/ItemSequence.java | 2 +- .../java/binnie/genetics/item/ItemSerum.java | 6 +- .../binnie/genetics/item/ItemSerumArray.java | 2 +- .../java/binnie/genetics/item/ModuleItem.java | 41 +-- .../machine/ComponentIndexerInventory.java | 4 +- .../machine/acclimatiser/Acclimatiser.java | 14 +- .../genetics/machine/analyser/Analyser.java | 4 +- .../machine/genepool/GenepoolLogic.java | 6 +- .../genetics/machine/incubator/Incubator.java | 6 +- .../ValidatorIndividualInoculate.java | 2 +- .../machine/sequencer/PackageSequencer.java | 8 +- .../splicer/ValidatorIndividualInoculate.java | 2 +- 182 files changed, 990 insertions(+), 1096 deletions(-) delete mode 100644 src/main/java/binnie/extratrees/block/StairItemRenderer.java delete mode 100644 src/main/java/binnie/extratrees/block/StairsRenderer.java rename src/main/java/binnie/extratrees/block/decor/{BlockGate.java => BlockETFenceGate.java} (68%) delete mode 100644 src/main/java/binnie/extratrees/block/plank/ItemETPlank.java delete mode 100644 src/main/java/binnie/extratrees/block/stairs/ItemETStairs.java create mode 100644 src/main/java/binnie/extratrees/block/wood/BlockETFence.java rename src/main/java/binnie/extratrees/block/{log => wood}/BlockETLog.java (97%) rename src/main/java/binnie/extratrees/block/{plank => wood}/BlockETPlank.java (97%) rename src/main/java/binnie/extratrees/block/{slab => wood}/BlockETSlab.java (97%) rename src/main/java/binnie/extratrees/block/{log/ItemETLog.java => wood/ItemBlockETWood.java} (73%) rename src/main/java/binnie/extratrees/block/{slab => wood}/ItemETSlab.java (94%) diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index 79e92011..4350a5aa 100644 --- a/src/main/java/binnie/Binnie.java +++ b/src/main/java/binnie/Binnie.java @@ -12,11 +12,11 @@ import java.util.ArrayList; import java.util.List; public final class Binnie { - public static final List Managers = new ArrayList<>(); - public static final ManagerLanguage Language = new ManagerLanguage(); - public static final ManagerGenetics Genetics = new ManagerGenetics(); - public static final ManagerConfig Configuration = new ManagerConfig(); - public static final ManagerLiquid Liquid = new ManagerLiquid(); - public static final ManagerMachine Machine = new ManagerMachine(); - public static final ManagerResource Resource = new ManagerResource(); + public static final List MANAGERS = new ArrayList<>(); + public static final ManagerLanguage LANGUAGE = new ManagerLanguage(); + public static final ManagerGenetics GENETICS = new ManagerGenetics(); + public static final ManagerConfig CONFIGURATION = new ManagerConfig(); + public static final ManagerLiquid LIQUID = new ManagerLiquid(); + public static final ManagerMachine MCHINE = new ManagerMachine(); + public static final ManagerResource RESOURCE = new ManagerResource(); } diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 5da9cee7..31e17357 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -66,7 +66,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored List list = new ArrayList<>(); TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos); if (tile != null && !tile.hasDroppedBlock()) { - int meta = getDroppedMeta(getMetaFromState(state), tile.getTileMetadata()); + int meta = getDroppedMeta(state, tile.getTileMetadata()); list.add(TileEntityMetadata.getItemStack(this, meta)); } return list; @@ -109,22 +109,18 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) { return TileEntityMetadata.getItemDamage(stack); } - + @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { - return tileMeta; + public int getDroppedMeta(IBlockState state, int tileMetadata) { + return tileMetadata; } @Override - public String getBlockName(final ItemStack par1ItemStack) { + public String getDisplayName(final ItemStack par1ItemStack) { final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); return EnumFlowerColor.get(meta).getColourName() + " Pigmented Glass"; } - @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { - } - @Override public void dropAsStack(World world, BlockPos pos, ItemStack itemStack) { spawnAsEntity(world, pos, itemStack); diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index ed5eaafd..4224e7c0 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -31,8 +31,8 @@ public class PigmentRecipe implements IRecipe { if (++n > 1) { return null; } - if (Binnie.Genetics.getFlowerRoot().isMember(crafting.getStackInSlot(i))) { - final IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(crafting.getStackInSlot(i)); + if (Binnie.GENETICS.getFlowerRoot().isMember(crafting.getStackInSlot(i))) { + final IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(crafting.getStackInSlot(i)); if (flower.getAge() >= 1) { stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID()); } diff --git a/src/main/java/binnie/botany/core/BotanyTexture.java b/src/main/java/binnie/botany/core/BotanyTexture.java index 002f81e1..f9cd752b 100644 --- a/src/main/java/binnie/botany/core/BotanyTexture.java +++ b/src/main/java/binnie/botany/core/BotanyTexture.java @@ -18,6 +18,6 @@ public enum BotanyTexture implements IBinnieTexture { @Override public BinnieResource getTexture() { - return Binnie.Resource.getPNG(ExtraBees.instance, this.type, this.texture); + return Binnie.RESOURCE.getPNG(ExtraBees.instance, this.type, this.texture); } } diff --git a/src/main/java/binnie/botany/core/ModuleCore.java b/src/main/java/binnie/botany/core/ModuleCore.java index 099b1c62..b38d5bd4 100644 --- a/src/main/java/binnie/botany/core/ModuleCore.java +++ b/src/main/java/binnie/botany/core/ModuleCore.java @@ -11,13 +11,13 @@ public class ModuleCore implements IInitializable { @Override public void preInit() { for (final EnumAcidity pH : EnumAcidity.values()) { - Binnie.Language.addObjectName(pH, Binnie.Language.unlocalised(Botany.instance, "ph." + pH.getName())); + Binnie.LANGUAGE.addObjectName(pH, Binnie.LANGUAGE.unlocalised(Botany.instance, "ph." + pH.getName())); } for (final EnumMoisture pH2 : EnumMoisture.values()) { - Binnie.Language.addObjectName(pH2, Binnie.Language.unlocalised(Botany.instance, "moisture." + pH2.getName())); + Binnie.LANGUAGE.addObjectName(pH2, Binnie.LANGUAGE.unlocalised(Botany.instance, "moisture." + pH2.getName())); } for (final EnumSoilType pH3 : EnumSoilType.values()) { - Binnie.Language.addObjectName(pH3, Binnie.Language.unlocalised(Botany.instance, "soil." + pH3.getName())); + Binnie.LANGUAGE.addObjectName(pH3, Binnie.LANGUAGE.unlocalised(Botany.instance, "soil." + pH3.getName())); } } diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index 61167e03..360fca28 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -30,11 +30,11 @@ public class PageSpeciesFlowerGenome extends PageSpecies { @Override public void onValueChanged(final IAlleleSpecies species) { this.deleteAllChildren(); - final IAllele[] template = Binnie.Genetics.getFlowerRoot().getTemplate(species.getUID()); + final IAllele[] template = Binnie.GENETICS.getFlowerRoot().getTemplate(species.getUID()); if (template == null) { return; } - final IFlower tree = Binnie.Genetics.getFlowerRoot().templateAsIndividual(template); + final IFlower tree = Binnie.GENETICS.getFlowerRoot().templateAsIndividual(template); if (tree == null) { return; } @@ -55,10 +55,10 @@ public class PageSpeciesFlowerGenome extends PageSpecies { new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MiddleLeft); y += th; new ControlText(contents, new IArea(0.0f, y, w2, th), "Moist. : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), Binnie.Language.localise(treeSpecies.getMoisture()), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(w2, y, w3, th), Binnie.LANGUAGE.localise(treeSpecies.getMoisture()), TextJustification.MiddleLeft); y += th; new ControlText(contents, new IArea(0.0f, y, w2, th), "pH. : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), Binnie.Language.localise(treeSpecies.getPH()), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(w2, y, w3, th), Binnie.LANGUAGE.localise(treeSpecies.getPH()), TextJustification.MiddleLeft); y += th; new ControlText(contents, new IArea(0.0f, y, w2, th), "Fertility : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MiddleLeft); diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index af31f430..c9be1d24 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -30,7 +30,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { ControlListBox selectionBoxColors; public WindowBotanistDatabase(final EntityPlayer player, final Side side, final boolean nei) { - super(player, side, nei, Binnie.Genetics.flowerBreedingSystem, 130.0f); + super(player, side, nei, Binnie.GENETICS.flowerBreedingSystem, 130.0f); } public static Window create(final EntityPlayer player, final Side side, final boolean nei) { diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index 0a13abd1..f0e389fe 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -27,16 +27,16 @@ public class CircuitGarden extends BinnieCircuit { this.moisture = moisture; this.acidity = ph; this.icon = icon; - this.logic = new GardenLogic(this.moisture, this.acidity, this.isManual, this.isFertilised, this.icon, Binnie.Language.localise(this.getUnlocalizedName())); + this.logic = new GardenLogic(this.moisture, this.acidity, this.isManual, this.isFertilised, this.icon, Binnie.LANGUAGE.localise(this.getUnlocalizedName())); String info = ""; if (moisture != EnumMoisture.Normal) { - info += TextFormatting.GRAY + Binnie.Language.localise("botany.moisture") + ": " + moisture.getTranslated(true); + info += TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisture.getTranslated(true); } if (info.length() > 0) { info += ", "; } if (ph != null) { - info += TextFormatting.GRAY + Binnie.Language.localise("botany.ph") + ": " + ph.getTranslated(true); + info += TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(true); } if (info.length() > 0) { info = " (" + info + TextFormatting.RESET + ")"; diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index 70d1fe76..4ce2916a 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -215,7 +215,7 @@ public class GardenLogic extends FarmLogic { } private boolean trySetWater(World world, BlockPos position, IFarmHousing housing) { - final FluidStack water = Binnie.Liquid.getFluidStack("water", 1000); + final FluidStack water = Binnie.LIQUID.getFluidStack("water", 1000); if (this.moisture == EnumMoisture.Damp) { if (!housing.hasLiquid(water)) { return false; diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index f7375fe3..bd361a07 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -86,7 +86,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister } IFlower individual = (IFlower) this.getIndividual(itemStack); if (individual == null || individual.getGenome() == null) { - list.add(TextFormatting.DARK_RED + Binnie.Language.localise("botany.flower.destroy")); + list.add(TextFormatting.DARK_RED + Binnie.LANGUAGE.localise("botany.flower.destroy")); return; } IFlowerGenome genome = individual.getGenome(); @@ -96,9 +96,9 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister String stemColor = genome.getStemColor().getColourName(); String colorInfo; if (!primaryColor.equals(secondaryColor)) { - colorInfo = Binnie.Language.localise("botany.grammar.flower.secondary"); + colorInfo = Binnie.LANGUAGE.localise("botany.grammar.flower.secondary"); } else { - colorInfo = Binnie.Language.localise("botany.grammar.flower"); + colorInfo = Binnie.LANGUAGE.localise("botany.grammar.flower"); } list.add(TextFormatting.YELLOW + colorInfo.replaceAll("%PRIMARY", primaryColor).replaceAll("%SECONDARY", secondaryColor).replaceAll("%STEM", stemColor)); @@ -106,10 +106,10 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister if (BinnieCore.proxy.isShiftDown()) { individual.addTooltip(list); } else { - list.add(TextFormatting.ITALIC + "<" + Binnie.Language.localise("for.gui.tooltip.tmi") + ">"); + list.add(TextFormatting.ITALIC + "<" + Binnie.LANGUAGE.localise("for.gui.tooltip.tmi") + ">"); } } else { - list.add("<" + Binnie.Language.localise("for.gui.unknown") + ">"); + list.add("<" + Binnie.LANGUAGE.localise("for.gui.unknown") + ">"); } } @@ -128,13 +128,13 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister @Override public String getItemStackDisplayName(final ItemStack itemstack) { if (!itemstack.hasTagCompound()) { - return Binnie.Language.localise("item.botany.flower.corrupted.name"); + return Binnie.LANGUAGE.localise("item.botany.flower.corrupted.name"); } IIndividual individual = this.getIndividual(itemstack); if (individual != null && individual.getGenome() != null) { - return individual.getDisplayName() + (!tag.isEmpty() ? " " + Binnie.Language.localise("item.botany." + tag + ".name") : ""); + return individual.getDisplayName() + (!tag.isEmpty() ? " " + Binnie.LANGUAGE.localise("item.botany." + tag + ".name") : ""); } - return Binnie.Language.localise("item.botany.flower.corrupted.name"); + return Binnie.LANGUAGE.localise("item.botany.flower.corrupted.name"); } @Override @@ -187,7 +187,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { if (type == EnumFlowerStage.POLLEN) { - final IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(stack); + final IFlower flower = Binnie.GENETICS.getFlowerRoot().getMember(stack); final TileEntity target = world.getTileEntity(pos); if (!(target instanceof IPollinatable)) { return EnumActionResult.PASS; diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index e13ec52e..e1239ffa 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -81,7 +81,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } if (nbtCompound.hasKey("CATER") && BinnieCore.isLepidopteryActive()) { this.matureTime = nbtCompound.getInteger("caterTime"); - this.caterpillar = Binnie.Genetics.getButterflyRoot().getMember(nbtCompound.getCompoundTag("cater")); + this.caterpillar = Binnie.GENETICS.getButterflyRoot().getMember(nbtCompound.getCompoundTag("cater")); } super.readFromNBT(nbtCompound); } @@ -321,7 +321,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt if (this.flower == null) { return null; } - return Binnie.Genetics.getFlowerRoot().getMemberStack(this.getFlower(), EnumFlowerStage.getStage(getFlower())); + return Binnie.GENETICS.getFlowerRoot().getMemberStack(this.getFlower(), EnumFlowerStage.getStage(getFlower())); } private TileEntityFlower getRoot() { @@ -466,7 +466,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt private void attemptButterflySpawn(final World world, final IButterfly butterfly, final double x, final double y, final double z) { if (BinnieCore.isLepidopteryActive()) { - Binnie.Genetics.getButterflyRoot().spawnButterflyInWorld(world, butterfly.copy(), x, y + 0.10000000149011612, z); + Binnie.GENETICS.getButterflyRoot().spawnButterflyInWorld(world, butterfly.copy(), x, y + 0.10000000149011612, z); } } diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index ffe15d7c..e736c19b 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -259,7 +259,7 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { return ""; } } - return TextFormatting.GRAY + Binnie.Language.localise("botany.ph") + ": " + ph.getTranslated(withColor); + return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(withColor); } public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) { @@ -269,7 +269,7 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { return ""; } } - return TextFormatting.GRAY + Binnie.Language.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); + return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); } @Override diff --git a/src/main/java/binnie/botany/gardening/ItemSoil.java b/src/main/java/binnie/botany/gardening/ItemSoil.java index f1d6d6bb..f16a2b71 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoil.java +++ b/src/main/java/binnie/botany/gardening/ItemSoil.java @@ -35,7 +35,7 @@ public class ItemSoil extends ItemBlock { tooltip.add(info); } if (this.noWeed) { - tooltip.add(TextFormatting.GREEN + Binnie.Language.localise("botany.soil.weedkiller")); + tooltip.add(TextFormatting.GREEN + Binnie.LANGUAGE.localise("botany.soil.weedkiller")); } } diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 755a595a..64434045 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -51,11 +51,11 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { } if (Gardening.isSoil(block) && !BinnieCore.proxy.isSimulating(world)) { IBlockSoil soil = (IBlockSoil) block; - String info = Binnie.Language.localise("botany.soil.type") + ": "; + String info = Binnie.LANGUAGE.localise("botany.soil.type") + ": "; info = info + soil.getType(world, pos).getTranslated(true); - info += ", " + TextFormatting.WHITE + Binnie.Language.localise("botany.moisture") + ": "; + info += ", " + TextFormatting.WHITE + Binnie.LANGUAGE.localise("botany.moisture") + ": "; info = info + soil.getMoisture(world, pos).getTranslated(true); - info += ", " + TextFormatting.WHITE + Binnie.Language.localise("botany.ph") + ": "; + info += ", " + TextFormatting.WHITE + Binnie.LANGUAGE.localise("botany.ph") + ": "; info = info + soil.getPH(world, pos).getTranslated(true); ITextComponent chat = new TextComponentString(info); player.addChatMessage(chat); @@ -70,7 +70,7 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { return ""; } } - return TextFormatting.GRAY + Binnie.Language.localise("botany.ph") + ": " + ph.getTranslated(withColor); + return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.ph") + ": " + ph.getTranslated(withColor); } public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) { @@ -80,7 +80,7 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { return ""; } } - return TextFormatting.GRAY + Binnie.Language.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); + return TextFormatting.GRAY + Binnie.LANGUAGE.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); } @Override diff --git a/src/main/java/binnie/botany/gardening/ItemWeed.java b/src/main/java/binnie/botany/gardening/ItemWeed.java index 38848665..6be1a495 100644 --- a/src/main/java/binnie/botany/gardening/ItemWeed.java +++ b/src/main/java/binnie/botany/gardening/ItemWeed.java @@ -14,7 +14,7 @@ public class ItemWeed extends ItemBlock { @Override public String getItemStackDisplayName(final ItemStack stack) { - return Binnie.Language.localise("botany.plant." + BlockPlant.Type.values()[stack.getItemDamage()].getName()); + return Binnie.LANGUAGE.localise("botany.plant." + BlockPlant.Type.values()[stack.getItemDamage()].getName()); } @Override diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 979bf9c2..567dc0b4 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -76,7 +76,7 @@ public class ModuleGardening implements IInitializable { Botany.proxy.registerItem(Botany.trowelDiamond); Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold"); Botany.proxy.registerItem(Botany.trowelGold); - Botany.misc = new ItemMisc(CreativeTabBotany.instance, (IItemMiscProvider[]) BotanyItems.values()); + Botany.misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values()); Botany.proxy.registerItem(Botany.misc); Botany.pigment = new ItemPigment(); Botany.proxy.registerItem(Botany.pigment); diff --git a/src/main/java/binnie/botany/genetics/BotanistTracker.java b/src/main/java/binnie/botany/genetics/BotanistTracker.java index 43bde104..60190d31 100644 --- a/src/main/java/binnie/botany/genetics/BotanistTracker.java +++ b/src/main/java/binnie/botany/genetics/BotanistTracker.java @@ -18,7 +18,7 @@ public class BotanistTracker extends BreedingTracker implements IBotanistTracker @Override protected IBreedingTracker getBreedingTracker(final EntityPlayer player) { - return Binnie.Genetics.getFlowerRoot().getBreedingTracker(player.worldObj, player.getGameProfile()); + return Binnie.GENETICS.getFlowerRoot().getBreedingTracker(player.worldObj, player.getGameProfile()); } @Override diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index 1bc12b49..2d540752 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -24,8 +24,8 @@ import java.util.TreeSet; public class FlowerBreedingSystem extends BreedingSystem { public FlowerBreedingSystem() { - this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); - this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); + this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); + this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); } @Override @@ -35,7 +35,7 @@ public class FlowerBreedingSystem extends BreedingSystem { @Override public ISpeciesRoot getSpeciesRoot() { - return Binnie.Genetics.getFlowerRoot(); + return Binnie.GENETICS.getFlowerRoot(); } @Override @@ -52,16 +52,16 @@ public class FlowerBreedingSystem extends BreedingSystem { public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { if (chromosome == EnumFlowerChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.low"); } if (allele.getUID().contains("Normal")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.normal"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.normal"); } if (allele.getUID().contains("High")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.high"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.high"); } if (allele.getUID().contains("Maximum")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.maximum"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/botany/genetics/FlowerGenome.java b/src/main/java/binnie/botany/genetics/FlowerGenome.java index 352a11cd..d36a9539 100644 --- a/src/main/java/binnie/botany/genetics/FlowerGenome.java +++ b/src/main/java/binnie/botany/genetics/FlowerGenome.java @@ -121,7 +121,7 @@ public class FlowerGenome extends Genome implements IFlowerGenome { @Override public boolean canTolerate(final EnumAcidity ePH) { final int pH = ePH.ordinal(); - final int[] pHTol = Binnie.Genetics.getTolerance(this.getTolerancePH()); + final int[] pHTol = Binnie.GENETICS.getTolerance(this.getTolerancePH()); final int fPH = this.getPrimary().getPH().ordinal(); return pH >= fPH + pHTol[0] && pH <= fPH + pHTol[1]; } @@ -129,7 +129,7 @@ public class FlowerGenome extends Genome implements IFlowerGenome { @Override public boolean canTolerate(final EnumMoisture eMoisture) { final int moisture = eMoisture.ordinal(); - final int[] moistTol = Binnie.Genetics.getTolerance(this.getToleranceMoisture()); + final int[] moistTol = Binnie.GENETICS.getTolerance(this.getToleranceMoisture()); final int fMoisture = this.getPrimary().getMoisture().ordinal(); return moisture >= fMoisture + moistTol[0] && moisture <= fMoisture + moistTol[1]; } @@ -137,7 +137,7 @@ public class FlowerGenome extends Genome implements IFlowerGenome { @Override public boolean canTolerate(final EnumTemperature eTemp) { final int temp = eTemp.ordinal(); - final int[] tempTol = Binnie.Genetics.getTolerance(this.getToleranceTemperature()); + final int[] tempTol = Binnie.GENETICS.getTolerance(this.getToleranceTemperature()); final int fTemp = this.getPrimary().getTemperature().ordinal(); return temp >= fTemp + tempTol[0] && temp <= fTemp + tempTol[1]; } diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index 51629a39..d250af1c 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -51,7 +51,7 @@ public class ModuleGenetics implements IInitializable { @Override public void postInit() { FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla"); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("water", 2000), null, new ItemStack(Botany.database), + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(Botany.database), "X#X", "YEY", "RDR", diff --git a/src/main/java/binnie/botany/network/PacketID.java b/src/main/java/binnie/botany/network/PacketID.java index 37ac423a..1a42a20a 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/src/main/java/binnie/botany/network/PacketID.java @@ -25,7 +25,7 @@ public enum PacketID implements IPacketID { EntityPlayer player = BinnieCore.proxy.getPlayer(); String info = ""; if (data.hasNoTags()) { - info += Binnie.Language.localise("botany.flowers.species.not.discover"); + info += Binnie.LANGUAGE.localise("botany.flowers.species.not.discover"); } else { IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species")); IAlleleFlowerSpecies secondary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2")); @@ -53,13 +53,13 @@ public enum PacketID implements IPacketID { if (primary == secondary) { info = info + " " + primary.getName(); } else { - info = info + " " + primary.getName() + "-" + secondary.getName() + " " + Binnie.Language.localise("botany.flowers.species.hybrid"); + info = info + " " + primary.getName() + "-" + secondary.getName() + " " + Binnie.LANGUAGE.localise("botany.flowers.species.hybrid"); } if (age == 0.0f) { - info += " " + Binnie.Language.localise("botany.flowers.species.germling"); + info += " " + Binnie.LANGUAGE.localise("botany.flowers.species.germling"); } if (data.getBoolean("Wilting")) { - info += ". " + Binnie.Language.localise("botany.flowers.species.wilting"); + info += ". " + Binnie.LANGUAGE.localise("botany.flowers.species.wilting"); } } player.addChatMessage(new TextComponentString(info)); diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 242a7eab..ec569334 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -64,7 +64,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { registerModules(); if (this.getConfigs() != null) { for (final Class cls : this.getConfigs()) { - Binnie.Configuration.registerConfiguration(cls, this); + Binnie.CONFIGURATION.registerConfiguration(cls, this); } } this.getProxy().preInit(); diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index ccd4bebd..ef3c6d7b 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -67,8 +67,8 @@ public final class BinnieCore extends AbstractMod { @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { - MinecraftForge.EVENT_BUS.register(Binnie.Liquid); - Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this); + MinecraftForge.EVENT_BUS.register(Binnie.LIQUID); + Binnie.CONFIGURATION.registerConfiguration(ConfigurationMods.class, this); for (final FluidContainer container : FluidContainer.values()) { final Item item = new ItemFluidContainer(container); BinnieCore.proxy.registerItem(item); @@ -95,7 +95,7 @@ public final class BinnieCore extends AbstractMod { @Override protected void registerModules() { - for (final ManagerBase baseManager : Binnie.Managers) { + for (final ManagerBase baseManager : Binnie.MANAGERS) { this.addModule(baseManager); } this.addModule(new ModuleCraftGUI()); @@ -165,7 +165,7 @@ public final class BinnieCore extends AbstractMod { // if (event.map.getTextureType() == 0) { // Binnie.Liquid.reloadIcons(event.map); // } - Binnie.Resource.registerIcons(); + Binnie.RESOURCE.registerIcons(); } @SubscribeEvent diff --git a/src/main/java/binnie/core/ManagerBase.java b/src/main/java/binnie/core/ManagerBase.java index d039db44..670a92d7 100644 --- a/src/main/java/binnie/core/ManagerBase.java +++ b/src/main/java/binnie/core/ManagerBase.java @@ -4,7 +4,7 @@ import binnie.Binnie; public abstract class ManagerBase implements IInitializable { public ManagerBase() { - Binnie.Managers.add(this); + Binnie.MANAGERS.add(this); } @Override diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index 22eaef7e..c8d57774 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -9,10 +9,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import binnie.core.BinnieCore; @@ -26,7 +28,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return getBlockDropped(this, world, pos); + return getBlockDroppedAsList(this, world, pos); } @Override @@ -43,28 +45,16 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { public boolean hasTileEntity(IBlockState state) { return true; } - - -// @Override -// public boolean onBlockEventReceived(final World par1World, final BlockPos pos, final int par5, final int par6) { -// super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); -// final TileEntity tileentity = par1World.getTileEntity(pos); -// return tileentity != null && tileentity.receiveClientEvent(par5, par6); -// } -// -// @Override -// public IIcon getIcon(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4, final int par5) { -// final int metadata = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3, par4); -// return this.getIcon(par5, metadata); -// } - + @Override - public String getBlockName(final ItemStack par1ItemStack) { - return this.getLocalizedName(); + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return getPickBlock(world, pos); } - + + /* IBLOCKMETADATA */ @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public String getDisplayName(final ItemStack par1ItemStack) { + return this.getLocalizedName(); } @Override @@ -72,60 +62,48 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { final int damage = TileEntityMetadata.getItemDamage(item); return damage; } - + @Override - public int getDroppedMeta(final int tileMeta, final int blockMeta) { - return tileMeta; + public int getDroppedMeta(IBlockState state, int tileMetadata) { + return getMetaFromState(state); } - - public static ArrayList getBlockDropped(final IBlockMetadata block, final IBlockAccess world, final BlockPos pos) { - final ArrayList array = new ArrayList<>(); - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos); + + public static ItemStack getBlockDropped(IBlockMetadata block, IBlockAccess world, BlockPos pos) { + TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos); if (tile != null && !tile.hasDroppedBlock()) { - //final int meta = block.getDroppedMeta(world.getBlockMetadata(x, y, z), tile.getTileMetadata()); - //array.add(TileEntityMetadata.getItemStack((Block) block, meta)); + int meta = block.getDroppedMeta(world.getBlockState(pos), tile.getTileMetadata()); + return TileEntityMetadata.getItemStack((Block) block, meta); } - return array; + return null; } - public static boolean breakBlock(final IBlockMetadata block, final EntityPlayer player, final World world, final BlockPos pos) { + public static List getBlockDroppedAsList(IBlockMetadata block, IBlockAccess world, BlockPos pos) { + ItemStack drop = getBlockDropped(block, world, pos); + if(drop != null){ + return Collections.singletonList(getBlockDropped(block, world, pos)); + } + return Collections.emptyList(); + } + + public static boolean breakBlock(IBlockMetadata blockMetadata, EntityPlayer player, World world, BlockPos pos) { List drops = new ArrayList<>(); - final Block block2 = (Block) block; - final TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos); + Block block = (Block) blockMetadata; + TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos); if (tile != null && !tile.hasDroppedBlock()) { - drops = block2.getDrops(world, pos, world.getBlockState(pos), 0); + drops = block.getDrops(world, pos, world.getBlockState(pos), 0); } - final boolean hasBeenBroken = world.setBlockToAir(pos); + boolean hasBeenBroken = world.setBlockToAir(pos); if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { - for (final ItemStack drop : drops) { - block.dropAsStack(world, pos, drop); + for(ItemStack drop : drops) { + spawnAsEntity(world, pos, drop); } tile.dropBlock(); } return hasBeenBroken; } - @Override - public void dropAsStack(final World world, BlockPos pos, final ItemStack drop) { - //this.dropBlockAsItem(world, pos, drop); + public static ItemStack getPickBlock(World world, BlockPos pos) { + return getBlockDropped((IBlockMetadata) world.getBlockState(pos).getBlock(), world, pos); } -// @Override -// public void breakBlock(final World par1World, final BlockPos pos, final Block par5, final int par6) { -//// super.breakBlock(par1World, par2, par3, par4, par5, par6); -//// par1World.removeTileEntity(par2, par3, par4); -// } - - // - //TODO DROP - public static ItemStack getPickBlock(final World world, final BlockPos pos) { - //final List list = getBlockDropped((IBlockMetadata) world.getBlockState(pos).getBlock(), world, pos, world.getBlockMetadata(x, y, z)); - //return list.isEmpty() ? null : list.get(0); - return null; - } -// @Override -// public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { -// return getPickBlock(world, x, y, z); -// } - } diff --git a/src/main/java/binnie/core/block/IBlockMetadata.java b/src/main/java/binnie/core/block/IBlockMetadata.java index a6ab3eaf..6e3cc667 100644 --- a/src/main/java/binnie/core/block/IBlockMetadata.java +++ b/src/main/java/binnie/core/block/IBlockMetadata.java @@ -1,21 +1,16 @@ package binnie.core.block; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; - public interface IBlockMetadata extends ITileEntityProvider { - int getPlacedMeta(final ItemStack p0, final World p1, BlockPos pos, final EnumFacing p5); + int getPlacedMeta(ItemStack itemStack, World world, BlockPos pos, EnumFacing facing); - int getDroppedMeta(final int p0, final int p1); + int getDroppedMeta(IBlockState state, int tileMetadata); - String getBlockName(final ItemStack p0); - - void getBlockTooltip(final ItemStack p0, final List p1); - - void dropAsStack(final World p0, BlockPos pos, final ItemStack p4); + String getDisplayName(ItemStack itemStack); } diff --git a/src/main/java/binnie/core/block/ItemMetadata.java b/src/main/java/binnie/core/block/ItemMetadata.java index b3d52a50..f0f31e08 100644 --- a/src/main/java/binnie/core/block/ItemMetadata.java +++ b/src/main/java/binnie/core/block/ItemMetadata.java @@ -11,8 +11,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class ItemMetadata extends ItemBlock { public ItemMetadata(final Block block) { super(block); @@ -48,13 +46,7 @@ public class ItemMetadata extends ItemBlock { @Override @SideOnly(Side.CLIENT) - public String getItemStackDisplayName(final ItemStack par1ItemStack) { - return ((IBlockMetadata) block).getBlockName(par1ItemStack); - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - ((IBlockMetadata) block).getBlockTooltip(stack, tooltip); + public String getItemStackDisplayName(ItemStack itemStack) { + return ((IBlockMetadata) block).getDisplayName(itemStack); } } diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/src/main/java/binnie/core/block/TileEntityMetadata.java index 968d5908..67ffc456 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -1,6 +1,5 @@ package binnie.core.block; -import binnie.core.network.packet.MessageMetadata; import binnie.core.network.packet.PacketMetadata; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -9,10 +8,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityCommandBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.BlockSnapshot; public class TileEntityMetadata extends TileEntity { private int meta; diff --git a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java index a55834f2..18882907 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java @@ -32,13 +32,13 @@ public class BinnieCircuitLayout implements ICircuitLayout { @Nonnull @Override public String getName() { - return Binnie.Language.localise(this.mod, "circuit.layout." + this.uid.toLowerCase()); + return Binnie.LANGUAGE.localise(this.mod, "circuit.layout." + this.uid.toLowerCase()); } @Nonnull @Override public String getUsage() { - return Binnie.Language.localise(this.mod, "circuit.layout." + this.uid.toLowerCase() + ".usage"); + return Binnie.LANGUAGE.localise(this.mod, "circuit.layout." + this.uid.toLowerCase() + ".usage"); } @Nonnull diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index c2d63d58..9f1d9f15 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -22,8 +22,8 @@ import java.util.TreeSet; class BeeBreedingSystem extends BreedingSystem { public BeeBreedingSystem() { - this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); - this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); + this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); + this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); } @Override @@ -39,7 +39,7 @@ class BeeBreedingSystem extends BreedingSystem { @Override public ISpeciesRoot getSpeciesRoot() { - return Binnie.Genetics.getBeeRoot(); + return Binnie.GENETICS.getBeeRoot(); } @Override @@ -56,16 +56,16 @@ class BeeBreedingSystem extends BreedingSystem { public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { if (chromosome == EnumBeeChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.low"); } if (allele.getUID().contains("Normal")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.normal"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.normal"); } if (allele.getUID().contains("High")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.high"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.high"); } if (allele.getUID().contains("Maximum")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.maximum"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index 905aa05f..56cfd3bc 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -66,7 +66,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { this.furtherMutations = new HashMap<>(); this.allResultantMutations = new HashMap<>(); this.allFurtherMutations = new HashMap<>(); - Binnie.Genetics.registerBreedingSystem(this); + Binnie.GENETICS.registerBreedingSystem(this); MinecraftForge.EVENT_BUS.register(this); } @@ -153,7 +153,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { if (this.getSpeciesRoot().getMutations(false) != null) { final Set mutations = new LinkedHashSet<>(); mutations.addAll(this.getSpeciesRoot().getMutations(false)); - if (this == Binnie.Genetics.beeBreedingSystem) { + if (this == Binnie.GENETICS.beeBreedingSystem) { mutations.addAll(ExtraBeeMutation.mutations); } for (final IMutation mutation : mutations) { @@ -425,10 +425,10 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { if (allele instanceof IAlleleBoolean) { - return ((IAlleleBoolean) allele).getValue() ? Binnie.Language.localise(BinnieCore.instance, "allele.true") : Binnie.Language.localise(BinnieCore.instance, "allele.false"); + return ((IAlleleBoolean) allele).getValue() ? Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.true") : Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.false"); } if (Objects.equals(allele.getName(), "for.gui.maximum")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.fertility.maximum"); } return allele.getName(); } @@ -473,7 +473,7 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } public final Collection getActiveKaryotype() { - return Binnie.Genetics.getActiveChromosomes(this.getSpeciesRoot()); + return Binnie.GENETICS.getActiveChromosomes(this.getSpeciesRoot()); } public ItemStack getDefaultMember(final String uid) { diff --git a/src/main/java/binnie/core/genetics/EnumBeeModifier.java b/src/main/java/binnie/core/genetics/EnumBeeModifier.java index c52c35a3..ef23cece 100644 --- a/src/main/java/binnie/core/genetics/EnumBeeModifier.java +++ b/src/main/java/binnie/core/genetics/EnumBeeModifier.java @@ -12,6 +12,6 @@ public enum EnumBeeModifier { GeneticDecay; public String getName() { - return Binnie.Language.localise(BinnieCore.instance, "beemodifier." + this.name().toLowerCase()); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "beemodifier." + this.name().toLowerCase()); } } diff --git a/src/main/java/binnie/core/genetics/ForestryAllele.java b/src/main/java/binnie/core/genetics/ForestryAllele.java index 2d859ec5..a68dcc7f 100644 --- a/src/main/java/binnie/core/genetics/ForestryAllele.java +++ b/src/main/java/binnie/core/genetics/ForestryAllele.java @@ -235,7 +235,7 @@ public class ForestryAllele { } public IAllele[] getTemplate() { - return Binnie.Genetics.getBeeRoot().getTemplate(this.getAllele().getUID()); + return Binnie.GENETICS.getBeeRoot().getTemplate(this.getAllele().getUID()); } } } diff --git a/src/main/java/binnie/core/genetics/Gene.java b/src/main/java/binnie/core/genetics/Gene.java index 3f057d87..3863dd04 100644 --- a/src/main/java/binnie/core/genetics/Gene.java +++ b/src/main/java/binnie/core/genetics/Gene.java @@ -76,11 +76,11 @@ public class Gene implements IGene, INbtReadable, INbtWritable { @Override public String getName() { - return Binnie.Genetics.getSystem(this.root).getAlleleName(this.chromosome, this.allele); + return Binnie.GENETICS.getSystem(this.root).getAlleleName(this.chromosome, this.allele); } public BreedingSystem getSystem() { - return Binnie.Genetics.getSystem(this.root); + return Binnie.GENETICS.getSystem(this.root); } @Override diff --git a/src/main/java/binnie/core/genetics/IBreedingMessage.java b/src/main/java/binnie/core/genetics/IBreedingMessage.java index 2f8c2668..6f90d200 100644 --- a/src/main/java/binnie/core/genetics/IBreedingMessage.java +++ b/src/main/java/binnie/core/genetics/IBreedingMessage.java @@ -35,7 +35,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.Language.localise(BinnieCore.instance, "gui.breedingmessage.species"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.breedingmessage.species"); } @Override @@ -70,7 +70,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.Language.localise(BinnieCore.instance, "gui.breedingmessage.branch"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.breedingmessage.branch"); } @Override @@ -95,7 +95,7 @@ interface IBreedingMessage { @Override public String getTitle() { - return Binnie.Language.localise(BinnieCore.instance, "gui.breedingmessage.epithet"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.breedingmessage.epithet"); } @Override diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index f95681e9..82576b96 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -157,7 +157,7 @@ public class ManagerGenetics extends ManagerBase { private void refreshData() { this.loadAlleles(); - for (final BreedingSystem system : Binnie.Genetics.getActiveSystems()) { + for (final BreedingSystem system : Binnie.GENETICS.getActiveSystems()) { system.calculateArrays(); } } diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index 43eacd09..4e4503ba 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -20,8 +20,8 @@ import java.util.TreeSet; class MothBreedingSystem extends BreedingSystem { public MothBreedingSystem() { - this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth"); - this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth"); + this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth"); + this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth"); } @Override @@ -31,7 +31,7 @@ class MothBreedingSystem extends BreedingSystem { @Override public ISpeciesRoot getSpeciesRoot() { - return Binnie.Genetics.getButterflyRoot(); + return Binnie.GENETICS.getButterflyRoot(); } @Override @@ -49,24 +49,24 @@ class MothBreedingSystem extends BreedingSystem { if (chromosome == EnumButterflyChromosome.METABOLISM) { final int metabolism = ((IAlleleInteger) allele).getValue(); if (metabolism >= 19) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.highest"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.highest"); } if (metabolism >= 16) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.higher"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.higher"); } if (metabolism >= 13) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.high"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.high"); } if (metabolism >= 10) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.normal"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.normal"); } if (metabolism >= 7) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slow"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.slow"); } if (metabolism >= 4) { - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slower"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.slower"); } - return Binnie.Language.localise(BinnieCore.instance, "allele.metabolism.slowest"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.metabolism.slowest"); } else { if (chromosome == EnumButterflyChromosome.FERTILITY) { final int metabolism = ((IAlleleInteger) allele).getValue(); diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 67f2e6da..1e347b90 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -53,8 +53,8 @@ public class TreeBreedingSystem extends BreedingSystem { this.discoveredFruits = new UniqueItemStackSet(); this.discoveredWoods = new UniqueItemStackSet(); this.discoveredPlanks = new UniqueItemStackSet(); - this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree"); - this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredTree"); + this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree"); + this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/discoveredTree"); } @Override @@ -66,7 +66,7 @@ public class TreeBreedingSystem extends BreedingSystem { @Override public ISpeciesRoot getSpeciesRoot() { - return Binnie.Genetics.getTreeRoot(); + return Binnie.GENETICS.getTreeRoot(); } @Override @@ -86,18 +86,18 @@ public class TreeBreedingSystem extends BreedingSystem { } if (chromosome == EnumTreeChromosome.PLANT) { final EnumSet types = ((IAllelePlantType) allele).getPlantTypes(); - return types.isEmpty() ? Binnie.Language.localise(BinnieCore.instance, "allele.none") : types.iterator().next().toString(); + return types.isEmpty() ? Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.none") : types.iterator().next().toString(); } if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) { final IFruitProvider provider = ((IAlleleFruit) allele).getProvider(); - return (provider.getProducts().size() == 0) ? Binnie.Language.localise(BinnieCore.instance, "allele.none") : provider.getProducts().keySet().iterator().next().getDisplayName(); + return (provider.getProducts().size() == 0) ? Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.none") : provider.getProducts().keySet().iterator().next().getDisplayName(); } if (chromosome == EnumTreeChromosome.GROWTH) { if (allele.getUID().contains("Tropical")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.growth.tropical"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.growth.tropical"); } if (allele.getUID().contains("Lightlevel")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.growth.lightlevel"); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "allele.growth.lightlevel"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index f8a62a87..7c7e707e 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -52,7 +52,7 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister, private FluidStack getLiquid(final ItemStack stack) { final String liquid = ItemFluidContainer.idToFluid.get(stack.getItemDamage()); - return (liquid == null) ? null : Binnie.Liquid.getFluidStack(liquid, 1000); + return (liquid == null) ? null : Binnie.LIQUID.getFluidStack(liquid, 1000); } // @Override @@ -75,7 +75,7 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister, @Override public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { - for (final IFluidType liquid : Binnie.Liquid.fluids.values()) { + for (final IFluidType liquid : Binnie.LIQUID.fluids.values()) { if (!liquid.canPlaceIn(this.container)) { continue; } diff --git a/src/main/java/binnie/core/machines/MachineComponent.java b/src/main/java/binnie/core/machines/MachineComponent.java index 4eb6808b..6621c426 100644 --- a/src/main/java/binnie/core/machines/MachineComponent.java +++ b/src/main/java/binnie/core/machines/MachineComponent.java @@ -36,14 +36,14 @@ public class MachineComponent implements INbtReadable, INbtWritable { } public Class[] getComponentInterfaces() { - return Binnie.Machine.getComponentInterfaces(this.getClass()); + return Binnie.MCHINE.getComponentInterfaces(this.getClass()); } public void onInventoryUpdate() { } public final MachinePayload getPayload() { - return new MachinePayload(Binnie.Machine.getNetworkID(this.getClass())); + return new MachinePayload(Binnie.MCHINE.getNetworkID(this.getClass())); } public void recieveData(final MachinePayload payload) { diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index c058937d..f0d077fb 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -43,7 +43,7 @@ public class MachineGroup { } } } - Binnie.Machine.registerMachineGroup(this); + Binnie.MCHINE.registerMachineGroup(this); this.block = new BlockMachine(this, blockName); mod.getProxy().registerBlock(this.block); Item i = mod.getProxy().registerItem(new ItemMachine(this.block)); diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index 0ed4dca6..1e3af204 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -31,7 +31,7 @@ public abstract class MachinePackage { public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage);//, final RenderBlocks p5); public final String getDisplayName() { - return Binnie.Language.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID()); + return Binnie.LANGUAGE.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID()); } public final Integer getMetadata() { @@ -59,6 +59,6 @@ public abstract class MachinePackage { } public final String getInformation() { - return Binnie.Language.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID() + ".info"); + return Binnie.LANGUAGE.localise(this.group.getMod(), "machine." + this.group.getShortUID() + "." + this.getUID() + ".info"); } } diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index 290f6941..5131de4e 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -8,7 +8,6 @@ import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.PowerSystem; import binnie.core.util.ItemStackSet; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; diff --git a/src/main/java/binnie/core/machines/TileEntityMachine.java b/src/main/java/binnie/core/machines/TileEntityMachine.java index d066c79e..79a24ff6 100644 --- a/src/main/java/binnie/core/machines/TileEntityMachine.java +++ b/src/main/java/binnie/core/machines/TileEntityMachine.java @@ -36,7 +36,7 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork super.readFromNBT(nbtTagCompound); final String name = nbtTagCompound.getString("name"); final String group = nbtTagCompound.getString("group"); - final MachinePackage pack = Binnie.Machine.getPackage(group, name); + final MachinePackage pack = Binnie.MCHINE.getPackage(group, name); if (pack == null) { this.invalidate(); return; diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 9c57dc70..91853249 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -92,7 +92,7 @@ public class InventorySlot extends BaseSlot { @Override public String getName() { - return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + this.unlocName); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.slot." + this.unlocName); } public enum Type { diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index 725340ab..aaf38f3b 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -48,7 +48,7 @@ public class TankSlot extends BaseSlot { @Override public String getName() { - return Binnie.Language.localise(BinnieCore.instance, "gui.slot." + this.unlocName); + return Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.slot." + this.unlocName); } } diff --git a/src/main/java/binnie/core/machines/inventory/TankValidator.java b/src/main/java/binnie/core/machines/inventory/TankValidator.java index 7a2ee5d5..ed977610 100644 --- a/src/main/java/binnie/core/machines/inventory/TankValidator.java +++ b/src/main/java/binnie/core/machines/inventory/TankValidator.java @@ -12,7 +12,7 @@ public abstract class TankValidator extends Validator { private Fluid fluid; public Basic(final String name) { - this.fluid = Binnie.Liquid.getFluidStack(name, 1).getFluid(); + this.fluid = Binnie.LIQUID.getFluidStack(name, 1).getFluid(); } @Override diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java index c22311ef..b0965993 100644 --- a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java +++ b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java @@ -14,8 +14,8 @@ public class ValidatorIcon { public ValidatorIcon(final AbstractMod mod, final String pathInput, final String pathOutput) { this.iconsInput = new ArrayList<>(); this.iconsOutput = new ArrayList<>(); - this.iconsInput.add(Binnie.Resource.getItemIcon(mod, pathInput)); - this.iconsOutput.add(Binnie.Resource.getItemIcon(mod, pathOutput)); + this.iconsInput.add(Binnie.RESOURCE.getItemIcon(mod, pathInput)); + this.iconsOutput.add(Binnie.RESOURCE.getItemIcon(mod, pathOutput)); } public BinnieIcon getIcon(final boolean input) { diff --git a/src/main/java/binnie/core/network/packet/PacketMetadata.java b/src/main/java/binnie/core/network/packet/PacketMetadata.java index 04575379..111ea705 100644 --- a/src/main/java/binnie/core/network/packet/PacketMetadata.java +++ b/src/main/java/binnie/core/network/packet/PacketMetadata.java @@ -2,7 +2,6 @@ package binnie.core.network.packet; import java.io.IOException; -import binnie.botany.flower.TileEntityFlower; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.server.SPacketUpdateTileEntity; diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index 02e359d8..d155651c 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -114,10 +114,10 @@ public class BinnieModProxy implements IBinnieModProxy { } public String localise(final String string) { - return Binnie.Language.localise(this.mod, string); + return Binnie.LANGUAGE.localise(this.mod, string); } public String localiseOrBlank(final String string) { - return Binnie.Language.localiseOrBlank(this.mod, string); + return Binnie.LANGUAGE.localiseOrBlank(this.mod, string); } } diff --git a/src/main/java/binnie/core/resource/BinnieIcon.java b/src/main/java/binnie/core/resource/BinnieIcon.java index 266af827..b73158e3 100644 --- a/src/main/java/binnie/core/resource/BinnieIcon.java +++ b/src/main/java/binnie/core/resource/BinnieIcon.java @@ -13,7 +13,7 @@ public class BinnieIcon extends BinnieResource { // this.textureSheet = 0; // this.icon = null; //this.textureSheet = ((type != ResourceType.Block) ? 1 : 0); - Binnie.Resource.registerIcon(this); + Binnie.RESOURCE.registerIcon(this); } // public IIcon getIcon() { diff --git a/src/main/java/binnie/core/texture/BinnieCoreTexture.java b/src/main/java/binnie/core/texture/BinnieCoreTexture.java index 6bc96deb..3b879958 100644 --- a/src/main/java/binnie/core/texture/BinnieCoreTexture.java +++ b/src/main/java/binnie/core/texture/BinnieCoreTexture.java @@ -26,6 +26,6 @@ public enum BinnieCoreTexture implements IBinnieTexture { @Override public BinnieResource getTexture() { - return Binnie.Resource.getPNG(BinnieCore.instance, this.type, this.texture); + return Binnie.RESOURCE.getPNG(BinnieCore.instance, this.type, this.texture); } } diff --git a/src/main/java/binnie/core/util/OreDictionaryUtil.java b/src/main/java/binnie/core/util/OreDictionaryUtil.java index 967351da..79456667 100644 --- a/src/main/java/binnie/core/util/OreDictionaryUtil.java +++ b/src/main/java/binnie/core/util/OreDictionaryUtil.java @@ -4,7 +4,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.Collections; import java.util.List; diff --git a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java index 324c5951..e62c760f 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java @@ -85,7 +85,7 @@ public class WindowFieldKit extends Window { this.getWindowInventory().setValidator(0, new SlotValidator(null) { @Override public boolean isValid(final ItemStack object) { - return AlleleManager.alleleRegistry.isIndividual(object) || Binnie.Genetics.getConversion(object) != null; + return AlleleManager.alleleRegistry.isIndividual(object) || Binnie.GENETICS.getConversion(object) != null; } @Override @@ -184,14 +184,14 @@ public class WindowFieldKit extends Window { final Random rand = new Random(); this.info.clear(); for (final IChromosomeType type : root.getKaryotype()) { - if (!Binnie.Genetics.isInvalidChromosome(type)) { + if (!Binnie.GENETICS.isInvalidChromosome(type)) { final IAllele allele = ind.getGenome().getActiveAllele(type); final List infos = new ArrayList<>(); int i = 0; - for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; Binnie.Language.canLocalise(pref + i); ++i) { - infos.add(Binnie.Language.localise(pref + i)); + for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; Binnie.LANGUAGE.canLocalise(pref + i); ++i) { + infos.add(Binnie.LANGUAGE.localise(pref + i)); } - String text = Binnie.Genetics.getSystem(root).getAlleleName(type, allele); + String text = Binnie.GENETICS.getSystem(root).getAlleleName(type, allele); if (!infos.isEmpty()) { text = infos.get(rand.nextInt(infos.size())); } diff --git a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java index f3dde520..1c8acd0e 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java @@ -92,8 +92,8 @@ public class WindowGenesis extends Window { }; } }; - tabSystems.setValues(Binnie.Genetics.getActiveSystems()); - this.root = Binnie.Genetics.getActiveSystems().iterator().next().getSpeciesRoot(); + tabSystems.setValues(Binnie.GENETICS.getActiveSystems()); + this.root = Binnie.GENETICS.getActiveSystems().iterator().next().getSpeciesRoot(); this.template = this.root.getDefaultTemplate(); final IArea one = new IArea(32.0f, 28.0f, 170.0f, 100.0f); final IArea two = new IArea(214.0f, 28.0f, 100.0f, 100.0f); @@ -122,7 +122,7 @@ public class WindowGenesis extends Window { this.geneList.addEventHandler(new EventValueChanged.Handler() { @Override public void onEvent(final EventValueChanged event) { - final Map> map = Binnie.Genetics.getChromosomeMap(WindowGenesis.this.root); + final Map> map = Binnie.GENETICS.getChromosomeMap(WindowGenesis.this.root); final List opts = new ArrayList<>(); final IChromosomeType chromo = event.value != null ? ((Gene) event.value).getChromosome() : null; if (chromo != null)// fix NPE @@ -153,7 +153,7 @@ public class WindowGenesis extends Window { private void refreshTemplate(final IChromosomeType selection) { final List genes = new ArrayList<>(); final IChromosomeType[] arr$; - final IChromosomeType[] chromos = arr$ = Binnie.Genetics.getChromosomeMap(this.root).keySet().toArray(new IChromosomeType[0]); + final IChromosomeType[] chromos = arr$ = Binnie.GENETICS.getChromosomeMap(this.root).keySet().toArray(new IChromosomeType[0]); for (final IChromosomeType type : arr$) { final IAllele allele = this.template[type.ordinal()]; if (allele == null) { @@ -161,7 +161,7 @@ public class WindowGenesis extends Window { } genes.add(new Gene(allele, type, this.root)); } - final Map> map = Binnie.Genetics.getChromosomeMap(this.root); + final Map> map = Binnie.GENETICS.getChromosomeMap(this.root); this.geneList.setOptions(genes); if (selection != null) { this.geneList.setValue(new Gene(this.template[selection.ordinal()], selection, this.root)); @@ -174,7 +174,7 @@ public class WindowGenesis extends Window { private void refreshPickup() { this.panelPickup.deleteAllChildren(); int i = 0; - for (final ISpeciesType type : Binnie.Genetics.getSystem(this.root).getActiveTypes()) { + for (final ISpeciesType type : Binnie.GENETICS.getSystem(this.root).getActiveTypes()) { final IIndividual ind = this.root.templateAsIndividual(this.template); ind.analyze(); final ItemStack stack = this.root.getMemberStack(ind, type); diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java index bf28b21d..5992963b 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java @@ -15,7 +15,6 @@ import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.brewery.BreweryLogic; import binnie.extratrees.machines.brewery.BreweryRecipes; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; import java.util.Collections; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlDistilleryProgress.java b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlDistilleryProgress.java index 717c06b6..a152a798 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlDistilleryProgress.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlDistilleryProgress.java @@ -15,7 +15,6 @@ import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.distillery.DistilleryLogic; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.opengl.GL11; public class ControlDistilleryProgress extends ControlProgressBase { public static final Texture DISTILLERY_BASE = new StandardTexture(43, 0, 58, 66, ExtraTreeTexture.Gui); diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlFruitPressProgress.java b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlFruitPressProgress.java index bca51a32..833485d9 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlFruitPressProgress.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlFruitPressProgress.java @@ -12,17 +12,11 @@ import binnie.craftgui.resource.minecraft.StandardTexture; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.fruitpress.FruitPressRecipes; import binnie.extratrees.machines.fruitpress.FruitPressMachine; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.opengl.GL11; - public class ControlFruitPressProgress extends ControlProgressBase { static Texture PressTexture = new StandardTexture(6, 0, 24, 52, ExtraTreeTexture.Gui); static Texture PressSlot = new StandardTexture(9, 52, 34, 17, ExtraTreeTexture.Gui); diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java index 5983cc4d..0064d544 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java @@ -143,7 +143,7 @@ public class ControlTileSelect extends Control implements IControlValue @Override public void getTooltip(final Tooltip tooltip) { - tooltip.add(Binnie.Language.localise(BinnieCore.instance, "gui.designer.pattern", this.getValue().getName())); + tooltip.add(Binnie.LANGUAGE.localise(BinnieCore.instance, "gui.designer.pattern", this.getValue().getName())); } @Override diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java b/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java index 03b17131..dacfa9ad 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java @@ -34,11 +34,11 @@ public class PageSpeciesTreeGenome extends PageSpecies { @Override public void onValueChanged(final IAlleleSpecies species) { this.deleteAllChildren(); - final IAllele[] template = Binnie.Genetics.getTreeRoot().getTemplate(species.getUID()); + final IAllele[] template = Binnie.GENETICS.getTreeRoot().getTemplate(species.getUID()); if (template == null) { return; } - final ITree tree = Binnie.Genetics.getTreeRoot().templateAsIndividual(template); + final ITree tree = Binnie.GENETICS.getTreeRoot().templateAsIndividual(template); if (tree == null) { return; } @@ -57,7 +57,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { int y = 0; final int th = 14; final int th2 = 18; - final BreedingSystem syst = Binnie.Genetics.treeBreedingSystem; + final BreedingSystem syst = Binnie.GENETICS.treeBreedingSystem; new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.PLANT) + " : ", TextJustification.MiddleRight); new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MiddleLeft); y += th; diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java b/src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java index 5a7a4ea2..a93dad4b 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java @@ -29,7 +29,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { ControlListBox selectionBoxPlanks; public WindowArboristDatabase(final EntityPlayer player, final Side side, final boolean nei) { - super(player, side, nei, Binnie.Genetics.treeBreedingSystem, 120.0f); + super(player, side, nei, Binnie.GENETICS.treeBreedingSystem, 120.0f); } public static Window create(final EntityPlayer player, final Side side, final boolean nei) { diff --git a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowLepidopteristDatabase.java b/src/main/java/binnie/craftgui/extratrees/dictionary/WindowLepidopteristDatabase.java index 5bd181e2..c39662b8 100644 --- a/src/main/java/binnie/craftgui/extratrees/dictionary/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/craftgui/extratrees/dictionary/WindowLepidopteristDatabase.java @@ -18,7 +18,7 @@ import net.minecraftforge.fml.relauncher.Side; public class WindowLepidopteristDatabase extends WindowAbstractDatabase { public WindowLepidopteristDatabase(final EntityPlayer player, final Side side, final boolean nei) { - super(player, side, nei, Binnie.Genetics.mothBreedingSystem, 160.0f); + super(player, side, nei, Binnie.GENETICS.mothBreedingSystem, 160.0f); } public static Window create(final EntityPlayer player, final Side side, final boolean nei) { diff --git a/src/main/java/binnie/craftgui/genetics/machine/ControlGene.java b/src/main/java/binnie/craftgui/genetics/machine/ControlGene.java index e8acebc0..76edbfba 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/ControlGene.java +++ b/src/main/java/binnie/craftgui/genetics/machine/ControlGene.java @@ -23,7 +23,7 @@ public class ControlGene extends Control implements IControlValue, IToolt @Override public void getTooltip(final Tooltip tooltip) { - final String cName = Binnie.Genetics.getSystem(this.gene.getSpeciesRoot()).getChromosomeName(this.gene.getChromosome()); + final String cName = Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()).getChromosomeName(this.gene.getChromosome()); tooltip.add(cName + ": " + this.gene.getName()); if (this.isMouseOver() && this.canFill(Window.get(this).getHeldItemStack())) { tooltip.add("Left click to assign gene"); @@ -31,7 +31,7 @@ public class ControlGene extends Control implements IControlValue, IToolt if (existingGene == null) { return; } - final String dName = Binnie.Genetics.getSystem(this.gene.getSpeciesRoot()).getChromosomeName(this.gene.getChromosome()); + final String dName = Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot()).getChromosomeName(this.gene.getChromosome()); tooltip.add("Will replace " + dName + ": " + existingGene.getName()); } } diff --git a/src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java b/src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java index 23e169d5..33e2f2ae 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java +++ b/src/main/java/binnie/craftgui/genetics/machine/ControlGeneScroll.java @@ -40,7 +40,7 @@ public class ControlGeneScroll extends Control implements IControlValue> genes = Binnie.Genetics.getChromosomeMap(this.system.getSpeciesRoot()); + final Map> genes = Binnie.GENETICS.getChromosomeMap(this.system.getSpeciesRoot()); int x = 0; int y = 0; final boolean isNEI = ((WindowGeneBank) Window.get(this)).isNei; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java b/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java index fc6bc713..5f1de0c1 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java +++ b/src/main/java/binnie/craftgui/genetics/machine/WindowGeneBank.java @@ -103,7 +103,7 @@ public class WindowGeneBank extends WindowMachine { } }.setOrigin(EventHandler.Origin.Self, edit)); scroll.setScrollableContent(this.genes = new ControlGeneScroll(scroll, 1.0f, 1.0f, geneBoxWidth, 116.0f)); - this.genes.setGenes(Binnie.Genetics.beeBreedingSystem); + this.genes.setGenes(Binnie.GENETICS.beeBreedingSystem); final ControlTabBar tabBar = new ControlTabBar(this, boxX, 32.0f, 24.0f, 120.0f, Position.Left) { @Override public ControlTab createTab(final float x, final float y, final float w, final float h, final BreedingSystem value) { @@ -114,7 +114,7 @@ public class WindowGeneBank extends WindowMachine { int totalGenes = 0; int seqGenes = 0; final GeneTracker tracker = GeneTracker.getTracker(WindowGeneBank.this.getWorld(), WindowGeneBank.this.getUsername()); - final Map> genes = Binnie.Genetics.getChromosomeMap(this.getValue().getSpeciesRoot()); + final Map> genes = Binnie.GENETICS.getChromosomeMap(this.getValue().getSpeciesRoot()); for (final Map.Entry> entry : genes.entrySet()) { totalGenes += entry.getValue().size(); for (final IAllele allele : entry.getValue()) { @@ -129,8 +129,8 @@ public class WindowGeneBank extends WindowMachine { }; } }; - tabBar.setValues(Binnie.Genetics.getActiveSystems()); - tabBar.setValue(Binnie.Genetics.beeBreedingSystem); + tabBar.setValues(Binnie.GENETICS.getActiveSystems()); + tabBar.setValue(Binnie.GENETICS.beeBreedingSystem); boxX -= 8; final ControlTabBar infoTabs = new ControlTabBar<>(this, boxX + 8, 160.0f, 16.0f, 50.0f, Position.Left); infoTabs.setValues(Arrays.asList("Stats", "Ranking")); @@ -138,9 +138,9 @@ public class WindowGeneBank extends WindowMachine { final Panel panelProject = new Panel(this, boxX + 24, 160.0f, geneBoxWidth + 20, 50.0f, MinecraftGUI.PanelType.Black); int totalGenes = 0; int seqGenes = 0; - for (final BreedingSystem system : Binnie.Genetics.getActiveSystems()) { + for (final BreedingSystem system : Binnie.GENETICS.getActiveSystems()) { final GeneTracker tracker = GeneTracker.getTracker(this.getWorld(), this.getUsername()); - final Map> genes = Binnie.Genetics.getChromosomeMap(system.getSpeciesRoot()); + final Map> genes = Binnie.GENETICS.getChromosomeMap(system.getSpeciesRoot()); for (final Map.Entry> entry : genes.entrySet()) { totalGenes += entry.getValue().size(); for (final IAllele allele : entry.getValue()) { diff --git a/src/main/java/binnie/craftgui/minecraft/GUIIcon.java b/src/main/java/binnie/craftgui/minecraft/GUIIcon.java index f673344c..7de3f4ad 100644 --- a/src/main/java/binnie/craftgui/minecraft/GUIIcon.java +++ b/src/main/java/binnie/craftgui/minecraft/GUIIcon.java @@ -26,7 +26,7 @@ public enum GUIIcon { } public void register() { - this.icon = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/" + this.path); + this.icon = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/" + this.path); } public BinnieIcon getIcon() { diff --git a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java index b30a976d..b4492439 100644 --- a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java @@ -25,7 +25,6 @@ import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/craftgui/minecraft/Window.java index 6b519ed2..95d9f963 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/craftgui/minecraft/Window.java @@ -107,7 +107,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG protected abstract String getBackgroundTextureName(); public BinnieResource getBackgroundTextureFile(final int i) { - return Binnie.Resource.getPNG(this.getMod(), ResourceType.GUI, this.getBackgroundTextureName() + ((i == 1) ? "" : i)); + return Binnie.RESOURCE.getPNG(this.getMod(), ResourceType.GUI, this.getBackgroundTextureName() + ((i == 1) ? "" : i)); } public boolean showHelpButton() { diff --git a/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java index 1c8892b3..7295e7ff 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java @@ -23,8 +23,8 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme } public void setSpecies(final IAlleleSpecies species, EnumDiscoveryState state) { - final ISpeciesRoot speciesRoot = Binnie.Genetics.getSpeciesRoot(species); - final BreedingSystem system = Binnie.Genetics.getSystem(speciesRoot.getUID()); + final ISpeciesRoot speciesRoot = Binnie.GENETICS.getSpeciesRoot(species); + final BreedingSystem system = Binnie.GENETICS.getSystem(speciesRoot.getUID()); final IIndividual ind = system.getSpeciesRoot().templateAsIndividual(system.getSpeciesRoot().getTemplate(species.getUID())); super.setItemStack(system.getSpeciesRoot().getMemberStack(ind, system.getDefaultType())); this.species = species; diff --git a/src/main/java/binnie/craftgui/mod/database/DatabaseTab.java b/src/main/java/binnie/craftgui/mod/database/DatabaseTab.java index 240e7b8b..1da4cf96 100644 --- a/src/main/java/binnie/craftgui/mod/database/DatabaseTab.java +++ b/src/main/java/binnie/craftgui/mod/database/DatabaseTab.java @@ -18,11 +18,11 @@ public class DatabaseTab implements ITooltipHelp { @Override public String toString() { - return Binnie.Language.localise(this.mod, "gui.database.tab." + this.unloc); + return Binnie.LANGUAGE.localise(this.mod, "gui.database.tab." + this.unloc); } @Override public void getHelpTooltip(final Tooltip tooltip) { - tooltip.add(Binnie.Language.localiseOrBlank(this.mod, "gui.database.tab." + this.unloc + ".help")); + tooltip.add(Binnie.LANGUAGE.localiseOrBlank(this.mod, "gui.database.tab." + this.unloc + ".help")); } } diff --git a/src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java b/src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java index 01f0f3c0..8feda4eb 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java +++ b/src/main/java/binnie/craftgui/mod/database/PageBranchOverview.java @@ -28,16 +28,16 @@ public class PageBranchOverview extends PageBranch { @Override public void onValueChanged(final IClassification branch) { - this.pageBranchOverview_branchName.setValue(TextFormatting.UNDERLINE + branch.getName() + Binnie.Language.localise("binniecore.gui.database.branch.branch")); - this.pageBranchOverview_branchScientific.setValue(TextFormatting.ITALIC + Binnie.Language.localise("binniecore.gui.database.branch.apidae") + " " + branch.getScientific()); - this.pageBranchOverview_branchAuthority.setValue(Binnie.Language.localise("binniecore.gui.database.discovered") + " " + TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority()); + this.pageBranchOverview_branchName.setValue(TextFormatting.UNDERLINE + branch.getName() + Binnie.LANGUAGE.localise("binniecore.gui.database.branch.branch")); + this.pageBranchOverview_branchScientific.setValue(TextFormatting.ITALIC + Binnie.LANGUAGE.localise("binniecore.gui.database.branch.apidae") + " " + branch.getScientific()); + this.pageBranchOverview_branchAuthority.setValue(Binnie.LANGUAGE.localise("binniecore.gui.database.discovered") + " " + TextFormatting.BOLD + branch.getMemberSpecies()[0].getAuthority()); for (final IWidget widget : this.pageBranchOverview_branchDescription) { this.deleteChild(widget); } this.pageBranchOverview_branchDescription.clear(); String desc = branch.getDescription(); if (desc == null || Objects.equals(desc, "")) { - desc = Binnie.Language.localise("binniecore.gui.database.no.description"); + desc = Binnie.LANGUAGE.localise("binniecore.gui.database.no.description"); } String line = ""; final List descLines = new ArrayList<>(); diff --git a/src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java b/src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java index 0f2225d7..6982deb3 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java +++ b/src/main/java/binnie/craftgui/mod/database/PageBranchSpecies.java @@ -19,7 +19,7 @@ public class PageBranchSpecies extends PageBranch { public PageBranchSpecies(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.pageBranchSpecies_title = new ControlTextCentered(this, 8.0f, Binnie.Language.localise("binniecore.gui.database.species")); + this.pageBranchSpecies_title = new ControlTextCentered(this, 8.0f, Binnie.LANGUAGE.localise("binniecore.gui.database.species")); this.addEventHandler(new EventValueChanged.Handler() { @Override public void onEvent(final EventValueChanged event) { diff --git a/src/main/java/binnie/craftgui/mod/database/PageBreeder.java b/src/main/java/binnie/craftgui/mod/database/PageBreeder.java index 803934fa..091f79bb 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBreeder.java +++ b/src/main/java/binnie/craftgui/mod/database/PageBreeder.java @@ -24,13 +24,13 @@ public class PageBreeder extends ControlPage { } final BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem(); final String descriptor = system.getDescriptor(); - new ControlTextCentered(this, 8.0f, TextFormatting.UNDERLINE + system.getDescriptor() + " " + Binnie.Language.localise("binniecore.gui.database.breeder.profile")); - new ControlTextCentered(this, 75.0f, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + Binnie.Language.localise("binniecore.gui.database.species")); + new ControlTextCentered(this, 8.0f, TextFormatting.UNDERLINE + system.getDescriptor() + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.profile")); + new ControlTextCentered(this, 75.0f, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.species")); new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage); - new ControlTextCentered(this, 115.0f, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + Binnie.Language.localise("binniecore.gui.database.breeder.branches")); + new ControlTextCentered(this, 115.0f, "" + system.discoveredBranchCount + "/" + system.totalBranchCount + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.branches")); new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage); if (system.discoveredSecretCount > 0) { - new ControlTextCentered(this, 155.0f, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + Binnie.Language.localise("binniecore.gui.database.breeder.species.secret")); + new ControlTextCentered(this, 155.0f, "" + system.discoveredSecretCount + "/" + system.totalSecretCount + " " + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.species.secret")); } new ControlTextCentered(this, 32.0f, this.player.getName()); new ControlTextCentered(this, 44.0f, TextFormatting.ITALIC + system.getEpitome()); diff --git a/src/main/java/binnie/craftgui/mod/database/PageBreederStats.java b/src/main/java/binnie/craftgui/mod/database/PageBreederStats.java index 3f37f1b7..d5689f84 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageBreederStats.java +++ b/src/main/java/binnie/craftgui/mod/database/PageBreederStats.java @@ -14,7 +14,7 @@ public class PageBreederStats extends Control { public PageBreederStats(final IWidget parent, final int w, final int h, final String player) { super(parent, 0.0f, 0.0f, w, h); this.player = player; - final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8.0f, TextFormatting.UNDERLINE + Binnie.Language.localise("binniecore.gui.database.breeder.stats")); + final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8.0f, TextFormatting.UNDERLINE + Binnie.LANGUAGE.localise("binniecore.gui.database.breeder.stats")); final BreedingSystem system = ((WindowAbstractDatabase) this.getSuperParent()).getBreedingSystem(); } } diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesMutations.java b/src/main/java/binnie/craftgui/mod/database/PageSpeciesMutations.java index e2c70fa1..78fb0520 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesMutations.java +++ b/src/main/java/binnie/craftgui/mod/database/PageSpeciesMutations.java @@ -12,7 +12,7 @@ public class PageSpeciesMutations extends PageSpecies { public PageSpeciesMutations(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8.0f, Binnie.Language.localise("binniecore.gui.database.mutations.further")); + this.pageSpeciesFurther_Title = new ControlTextCentered(this, 8.0f, Binnie.LANGUAGE.localise("binniecore.gui.database.mutations.further")); this.pageSpeciesFurther_List = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Further); } diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java b/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java index 35b21b9f..0a0d2e1c 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java @@ -43,13 +43,13 @@ public class PageSpeciesOverview extends PageSpecies { final String branchName = (species.getBranch() != null) ? species.getBranch().getName() : "Unknown"; this.controlName.setValue(TextFormatting.UNDERLINE + species.getName()); this.controlScientific.setValue(TextFormatting.ITALIC + branchBinomial + " " + species.getBinomial()); - this.controlAuthority.setValue(Binnie.Language.localise("binniecore.gui.database.discovered") + ": " + TextFormatting.BOLD + species.getAuthority()); - this.controlComplexity.setValue(Binnie.Language.localise("binniecore.gui.database.overview.complexity") + ": " + species.getComplexity()); + this.controlAuthority.setValue(Binnie.LANGUAGE.localise("binniecore.gui.database.discovered") + ": " + TextFormatting.BOLD + species.getAuthority()); + this.controlComplexity.setValue(Binnie.LANGUAGE.localise("binniecore.gui.database.overview.complexity") + ": " + species.getComplexity()); final String desc = species.getDescription(); String descBody = TextFormatting.ITALIC.toString(); String descSig = ""; if (desc == null || Objects.equals(desc, "")) { - descBody += Binnie.Language.localise("binniecore.gui.database.no.description"); + descBody += Binnie.LANGUAGE.localise("binniecore.gui.database.no.description"); } else { final String[] descStrings = desc.split("\\|"); descBody += descStrings[0]; diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesResultant.java b/src/main/java/binnie/craftgui/mod/database/PageSpeciesResultant.java index e8b97a4c..52f8237d 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesResultant.java +++ b/src/main/java/binnie/craftgui/mod/database/PageSpeciesResultant.java @@ -12,7 +12,7 @@ public class PageSpeciesResultant extends PageSpecies { public PageSpeciesResultant(final IWidget parent, final DatabaseTab tab) { super(parent, tab); - this.pageSpeciesResultant_Title = new ControlTextCentered(this, 8.0f, Binnie.Language.localise("binniecore.gui.database.mutations.resultant")); + this.pageSpeciesResultant_Title = new ControlTextCentered(this, 8.0f, Binnie.LANGUAGE.localise("binniecore.gui.database.mutations.resultant")); this.pageSpeciesResultant_List = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.Resultant); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java index 36b55c38..cd9a06f2 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java @@ -62,7 +62,7 @@ public class AlvearyFrame { return; } final World world = this.getMachine().getTileEntity().getWorld(); - final int wear = Math.round(amount * 5 * Binnie.Genetics.getBeeRoot().getBeekeepingMode(world).getWearModifier()); + final int wear = Math.round(amount * 5 * Binnie.GENETICS.getBeeRoot().getBeekeepingMode(world).getWearModifier()); this.getInventory().setInventorySlotContents(AlvearyFrame.slotFrame, this.getHiveFrame().frameUsed(((TileExtraBeeAlveary) this.getMachine().getTileEntity()).getMultiblockLogic().getController(), this.getInventory().getStackInSlot(AlvearyFrame.slotFrame), null, wear)); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java index e14aa865..42cb2544 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java @@ -48,7 +48,7 @@ public class AlvearyHatchery { @Override public boolean isValid(final ItemStack itemStack) { - return Binnie.Genetics.getBeeRoot().isMember(itemStack) && Binnie.Genetics.getBeeRoot().getType(itemStack) == EnumBeeType.LARVAE; + return Binnie.GENETICS.getBeeRoot().isMember(itemStack) && Binnie.GENETICS.getBeeRoot().getType(itemStack) == EnumBeeType.LARVAE; } @Override @@ -70,9 +70,9 @@ public class AlvearyHatchery { final IBeeHousing house = ((TileExtraBeeAlveary) tile).getMultiblockLogic().getController(); if (house != null && !house.getErrorLogic().hasErrors()) { final ItemStack queenStack = house.getBeeInventory().getQueen(); - final IBee queen = (queenStack == null) ? null : Binnie.Genetics.getBeeRoot().getMember(queenStack); + final IBee queen = (queenStack == null) ? null : Binnie.GENETICS.getBeeRoot().getMember(queenStack); if (queen != null) { - final ItemStack larvae = Binnie.Genetics.getBeeRoot().getMemberStack(Binnie.Genetics.getBeeRoot().getBee(queen.getGenome()), EnumBeeType.LARVAE); + final ItemStack larvae = Binnie.GENETICS.getBeeRoot().getMemberStack(Binnie.GENETICS.getBeeRoot().getBee(queen.getGenome()), EnumBeeType.LARVAE); new TransferRequest(larvae, this.getInventory()).transfer(true); } } diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java index 9604a8d9..08304cf9 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java @@ -104,7 +104,7 @@ public enum ExtraBeeItems implements IItemMiscProvider { if (woodGear != null) { gear = new ItemStack(woodGear, 1); } - RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("for.honey", 500), null, ExtraBeeItems.ScentedGear.get(1), " j ", "bgb", " p ", 'j', Mods.Forestry.item("royalJelly"), 'b', Mods.Forestry.item("beeswax"), 'p', Mods.Forestry.item("pollen"), 'g', gear); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("for.honey", 500), null, ExtraBeeItems.ScentedGear.get(1), " j ", "bgb", " p ", 'j', Mods.Forestry.item("royalJelly"), 'b', Mods.Forestry.item("beeswax"), 'p', Mods.Forestry.item("pollen"), 'g', gear); } ExtraBeeItems(String name, String modelPath) { diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java b/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java index e73bffef..989f4afe 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java @@ -30,6 +30,6 @@ public enum ExtraBeeTexture implements IBinnieTexture { @Override public BinnieResource getTexture() { - return Binnie.Resource.getPNG(ExtraBees.instance, this.type, this.texture); + return Binnie.RESOURCE.getPNG(ExtraBees.instance, this.type, this.texture); } } diff --git a/src/main/java/binnie/extrabees/core/ModuleCore.java b/src/main/java/binnie/extrabees/core/ModuleCore.java index 9a4a048e..57205c50 100644 --- a/src/main/java/binnie/extrabees/core/ModuleCore.java +++ b/src/main/java/binnie/extrabees/core/ModuleCore.java @@ -9,7 +9,7 @@ import forestry.api.core.Tabs; public class ModuleCore implements IInitializable { @Override public void preInit() { - ExtraBees.itemMisc = new ItemMisc(Tabs.tabApiculture, (IItemMiscProvider[]) ExtraBeeItems.values()); + ExtraBees.itemMisc = new ItemMisc(Tabs.tabApiculture, ExtraBeeItems.values()); ExtraBees.proxy.registerItem(ExtraBees.itemMisc); } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index 5d87dc0b..3d59ddbd 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -183,7 +183,7 @@ public class ExtraBeeMutation implements IBeeMutation { new ExtraBeeMutation(ExtraBeesSpecies.SPATIAL, ForestryAllele.BeeSpecies.Spectral.getAllele(), ExtraBeesSpecies.QUANTUM, 5); new ExtraBeeMutation(ForestryAllele.BeeSpecies.Noble.getAllele(), ForestryAllele.BeeSpecies.Monastic.getAllele(), ExtraBeesSpecies.MYSTICAL, 5); for (final IBeeMutation mutation : ExtraBeeMutation.mutations) { - Binnie.Genetics.getBeeRoot().registerMutation(mutation); + Binnie.GENETICS.getBeeRoot().registerMutation(mutation); } } @@ -262,7 +262,7 @@ public class ExtraBeeMutation implements IBeeMutation { } final int processedChance = Math.round(this.chance * BeeManager.beeRoot.createBeeHousingModifier(housing).getMutationModifier(genome0, genome1, 1.0f) - * Binnie.Genetics.getBeeRoot().getBeekeepingMode(world).getBeeModifier().getMutationModifier(genome0, genome1, 1.0f)); + * Binnie.GENETICS.getBeeRoot().getBeekeepingMode(world).getBeeModifier().getMutationModifier(genome0, genome1, 1.0f)); if (this.species0.getUID().equals(allele0.getUID()) && this.species1.getUID().equals(allele1.getUID())) { return processedChance; } @@ -283,7 +283,7 @@ public class ExtraBeeMutation implements IBeeMutation { @Override public IBeeRoot getRoot() { - return Binnie.Genetics.getBeeRoot(); + return Binnie.GENETICS.getBeeRoot(); } abstract static class MutationRequirement { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index 5dd24e5b..e2707473 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -310,7 +310,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } public void registerTemplate() { - Binnie.Genetics.getBeeRoot().registerTemplate(this.getTemplate()); + Binnie.GENETICS.getBeeRoot().registerTemplate(this.getTemplate()); if (this.state != State.Active) { AlleleManager.alleleRegistry.blacklistAllele(this.getUID()); } @@ -361,7 +361,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } public static IAllele[] getDefaultTemplate() { - return Binnie.Genetics.getBeeRoot().getDefaultTemplate(); + return Binnie.GENETICS.getBeeRoot().getDefaultTemplate(); } public IAllele[] getTemplate() { @@ -908,7 +908,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { @Override public IBeeRoot getRoot() { - return Binnie.Genetics.getBeeRoot(); + return Binnie.GENETICS.getBeeRoot(); } @Override diff --git a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java index 5fc0f142..373f73b1 100644 --- a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java @@ -47,11 +47,11 @@ public class ModuleGenetics implements IInitializable { ++ebSpeciesCount; } } - RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("water", 2000), null, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); } public static IGenome getGenome(final IAlleleBeeSpecies allele0) { - return Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(allele0.getUID())); + return Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(allele0.getUID())); } // public static ItemStack getBeeIcon(final IAlleleBeeSpecies species) { diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index be1b1fca..a2fd3932 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -416,7 +416,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } IFluidHandler fluidHandler = TileUtil.getCapability(world, pos, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP); if (fluidHandler != null) { - fluidHandler.fill(Binnie.Liquid.getFluidStack("water", 100), true); + fluidHandler.fill(Binnie.LIQUID.getFluidStack("water", 100), true); break; } break; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java index 678760e5..036f773c 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java @@ -60,7 +60,7 @@ public class ControlBiomes extends Control implements ITooltip { if (species == null) { return; } - final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID())); - final IBee bee = Binnie.Genetics.getBeeRoot().getBee(genome); + final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID())); + final IBee bee = Binnie.GENETICS.getBeeRoot().getBee(genome); } } diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java index 7b45812b..9ab3e43e 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java @@ -91,11 +91,11 @@ public class ControlClimateBar extends Control implements ITooltip { EnumTolerance tolerance; if (!this.isHumidity) { main = species.getTemperature().ordinal() - 1; - final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID())); + final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID())); tolerance = genome.getToleranceTemp(); } else { main = species.getHumidity().ordinal(); - final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID())); + final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID())); tolerance = genome.getToleranceHumid(); } this.tolerated.add(main); diff --git a/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java b/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java index abf26502..4b80fc1b 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlProductsBox.java @@ -31,13 +31,13 @@ public class ControlProductsBox extends ControlListBox strings = new ArrayList<>(); if (this.type == Type.Products) { for (final Map.Entry entry : species.getProductChances().entrySet()) { diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java b/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java index e5f5c505..d63bec61 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java +++ b/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java @@ -55,10 +55,10 @@ public class PageSpeciesGenome extends PageSpecies { @Override public void onValueChanged(final IAlleleSpecies species) { - final IAllele[] template = Binnie.Genetics.getBeeRoot().getTemplate(species.getUID()); + final IAllele[] template = Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID()); if (template != null) { - final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template); - final IBee bee = Binnie.Genetics.getBeeRoot().getBee(genome); + final IBeeGenome genome = Binnie.GENETICS.getBeeRoot().templateAsGenome(template); + final IBee bee = Binnie.GENETICS.getBeeRoot().getBee(genome); this.pageSpeciesGenome_SpeedText.setValue(rateSpeed(genome.getSpeed())); this.pageSpeciesGenome_LifespanText.setValue(rateLifespan(genome.getLifespan())); this.pageSpeciesGenome_FertilityText.setValue(genome.getFertility() + " children"); diff --git a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java b/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java index 8a824e33..69f56965 100644 --- a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java @@ -32,7 +32,7 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase { } public WindowApiaristDatabase(final EntityPlayer player, final Side side, final boolean nei) { - super(player, side, nei, Binnie.Genetics.beeBreedingSystem, 110.0f); + super(player, side, nei, Binnie.GENETICS.beeBreedingSystem, 110.0f); } public static Window create(final EntityPlayer player, final Side side, final boolean nei) { diff --git a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java index 6251db71..34fecd4f 100644 --- a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java +++ b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java @@ -48,7 +48,7 @@ public enum ExtraBeeLiquid implements ILiquidType { @Override public FluidStack get(final int amount) { - return Binnie.Liquid.getFluidStack(this.ident, amount); + return Binnie.LIQUID.getFluidStack(this.ident, amount); } @Override diff --git a/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java b/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java index 9373d9c8..d8828f6e 100644 --- a/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java +++ b/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java @@ -7,7 +7,7 @@ import binnie.core.liquid.ItemFluidContainer; public class ModuleLiquids implements IInitializable { @Override public void preInit() { - Binnie.Liquid.createLiquids(ExtraBeeLiquid.values(), ItemFluidContainer.LiquidExtraBee); + Binnie.LIQUID.createLiquids(ExtraBeeLiquid.values(), ItemFluidContainer.LiquidExtraBee); } @Override diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java index 1481437b..1c4d3102 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java @@ -62,7 +62,7 @@ public enum EnumHoneyDrop implements IItemEnum { } public void addRecipe() { - final FluidStack liquid = Binnie.Liquid.getFluidStack(this.liquidName, 200); + final FluidStack liquid = Binnie.LIQUID.getFluidStack(this.liquidName, 200); if (liquid != null) { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{this.get(1)}, liquid, this.remenant, 100); } diff --git a/src/main/java/binnie/extrabees/products/EnumPropolis.java b/src/main/java/binnie/extrabees/products/EnumPropolis.java index 02e24381..a16f5061 100644 --- a/src/main/java/binnie/extrabees/products/EnumPropolis.java +++ b/src/main/java/binnie/extrabees/products/EnumPropolis.java @@ -36,7 +36,7 @@ public enum EnumPropolis implements IItemEnum { } public void addRecipe() { - final FluidStack liquid = Binnie.Liquid.getFluidStack(this.liquidName, 500); + final FluidStack liquid = Binnie.LIQUID.getFluidStack(this.liquidName, 500); if (liquid != null) { RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[]{this.get(1)}, liquid, null, 0); } @@ -44,7 +44,7 @@ public enum EnumPropolis implements IItemEnum { @Override public boolean isActive() { - return this.active && Binnie.Liquid.getFluidStack(this.liquidName, 100) != null; + return this.active && Binnie.LIQUID.getFluidStack(this.liquidName, 100) != null; } public static EnumPropolis get(final ItemStack itemStack) { diff --git a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java index 94a57c5b..6ada7c10 100644 --- a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java +++ b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java @@ -19,13 +19,13 @@ public class HiveDrop implements IHiveDrop { private int chance; public HiveDrop(final IAlleleBeeSpecies species, final int chance) { - this(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID()), new ItemStack[0], chance); + this(Binnie.GENETICS.getBeeRoot().getTemplate(species.getUID()), new ItemStack[0], chance); } public HiveDrop(IAllele[] template, final ItemStack[] bonus, final int chance) { this.additional = new ArrayList<>(); if (template == null) { - template = Binnie.Genetics.getBeeRoot().getDefaultTemplate(); + template = Binnie.GENETICS.getBeeRoot().getDefaultTemplate(); } this.template = template; this.chance = chance; @@ -53,7 +53,7 @@ public class HiveDrop implements IHiveDrop { @Override public IBee getBeeType(IBlockAccess world, BlockPos pos) { - return Binnie.Genetics.getBeeRoot().getBee(Binnie.Genetics.getBeeRoot().templateAsGenome(this.template)); + return Binnie.GENETICS.getBeeRoot().getBee(Binnie.GENETICS.getBeeRoot().templateAsGenome(this.template)); } } diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index c96711dc..7755b681 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -4,23 +4,13 @@ import binnie.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; -import binnie.core.item.ItemMisc; import binnie.core.models.DoublePassBakedModel; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; import binnie.extrabees.ExtraBees; import binnie.extratrees.alcohol.ModuleAlcohol; -import binnie.extratrees.alcohol.drink.ItemDrink; -import binnie.extratrees.block.BlockETDecorativeLeaves; import binnie.extratrees.block.ModuleBlocks; import binnie.extratrees.block.PlankType; -import binnie.extratrees.block.decor.BlockHedge; -import binnie.extratrees.block.decor.BlockMultiFence; -import binnie.extratrees.block.log.BlockETLog; -import binnie.extratrees.block.plank.BlockETPlank; -import binnie.extratrees.block.slab.BlockETSlab; -import binnie.extratrees.carpentry.BlockCarpentry; -import binnie.extratrees.carpentry.BlockStainedDesign; import binnie.extratrees.carpentry.ModuleCarpentry; import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.core.ExtraTreesGUID; @@ -32,11 +22,7 @@ import binnie.extratrees.proxy.Proxy; import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.AlleleSpeciesRegisterEvent; -import forestry.arboriculture.blocks.BlockForestryStairs; -import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; @@ -52,6 +38,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import javax.annotation.Nullable; + +import com.google.common.base.Preconditions; + @Mod(modid = Constants.EXTRA_TREES_MOD_ID, name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraTrees extends AbstractMod { @@ -59,43 +49,6 @@ public class ExtraTrees extends AbstractMod { public static ExtraTrees instance; @SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer") public static Proxy proxy; - public static Item itemDictionary; - public static Item itemDictionaryLepi; - public static ItemMisc itemMisc; - public static Item itemFood; - public static List logs; - public static List logsFireproof; - public static List planks; - public static List planksFireproof; - public static List slabs; - public static List slabsDouble; - public static List slabsFireproof; - public static List slabsDoubleFireproof; - public static List stairs; - public static List stairsFireproof; - public static List leavesDecorative; - public static Map speciesToLeavesDecorative; - public static Block blockStairs; - public static BlockCarpentry blockCarpentry; - public static Block blockMachine; - public static Block blockFence; - public static BlockCarpentry blockPanel; - public static Block blockKitchen; - public static Item itemHammer; - public static Item itemDurableHammer; - public static Block blockGate; - public static Block blockDoor; - public static Block blockBranch; - public static ItemDrink drink; - public static BlockMultiFence blockMultiFence; - public static Block blockDrink; - public static BlockHedge blockHedge; - public static BlockStainedDesign blockStained; - public static int fruitPodRenderId; - public static int doorRenderId; - public static int branchRenderId; - public static int fenceID; - public static int stairsID; @Mod.EventHandler public void onConstruction(FMLConstructionEvent e) { @@ -116,15 +69,52 @@ public class ExtraTrees extends AbstractMod { public void postInit(final FMLPostInitializationEvent evt) { this.postInit(); } + + @Nullable + private static ModuleBlocks blocks; + @Nullable + private static ModuleItems items; + @Nullable + private static ModuleAlcohol alcohol; + @Nullable + private static ModuleCarpentry carpentry; + @Nullable + private static ModuleMachine machine; + + public static ModuleItems items() { + Preconditions.checkState(items != null); + return items; + } + + public static ModuleBlocks blocks() { + Preconditions.checkState(blocks != null); + return blocks; + } + + public static ModuleAlcohol alcohol() { + Preconditions.checkState(alcohol != null); + return alcohol; + } + + + public static ModuleCarpentry carpentry() { + Preconditions.checkState(carpentry != null); + return carpentry; + } + + public static ModuleMachine machine() { + Preconditions.checkState(machine != null); + return machine; + } @Override protected void registerModules() { - this.addModule(new ModuleBlocks()); - this.addModule(new ModuleItems()); - this.addModule(new ModuleAlcohol()); + this.addModule(blocks = new ModuleBlocks()); + this.addModule(items = new ModuleItems()); + this.addModule(alcohol = new ModuleAlcohol()); this.addModule(new ModuleGenetics()); - this.addModule(new ModuleCarpentry()); - this.addModule(new ModuleMachine()); + this.addModule(carpentry = new ModuleCarpentry()); + this.addModule(machine = new ModuleMachine()); this.addModule(new ModuleCore()); } diff --git a/src/main/java/binnie/extratrees/alcohol/Alcohol.java b/src/main/java/binnie/extratrees/alcohol/Alcohol.java index 186a2614..5f2931a4 100644 --- a/src/main/java/binnie/extratrees/alcohol/Alcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/Alcohol.java @@ -98,7 +98,7 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { @Override public FluidStack get(final int amount) { - return Binnie.Liquid.getFluidStack(this.getIdentifier(), amount); + return Binnie.LIQUID.getFluidStack(this.getIdentifier(), amount); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/src/main/java/binnie/extratrees/alcohol/Glassware.java index c2076485..4f755f20 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -32,7 +32,7 @@ public enum Glassware { if (liquid == null) { return ExtraTrees.proxy.localise("item.glassware." + this.name().toLowerCase()); } - return Binnie.Language.localise(ExtraTrees.instance, "item.glassware." + this.name().toLowerCase() + ".usage", liquid); + return Binnie.LANGUAGE.localise(ExtraTrees.instance, "item.glassware." + this.name().toLowerCase() + ".usage", liquid); } public int getCapacity() { diff --git a/src/main/java/binnie/extratrees/alcohol/Juice.java b/src/main/java/binnie/extratrees/alcohol/Juice.java index 86d39a6b..b9d5b86b 100644 --- a/src/main/java/binnie/extratrees/alcohol/Juice.java +++ b/src/main/java/binnie/extratrees/alcohol/Juice.java @@ -90,7 +90,7 @@ public enum Juice implements IFluidType, ICocktailLiquid { @Override public FluidStack get(final int amount) { - return Binnie.Liquid.getFluidStack(this.getIdentifier(), amount); + return Binnie.LIQUID.getFluidStack(this.getIdentifier(), amount); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/Liqueur.java b/src/main/java/binnie/extratrees/alcohol/Liqueur.java index 38616839..67f224d8 100644 --- a/src/main/java/binnie/extratrees/alcohol/Liqueur.java +++ b/src/main/java/binnie/extratrees/alcohol/Liqueur.java @@ -89,7 +89,7 @@ public enum Liqueur implements IFluidType, ICocktailLiquid { @Override public FluidStack get(final int amount) { - return Binnie.Liquid.getFluidStack(this.getIdentifier(), amount); + return Binnie.LIQUID.getFluidStack(this.getIdentifier(), amount); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java index b3296e4e..20040000 100644 --- a/src/main/java/binnie/extratrees/alcohol/MiscFluid.java +++ b/src/main/java/binnie/extratrees/alcohol/MiscFluid.java @@ -72,7 +72,7 @@ public enum MiscFluid implements IFluidType, ICocktailLiquid { @Override public FluidStack get(final int amount) { - return Binnie.Liquid.getFluidStack(this.getIdentifier(), amount); + return Binnie.LIQUID.getFluidStack(this.getIdentifier(), amount); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index 3b9ee832..ddd2c9e9 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -18,9 +18,9 @@ import binnie.extratrees.machines.distillery.DistilleryRecipes; import binnie.extratrees.machines.fruitpress.FruitPressRecipes; import forestry.api.recipes.ISqueezerRecipe; import forestry.api.recipes.RecipeManagers; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; @@ -29,20 +29,22 @@ import java.util.List; import java.util.Objects; public class ModuleAlcohol implements IInitializable { + public static ItemDrink drink; + public static Block blockDrink; public static int drinkRendererID; public static BinnieIcon liquid; @Override public void preInit() { - ModuleAlcohol.liquid = Binnie.Resource.getBlockIcon(ExtraTrees.instance, "liquids/liquid"); + ModuleAlcohol.liquid = Binnie.RESOURCE.getBlockIcon(ExtraTrees.instance, "liquids/liquid"); //ModuleAlcohol.drinkRendererID = BinnieCore.proxy.getUniqueRenderID(); - ExtraTrees.drink = new ItemDrink(); - ExtraTrees.proxy.registerItem(ExtraTrees.drink); + drink = new ItemDrink(); + ExtraTrees.proxy.registerItem(drink); //BinnieCore.proxy.registerCustomItemRenderer(ExtraTrees.drink, new CocktailRenderer()); - Binnie.Liquid.createLiquids(Juice.values(), ItemFluidContainer.LiquidJuice); - Binnie.Liquid.createLiquids(Alcohol.values(), ItemFluidContainer.LiquidAlcohol); - Binnie.Liquid.createLiquids(Spirit.values(), ItemFluidContainer.LiquidSpirit); - Binnie.Liquid.createLiquids(Liqueur.values(), ItemFluidContainer.LiquidLiqueuer); + Binnie.LIQUID.createLiquids(Juice.values(), ItemFluidContainer.LiquidJuice); + Binnie.LIQUID.createLiquids(Alcohol.values(), ItemFluidContainer.LiquidAlcohol); + Binnie.LIQUID.createLiquids(Spirit.values(), ItemFluidContainer.LiquidSpirit); + Binnie.LIQUID.createLiquids(Liqueur.values(), ItemFluidContainer.LiquidLiqueuer); for (final Juice juice : Juice.values()) { Cocktail.registerIngredient(juice); } @@ -90,7 +92,7 @@ public class ModuleAlcohol implements IInitializable { } for (final Alcohol alcohol : Alcohol.values()) { for (final String fermentLiquid : alcohol.fermentationLiquid) { - final FluidStack fluid = Binnie.Liquid.getFluidStack(fermentLiquid, Fluid.BUCKET_VOLUME); + final FluidStack fluid = Binnie.LIQUID.getFluidStack(fermentLiquid, Fluid.BUCKET_VOLUME); if (fluid != null) { BreweryRecipes.addRecipe(fluid, alcohol.get(Fluid.BUCKET_VOLUME)); } diff --git a/src/main/java/binnie/extratrees/alcohol/Spirit.java b/src/main/java/binnie/extratrees/alcohol/Spirit.java index 7578188f..781b46dc 100644 --- a/src/main/java/binnie/extratrees/alcohol/Spirit.java +++ b/src/main/java/binnie/extratrees/alcohol/Spirit.java @@ -92,7 +92,7 @@ public enum Spirit implements IFluidType, ICocktailLiquid { @Override public FluidStack get(final int amount) { - return Binnie.Liquid.getFluidStack(this.getIdentifier(), amount); + return Binnie.LIQUID.getFluidStack(this.getIdentifier(), amount); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java b/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java index df3964ab..db20afff 100644 --- a/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java +++ b/src/main/java/binnie/extratrees/alcohol/drink/DrinkLiquid.java @@ -54,6 +54,6 @@ public class DrinkLiquid implements IDrinkLiquid { @Override public FluidStack get(final int amount) { - return Binnie.Liquid.getFluidStack(this.ident, amount); + return Binnie.LIQUID.getFluidStack(this.ident, amount); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 9ac9b70f..7bde0759 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -210,42 +210,32 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { // public boolean hasTileEntity(final int meta) { // return true; // } -// -// @Override -// public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { -// super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); -// final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); -// return tileentity != null && tileentity.receiveClientEvent(par5, par6); -// } + + @Override + public boolean eventReceived(IBlockState state, World world, BlockPos pos, int id, int param) { + TileEntity tileentity = world.getTileEntity(pos); + return tileentity != null && tileentity.receiveClientEvent(id, param); + } @Override public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) { return TileEntityMetadata.getItemDamage(stack); } - + @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { - return tileMeta; + public int getDroppedMeta(IBlockState state, int tileMetadata) { + return tileMetadata; } @Override - public String getBlockName(final ItemStack par1ItemStack) { + public String getDisplayName(ItemStack par1ItemStack) { final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); final String typeName = getDoorType(meta).getName(); final String woodName = WoodManager.getPlankType(meta & 0xFF).getName(); if (typeName.equals("")) { - return Binnie.Language.localise(ExtraTrees.instance, "block.door.name", woodName); + return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.door.name", woodName); } - return Binnie.Language.localise(ExtraTrees.instance, "block.door.name.adv", woodName, typeName); - } - - @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { - } - - @Override - public void dropAsStack(final World world, final BlockPos pos, final ItemStack drop) { - //this.dropBlockAsItem(world, x, y, z, drop); + return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.door.name.adv", woodName, typeName); } @Override @@ -256,11 +246,12 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { for (final IPlankType type : PlankType.ForestryPlanks.values()) { itemList.add(WoodManager.getDoor(type, DoorType.Standard)); } - for (final IPlankType type : PlankType.ExtraBiomesPlank.values()) { + //TODO: extrabiomes 1.10.2 + /*for (final IPlankType type : PlankType.ExtraBiomesPlank.values()) { if (type.getStack() != null) { itemList.add(WoodManager.getDoor(type, DoorType.Standard)); } - } + }*/ for (final IPlankType type : PlankType.VanillaPlanks.values()) { itemList.add(WoodManager.getDoor(type, DoorType.Standard)); } diff --git a/src/main/java/binnie/extratrees/block/IPlankType.java b/src/main/java/binnie/extratrees/block/IPlankType.java index a41ca22f..83b5fa40 100644 --- a/src/main/java/binnie/extratrees/block/IPlankType.java +++ b/src/main/java/binnie/extratrees/block/IPlankType.java @@ -1,9 +1,12 @@ package binnie.extratrees.block; import binnie.extratrees.api.IDesignMaterial; +import forestry.api.arboriculture.IWoodType; public interface IPlankType extends IDesignMaterial { // IIcon getIcon(); String getPlankTextureName(); String getDescription(); + + IWoodType getWoodType(); } diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index a02f7a77..40936e38 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -2,6 +2,8 @@ package binnie.extratrees.block; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import binnie.Constants; import binnie.core.IInitializable; @@ -10,13 +12,12 @@ import binnie.core.block.ItemMetadata; import binnie.core.liquid.ILiquidType; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.decor.*; -import binnie.extratrees.block.log.BlockETLog; -import binnie.extratrees.block.log.ItemETLog; -import binnie.extratrees.block.plank.BlockETPlank; -import binnie.extratrees.block.plank.ItemETPlank; -import binnie.extratrees.block.slab.BlockETSlab; -import binnie.extratrees.block.slab.ItemETSlab; -import binnie.extratrees.block.stairs.ItemETStairs; +import binnie.extratrees.block.wood.BlockETFence; +import binnie.extratrees.block.wood.BlockETLog; +import binnie.extratrees.block.wood.BlockETPlank; +import binnie.extratrees.block.wood.BlockETSlab; +import binnie.extratrees.block.wood.ItemBlockETWood; +import binnie.extratrees.block.wood.ItemETSlab; import binnie.extratrees.genetics.ETTreeDefinition; import binnie.extratrees.item.ExtraTreeLiquid; import forestry.api.arboriculture.EnumVanillaWoodType; @@ -26,6 +27,7 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; import forestry.api.recipes.RecipeManagers; import forestry.arboriculture.WoodAccess; +import forestry.arboriculture.blocks.BlockForestryFenceGate; import forestry.arboriculture.blocks.BlockForestryStairs; import forestry.core.recipes.RecipeUtil; import forestry.core.utils.OreDictUtil; @@ -46,67 +48,89 @@ import net.minecraftforge.oredict.RecipeSorter; public class ModuleBlocks implements IInitializable { // public static int hedgeRenderID; + public static List logs; + public static List logsFireproof; + public static List planks; + public static List planksFireproof; + public static List slabs; + public static List slabsDouble; + public static List slabsFireproof; + public static List slabsDoubleFireproof; + public static List stairs; + public static List stairsFireproof; + public static List fences; + public static List fencesFireproof; + public static List fenceGates; + public static List fenceGatesFireproof; + public static List leavesDecorative; + public static Map speciesToLeavesDecorative; + public static Block blockDoor; + public static BlockMultiFence blockMultiFence; + public static BlockHedge blockHedge; + //???? + public static Block blockBranch; + @Override public void preInit() { PlankType.setup(); //TODO: clean up - ExtraTrees.logs = BlockETLog.create(false); - for (BlockETLog block : ExtraTrees.logs) { - ExtraTrees.proxy.registerBlock(block, new ItemETLog(block)); + logs = BlockETLog.create(false); + for (BlockETLog block : logs) { + ExtraTrees.proxy.registerBlock(block, new ItemBlockETWood(block)); registerOreDictWildcard(OreDictUtil.LOG_WOOD, block); } - ExtraTrees.logsFireproof = BlockETLog.create(true); - for (BlockETLog block : ExtraTrees.logsFireproof) { - ExtraTrees.proxy.registerBlock(block, new ItemETLog(block)); + logsFireproof = BlockETLog.create(true); + for (BlockETLog block : logsFireproof) { + ExtraTrees.proxy.registerBlock(block, new ItemBlockETWood(block)); registerOreDictWildcard(OreDictUtil.LOG_WOOD, block); } WoodAccess woodAccess = WoodAccess.getInstance(); - woodAccess.registerLogs(ExtraTrees.logs); - woodAccess.registerLogs(ExtraTrees.logsFireproof); + woodAccess.registerLogs(logs); + woodAccess.registerLogs(logsFireproof); - ExtraTrees.planks = BlockETPlank.create(false); - for (BlockETPlank block : ExtraTrees.planks) { - ExtraTrees.proxy.registerBlock(block, new ItemETPlank(block)); + planks = BlockETPlank.create(false); + for (BlockETPlank block : planks) { + ExtraTrees.proxy.registerBlock(block, new ItemBlockETWood(block)); registerOreDictWildcard(OreDictUtil.PLANK_WOOD, block); } - ExtraTrees.planksFireproof = BlockETPlank.create(true); - for (BlockETPlank block : ExtraTrees.planksFireproof) { - ExtraTrees.proxy.registerBlock(block, new ItemETPlank(block)); + planksFireproof = BlockETPlank.create(true); + for (BlockETPlank block : planksFireproof) { + ExtraTrees.proxy.registerBlock(block, new ItemBlockETWood(block)); registerOreDictWildcard(OreDictUtil.PLANK_WOOD, block); } - woodAccess.registerPlanks(ExtraTrees.planks); - woodAccess.registerPlanks(ExtraTrees.planksFireproof); + woodAccess.registerPlanks(planks); + woodAccess.registerPlanks(planksFireproof); - ExtraTrees.slabs = BlockETSlab.create(false, false); - ExtraTrees.slabsDouble = BlockETSlab.create(false, true); - for (int i = 0; i < ExtraTrees.slabs.size(); i++) { - BlockETSlab slab = ExtraTrees.slabs.get(i); - BlockETSlab slabDouble = ExtraTrees.slabsDouble.get(i); + slabs = BlockETSlab.create(false, false); + slabsDouble = BlockETSlab.create(false, true); + for (int i = 0; i < slabs.size(); i++) { + BlockETSlab slab = slabs.get(i); + BlockETSlab slabDouble = slabsDouble.get(i); ExtraTrees.proxy.registerBlock(slab, new ItemETSlab(slab, slab, slabDouble)); ExtraTrees.proxy.registerBlock(slabDouble, new ItemETSlab(slabDouble, slab, slabDouble)); registerOreDictWildcard(OreDictUtil.SLAB_WOOD, slab); } - ExtraTrees.slabsFireproof = BlockETSlab.create(true, false); - ExtraTrees.slabsDoubleFireproof = BlockETSlab.create(true, true); - for (int i = 0; i < ExtraTrees.slabsFireproof.size(); i++) { - BlockETSlab slab = ExtraTrees.slabsFireproof.get(i); - BlockETSlab slabDouble = ExtraTrees.slabsDoubleFireproof.get(i); + slabsFireproof = BlockETSlab.create(true, false); + slabsDoubleFireproof = BlockETSlab.create(true, true); + for (int i = 0; i < slabsFireproof.size(); i++) { + BlockETSlab slab = slabsFireproof.get(i); + BlockETSlab slabDouble = slabsDoubleFireproof.get(i); ExtraTrees.proxy.registerBlock(slab, new ItemETSlab(slab, slab, slabDouble)); ExtraTrees.proxy.registerBlock(slabDouble, new ItemETSlab(slabDouble, slab, slabDouble)); registerOreDictWildcard(OreDictUtil.SLAB_WOOD, slab); } - woodAccess.registerSlabs(ExtraTrees.slabs); - woodAccess.registerSlabs(ExtraTrees.slabsFireproof); + woodAccess.registerSlabs(slabs); + woodAccess.registerSlabs(slabsFireproof); - ExtraTrees.stairs = new ArrayList<>(); - for (BlockETPlank plank : ExtraTrees.planks) { + stairs = new ArrayList<>(); + for (BlockETPlank plank : planks) { for (IBlockState blockState : plank.getBlockState().getValidStates()) { int meta = plank.getMetaFromState(blockState); EnumExtraTreeLog woodType = plank.getWoodType(meta); @@ -115,61 +139,92 @@ public class ModuleBlocks implements IInitializable { String name = "stairs." + woodType; stair.setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); stair.setUnlocalizedName(name); - ExtraTrees.proxy.registerBlock(stair, new ItemETStairs(stair)); - ExtraTrees.stairs.add(stair); + ExtraTrees.proxy.registerBlock(stair, new ItemBlockETWood(stair)); + stairs.add(stair); registerOreDictWildcard(OreDictUtil.STAIR_WOOD, stair); } } - ExtraTrees.stairsFireproof = new ArrayList<>(); - for (BlockETPlank plank : ExtraTrees.planksFireproof) { + stairsFireproof = new ArrayList<>(); + for (BlockETPlank plank : planksFireproof) { for (IBlockState blockState : plank.getBlockState().getValidStates()) { int meta = plank.getMetaFromState(blockState); EnumExtraTreeLog woodType = plank.getWoodType(meta); BlockForestryStairs stair = new BlockForestryStairs(true, blockState, woodType); String name = "stairs.fireproof." + woodType; - stair.setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "stairs.fireproof." + woodType)); + stair.setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); stair.setUnlocalizedName(name); - ExtraTrees.proxy.registerBlock(stair, new ItemETStairs(stair)); - ExtraTrees.stairsFireproof.add(stair); + ExtraTrees.proxy.registerBlock(stair, new ItemBlockETWood(stair)); + stairsFireproof.add(stair); registerOreDictWildcard(OreDictUtil.STAIR_WOOD, stair); } } + + woodAccess.registerStairs(stairs); + woodAccess.registerStairs(stairsFireproof); + + fences = BlockETFence.create(false); + for (BlockETFence block : fences) { + ExtraTrees.proxy.registerBlock(block, new ItemBlockETWood(block)); + registerOreDictWildcard(OreDictUtil.FENCE_WOOD, block); + FMLInterModComms.sendMessage("forestry", "add-fence-block", block.getRegistryName().toString()); + } - woodAccess.registerStairs(ExtraTrees.stairs); - woodAccess.registerStairs(ExtraTrees.stairsFireproof); + fencesFireproof = BlockETFence.create(true); + for (BlockETFence block : fencesFireproof) { + ExtraTrees.proxy.registerBlock(block, new ItemBlockETWood(block)); + registerOreDictWildcard(OreDictUtil.FENCE_WOOD, block); + FMLInterModComms.sendMessage("forestry", "add-fence-block", block.getRegistryName().toString()); + } + + woodAccess.registerFences(fences); + woodAccess.registerFences(fencesFireproof); + + fenceGates = new ArrayList<>(); + fenceGatesFireproof = new ArrayList<>(); + for (EnumExtraTreeLog woodType : EnumExtraTreeLog.VALUES) { + BlockForestryFenceGate fenceGate = new BlockForestryFenceGate<>(false, woodType); + String name = "fence.gates." + woodType; + fenceGate.setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); + fenceGate.setUnlocalizedName(name); + ExtraTrees.proxy.registerBlock(fenceGate, new ItemBlockETWood(fenceGate)); + registerOreDictWildcard(OreDictUtil.FENCE_GATE_WOOD, fenceGate); + fenceGates.add(fenceGate); + FMLInterModComms.sendMessage("forestry", "add-fence-block", fenceGate.getRegistryName().toString()); - ExtraTrees.blockFence = new BlockFence("fence"); - ExtraTrees.blockGate = new BlockGate(); - ExtraTrees.blockDoor = new BlockETDoor(); - ExtraTrees.blockMultiFence = new BlockMultiFence(); - GameRegistry.register(ExtraTrees.blockFence); - GameRegistry.register(new ItemMetadata(ExtraTrees.blockFence).setRegistryName(ExtraTrees.blockFence.getRegistryName())); - GameRegistry.register(ExtraTrees.blockMultiFence); - GameRegistry.register(new ItemMetadata(ExtraTrees.blockMultiFence).setRegistryName(ExtraTrees.blockMultiFence.getRegistryName())); + BlockForestryFenceGate fenceGateFireproof = new BlockForestryFenceGate<>(true, woodType); + String nameFireproof = "fence.gates.fireproof." + woodType; + fenceGateFireproof.setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, nameFireproof)); + fenceGateFireproof.setUnlocalizedName(nameFireproof); + ExtraTrees.proxy.registerBlock(fenceGateFireproof, new ItemBlockETWood(fenceGateFireproof)); + registerOreDictWildcard(OreDictUtil.FENCE_GATE_WOOD, fenceGateFireproof); + fenceGatesFireproof.add(fenceGateFireproof); + FMLInterModComms.sendMessage("forestry", "add-fence-block", fenceGateFireproof.getRegistryName().toString()); + } + + woodAccess.registerFenceGates(fenceGates); + woodAccess.registerFenceGates(fenceGatesFireproof); + + blockMultiFence = new BlockMultiFence(); + GameRegistry.register(blockMultiFence); + GameRegistry.register(new ItemMetadata(blockMultiFence).setRegistryName(blockMultiFence.getRegistryName())); //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockMultiFence), new ItemMetadataRenderer()); - GameRegistry.register(ExtraTrees.blockGate); - GameRegistry.register(new ItemMetadata(ExtraTrees.blockGate).setRegistryName(ExtraTrees.blockGate.getRegistryName())); - GameRegistry.register(ExtraTrees.blockDoor); - GameRegistry.register(new ItemETDoor(ExtraTrees.blockDoor).setRegistryName(ExtraTrees.blockDoor.getRegistryName())); -// GameRegistry.register(ExtraTrees.blockStairs); - // GameRegistry.register(new ItemETStairs(ExtraTrees.blockStairs).setRegistryName(ExtraTrees.blockStairs.getRegistryName())); + blockDoor = new BlockETDoor(); + GameRegistry.register(blockDoor); + GameRegistry.register(new ItemETDoor(blockDoor).setRegistryName(blockDoor.getRegistryName())); //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStairs), new StairItemRenderer()); //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockGate), new GateItemRenderer()); - for (BlockETLog log : ExtraTrees.logs) { + for (BlockETLog log : logs) { ItemStack logInput = new ItemStack(log, 1, OreDictionary.WILDCARD_VALUE); ItemStack coalOutput = new ItemStack(Items.COAL, 1, 1); RecipeUtil.addSmelting(logInput, coalOutput, 0.15F); } - FMLInterModComms.sendMessage("forestry", "add-fence-block", "ExtraTrees:fence"); - FMLInterModComms.sendMessage("forestry", "add-fence-block", "ExtraTrees:gate"); - FMLInterModComms.sendMessage("forestry", "add-fence-block", "ExtraTrees:multifence"); //ModuleBlocks.hedgeRenderID = BinnieCore.proxy.getUniqueRenderID(); - ExtraTrees.leavesDecorative = BlockETDecorativeLeaves.create(); - ExtraTrees.speciesToLeavesDecorative = new HashMap<>(); - for (BlockETDecorativeLeaves leaves : ExtraTrees.leavesDecorative) { + leavesDecorative = BlockETDecorativeLeaves.create(); + speciesToLeavesDecorative = new HashMap<>(); + for (BlockETDecorativeLeaves leaves : leavesDecorative) { ExtraTrees.proxy.registerBlock(leaves, new ItemBlockETDecorativeLeaves(leaves)); registerOreDictWildcard(OreDictUtil.TREE_LEAVES, leaves); @@ -177,7 +232,7 @@ public class ModuleBlocks implements IInitializable { ETTreeDefinition treeDefinition = state.getValue(leaves.getVariant()); String speciesUid = treeDefinition.getUID(); int meta = leaves.getMetaFromState(state); - ExtraTrees.speciesToLeavesDecorative.put(speciesUid, new ItemStack(leaves, 1, meta)); + speciesToLeavesDecorative.put(speciesUid, new ItemStack(leaves, 1, meta)); } } } @@ -263,7 +318,8 @@ public class ModuleBlocks implements IInitializable { } public static ItemStack getDecorativeLeaves(String speciesUid) { - ItemStack itemStack = ExtraTrees.speciesToLeavesDecorative.get(speciesUid); + ExtraTrees.blocks(); + ItemStack itemStack = ModuleBlocks.speciesToLeavesDecorative.get(speciesUid); if (itemStack == null) { return null; } diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 15d4b6e9..3e935561 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -1,16 +1,13 @@ package binnie.extratrees.block; import binnie.Constants; -import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; -import com.google.common.base.Optional; import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; -import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; @@ -27,9 +24,9 @@ public class PlankType { for (final ForestryPlanks plank3 : ForestryPlanks.values()) { CarpentryManager.carpentryInterface.registerCarpentryWood(plank3.ordinal() + 128, plank3); } - for (final ExtraBiomesPlank plank4 : ExtraBiomesPlank.values()) { + /*for (final ExtraBiomesPlank plank4 : ExtraBiomesPlank.values()) { CarpentryManager.carpentryInterface.registerCarpentryWood(plank4.ordinal() + 192, plank4); - } + }*/ } public enum ExtraTreePlanks implements IPlankType, IFenceProvider, IStringSerializable { @@ -123,6 +120,7 @@ public class PlankType { this.woodType = woodType; } + @Override public IWoodType getWoodType() { return woodType; } @@ -168,7 +166,7 @@ public class PlankType { @Override public ItemStack getFence() { - return TileEntityMetadata.getItemStack(ExtraTrees.blockFence, WoodManager.getPlankTypeIndex(this)); + return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.FENCE, false); } } @@ -212,6 +210,11 @@ public class PlankType { public ItemStack getStack() { return getStack(true); } + + @Override + public IWoodType getWoodType() { + return woodType; + } @Override public ItemStack getStack(boolean fireproof) { @@ -288,6 +291,11 @@ public class PlankType { return this.color; } + @Override + public IWoodType getWoodType() { + return woodType; + } + @Override public ItemStack getStack(boolean fireproof) { return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof); @@ -314,7 +322,9 @@ public class PlankType { } } - public enum ExtraBiomesPlank implements IPlankType { + + //TODO: extrabiomes 1.10.2 + /*public enum ExtraBiomesPlank implements IPlankType { Redwood(10185538), Fir(8288074), Acacia(12561022); @@ -377,5 +387,5 @@ public class PlankType { // } // return null; // } - } + }*/ } diff --git a/src/main/java/binnie/extratrees/block/StairItemRenderer.java b/src/main/java/binnie/extratrees/block/StairItemRenderer.java deleted file mode 100644 index 058e0926..00000000 --- a/src/main/java/binnie/extratrees/block/StairItemRenderer.java +++ /dev/null @@ -1,87 +0,0 @@ -package binnie.extratrees.block; - -//import net.minecraft.util.IIcon; - -public class StairItemRenderer// implements IItemRenderer -{ -// private void renderStairBlock(final RenderBlocks renderBlocks, final ItemStack item, final float f, final float g, final float h) { -// final Tessellator tessellator = Tessellator.instance; -// final Block block = ((ItemBlock) item.getItem()).field_150939_a; -// final IIcon textureIndex = PlankType.ExtraTreePlanks.values()[item.getItemDamage()].getIcon(); -// for (int i = 0; i < 2; ++i) { -// if (i == 0) { -// renderBlocks.setRenderBounds(0.0, 0.0, 0.0, 1.0, 1.0, 0.5); -// } -// if (i == 1) { -// renderBlocks.setRenderBounds(0.0, 0.0, 0.5, 1.0, 0.5, 1.0); -// } -// GL11.glTranslatef(-0.5f, -0.5f, -0.5f); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(0.0f, -1.0f, 0.0f); -// renderBlocks.renderFaceYNeg(block, 0.0, 0.0, 0.0, textureIndex); -// tessellator.draw(); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(0.0f, 1.0f, 0.0f); -// renderBlocks.renderFaceYPos(block, 0.0, 0.0, 0.0, textureIndex); -// tessellator.draw(); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(0.0f, 0.0f, -1.0f); -// renderBlocks.renderFaceXNeg(block, 0.0, 0.0, 0.0, textureIndex); -// tessellator.draw(); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(0.0f, 0.0f, 1.0f); -// renderBlocks.renderFaceXPos(block, 0.0, 0.0, 0.0, textureIndex); -// tessellator.draw(); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(-1.0f, 0.0f, 0.0f); -// renderBlocks.renderFaceZNeg(block, 0.0, 0.0, 0.0, textureIndex); -// tessellator.draw(); -// tessellator.startDrawingQuads(); -// tessellator.setNormal(1.0f, 0.0f, 0.0f); -// renderBlocks.renderFaceZPos(block, 0.0, 0.0, 0.0, textureIndex); -// tessellator.draw(); -// GL11.glTranslatef(0.5f, 0.5f, 0.5f); -// } -// } -// -// @Override -// public boolean handleRenderType(final ItemStack item, final IItemRenderer.ItemRenderType type) { -// switch (type) { -// case ENTITY: { -// return true; -// } -// case EQUIPPED: { -// return true; -// } -// case INVENTORY: { -// return true; -// } -// default: { -// return false; -// } -// } -// } -// -// @Override -// public boolean shouldUseRenderHelper(final IItemRenderer.ItemRenderType type, final ItemStack item, final IItemRenderer.ItemRendererHelper helper) { -// return true; -// } -// -// @Override -// public void renderItem(final IItemRenderer.ItemRenderType type, final ItemStack item, final Object... data) { -// switch (type) { -// case ENTITY: { -// this.renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); -// break; -// } -// case EQUIPPED: { -// this.renderStairBlock((RenderBlocks) data[0], item, 0.0f, 0.0f, 0.0f); -// break; -// } -// case INVENTORY: { -// this.renderStairBlock((RenderBlocks) data[0], item, -0.5f, -0.5f, -0.5f); -// break; -// } -// } -// } -} diff --git a/src/main/java/binnie/extratrees/block/StairsRenderer.java b/src/main/java/binnie/extratrees/block/StairsRenderer.java deleted file mode 100644 index c1f8627d..00000000 --- a/src/main/java/binnie/extratrees/block/StairsRenderer.java +++ /dev/null @@ -1,69 +0,0 @@ -package binnie.extratrees.block; - -public class StairsRenderer //implements ISimpleBlockRenderingHandler -{ -// @Override -// public void renderInventoryBlock(final Block par1Block, final int metadata, final int modelID, final RenderBlocks renderer) { -// final Tessellator var4 = Tessellator.instance; -// for (int var5 = 0; var5 < 2; ++var5) { -// if (var5 == 0) { -// renderer.setRenderBounds(0.0, 0.0, 0.0, 1.0, 1.0, 0.5); -// } -// if (var5 == 1) { -// renderer.setRenderBounds(0.0, 0.0, 0.5, 1.0, 0.5, 1.0); -// } -// GL11.glTranslatef(-0.5f, -0.5f, -0.5f); -// var4.startDrawingQuads(); -// var4.setNormal(0.0f, -1.0f, 0.0f); -// renderer.renderFaceYNeg(par1Block, 0.0, 0.0, 0.0, par1Block.getIcon(0, metadata)); -// var4.draw(); -// var4.startDrawingQuads(); -// var4.setNormal(0.0f, 1.0f, 0.0f); -// renderer.renderFaceYPos(par1Block, 0.0, 0.0, 0.0, par1Block.getIcon(1, metadata)); -// var4.draw(); -// var4.startDrawingQuads(); -// var4.setNormal(0.0f, 0.0f, -1.0f); -// renderer.renderFaceXPos(par1Block, 0.0, 0.0, 0.0, par1Block.getIcon(2, metadata)); -// var4.draw(); -// var4.startDrawingQuads(); -// var4.setNormal(0.0f, 0.0f, 1.0f); -// renderer.renderFaceXNeg(par1Block, 0.0, 0.0, 0.0, par1Block.getIcon(3, metadata)); -// var4.draw(); -// var4.startDrawingQuads(); -// var4.setNormal(-1.0f, 0.0f, 0.0f); -// renderer.renderFaceZNeg(par1Block, 0.0, 0.0, 0.0, par1Block.getIcon(4, metadata)); -// var4.draw(); -// var4.startDrawingQuads(); -// var4.setNormal(1.0f, 0.0f, 0.0f); -// renderer.renderFaceZPos(par1Block, 0.0, 0.0, 0.0, par1Block.getIcon(5, metadata)); -// var4.draw(); -// GL11.glTranslatef(0.5f, 0.5f, 0.5f); -// } -// } -// -// @Override -// public boolean renderWorldBlock(final IBlockAccess world, final int par2, final int par3, final int par4, final Block block, final int modelId, final RenderBlocks renderer) { -// final BlockETStairs blockStairs = (BlockETStairs) block; -// blockStairs.func_150147_e(renderer.blockAccess, par2, par3, par4); -// renderer.setRenderBoundsFromBlock(blockStairs); -// renderer.renderStandardBlock(blockStairs, par2, par3, par4); -// final boolean var5 = blockStairs.func_150145_f(renderer.blockAccess, par2, par3, par4); -// renderer.setRenderBoundsFromBlock(blockStairs); -// renderer.renderStandardBlock(blockStairs, par2, par3, par4); -// if (var5 && blockStairs.func_150144_g(renderer.blockAccess, par2, par3, par4)) { -// renderer.setRenderBoundsFromBlock(blockStairs); -// renderer.renderStandardBlock(blockStairs, par2, par3, par4); -// } -// return true; -// } -// -// @Override -// public boolean shouldRender3DInInventory(final int i) { -// return true; -// } -// -// @Override -// public int getRenderId() { -// return ExtraTrees.stairsID; -// } -} diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 2829e28f..1cacf079 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -7,6 +7,7 @@ import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.block.decor.FenceDescription; import binnie.extratrees.block.decor.FenceType; import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; import forestry.arboriculture.IWoodTyped; import forestry.core.utils.Translator; @@ -70,7 +71,8 @@ public class WoodManager { if (stack == null) { return null; } - if (stack.getItem() == Item.getItemFromBlock(ExtraTrees.blockMultiFence)) { + ExtraTrees.blocks(); + if (stack.getItem() == Item.getItemFromBlock(ModuleBlocks.blockMultiFence)) { final int damage = TileEntityMetadata.getItemDamage(stack); return getFenceDescription(damage); } @@ -98,7 +100,7 @@ public class WoodManager { if (plank == PlankType.VanillaPlanks.OAK) { return new ItemStack(Blocks.OAK_FENCE_GATE); } - return TileEntityMetadata.getItemStack(ExtraTrees.blockGate, getPlankTypeIndex(plank)); + return TreeManager.woodAccess.getStack(plank.getWoodType(), WoodBlockKind.FENCE_GATE, false); } public static ItemStack getFence(final IPlankType plank, final FenceType type, final int amount) { @@ -115,24 +117,27 @@ public class WoodManager { } final int ord = type.ordinal(); final int i = getPlankTypeIndex(plank) + 256 * ord; - final ItemStack stack = TileEntityMetadata.getItemStack(ExtraTrees.blockMultiFence, i + 65536 * getPlankTypeIndex(plank2)); + ExtraTrees.blocks(); + final ItemStack stack = TileEntityMetadata.getItemStack(ModuleBlocks.blockMultiFence, i + 65536 * getPlankTypeIndex(plank2)); stack.stackSize = amount; return stack; } public static ItemStack getDoor(final IPlankType plank, final DoorType type) { - return TileEntityMetadata.getItemStack(ExtraTrees.blockDoor, type.ordinal() * 256 + getPlankTypeIndex(plank)); + ExtraTrees.blocks(); + return TileEntityMetadata.getItemStack(ModuleBlocks.blockDoor, type.ordinal() * 256 + getPlankTypeIndex(plank)); } public static List getAllPlankTypes() { final List list = new ArrayList<>(); Collections.addAll(list, PlankType.ExtraTreePlanks.values()); Collections.addAll(list, PlankType.ForestryPlanks.values()); - for (final IPlankType type : PlankType.ExtraBiomesPlank.values()) { + //TODO: extrabiomes 1.10.2 + /*for (final IPlankType type : PlankType.ExtraBiomesPlank.values()) { if (type.getStack() != null) { list.add(type); } - } + }*/ Collections.addAll(list, PlankType.VanillaPlanks.values()); return list; } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockGate.java b/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java similarity index 68% rename from src/main/java/binnie/extratrees/block/decor/BlockGate.java rename to src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java index 581e5c10..8fcf4ba0 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java @@ -1,6 +1,7 @@ package binnie.extratrees.block.decor; import binnie.Binnie; +import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; @@ -10,25 +11,28 @@ import forestry.api.core.Tabs; import net.minecraft.block.BlockFenceGate; import net.minecraft.block.BlockPlanks; import net.minecraft.block.SoundType; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -public class BlockGate extends BlockFenceGate implements IBlockMetadata { - public BlockGate() { +public class BlockETFenceGate extends BlockFenceGate implements IBlockMetadata { + public BlockETFenceGate() { super(BlockPlanks.EnumType.OAK); this.setCreativeTab(Tabs.tabArboriculture); this.setResistance(5.0f); this.setHardness(2.0f); this.setSoundType(SoundType.WOOD); - setRegistryName("blockGate"); + setRegistryName("gate"); } @Override @@ -56,11 +60,6 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata { // return WoodManager.getPlankType(meta).getIcon(); // } - @Override - public void dropAsStack(final World world, final BlockPos pos, final ItemStack drop) { - //this.dropBlockAsItem(world, x, y, z, drop); - } - // @Override // public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { // return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); @@ -76,44 +75,39 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata { return new TileEntityMetadata(); } -// @Override -// public boolean hasTileEntity(final int meta) { -// return true; -// } -// -// @Override -// public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { -// super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); -// final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); -// return tileentity != null && tileentity.receiveClientEvent(par5, par6); -// } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public boolean eventReceived(IBlockState state, World world, BlockPos pos, int id, int param) { + TileEntity tileentity = world.getTileEntity(pos); + return tileentity != null && tileentity.receiveClientEvent(id, param); + } @Override public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) { return TileEntityMetadata.getItemDamage(stack); } - + @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { - return tileMeta; + public int getDroppedMeta(IBlockState state, int tileMetadata) { + return tileMetadata; } @Override - public String getBlockName(final ItemStack par1ItemStack) { + public String getDisplayName(final ItemStack par1ItemStack) { final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName()); + return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName()); } - + @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { + public void breakBlock(World world, BlockPos pos, IBlockState state) { + super.breakBlock(world, pos, state); + world.removeTileEntity(pos); } -// @Override -// public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { -// super.breakBlock(par1World, par2, par3, par4, par5, par6); -// par1World.removeTileEntity(par2, par3, par4); -// } - @Override public boolean isWood(IBlockAccess world, BlockPos pos) { return true; @@ -133,14 +127,19 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata { public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { return 5; } - + + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return BlockMetadata.getPickBlock(world, pos); + } + // @Override // public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { // return BlockMetadata.getPickBlock(world, x, y, z); // } - -// @Override -// public boolean getBlocksMovement(final IBlockAccess p_149655_1_, final int p_149655_2_, final int p_149655_3_, final int p_149655_4_) { -// return false; -// } + + @Override + public boolean isPassable(IBlockAccess worldIn, BlockPos pos){ + return worldIn.getBlockState(pos).getValue(OPEN).booleanValue(); + } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index cfcfd37f..e5317e9e 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -1,6 +1,7 @@ package binnie.extratrees.block.decor; import binnie.Binnie; +import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; @@ -8,16 +9,22 @@ import binnie.extratrees.block.IFenceProvider; import binnie.extratrees.block.PlankType; import binnie.extratrees.block.WoodManager; import forestry.api.core.Tabs; +import forestry.arboriculture.PluginArboriculture; +import net.minecraft.block.Block; +import net.minecraft.block.BlockFenceGate; import net.minecraft.block.SoundType; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -63,38 +70,32 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock // public int getRenderType() { // return ExtraTrees.fenceID; // } - + @Override - public void dropAsStack(final World world, final BlockPos pos, final ItemStack drop) { - //this.dropBlockAsItem(world, x, y, z, drop); + public boolean eventReceived(IBlockState state, World world, BlockPos pos, int id, int param) { + TileEntity tileentity = world.getTileEntity(pos); + return tileentity != null && tileentity.receiveClientEvent(id, param); + } + + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + return BlockMetadata.getBlockDroppedAsList(this, world, pos); + } + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + return BlockMetadata.breakBlock(this, player, world, pos); } -// -// @Override -// public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { -// return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); -// } -// -// @Override -// public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { -// return BlockMetadata.breakBlock(this, player, world, x, y, z); -// } @Override public TileEntity createNewTileEntity(final World var1, final int i) { return new TileEntityMetadata(); } - -// @Override -// public boolean hasTileEntity(final int meta) { -// return true; -// } -// -// @Override -// public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { -// super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); -// final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); -// return tileentity != null && tileentity.receiveClientEvent(par5, par6); -// } + + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } @Override public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) { @@ -102,50 +103,47 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { + public int getDroppedMeta(IBlockState state, final int tileMeta) { return tileMeta; } @Override - public String getBlockName(final ItemStack par1ItemStack) { + public String getDisplayName(final ItemStack par1ItemStack) { final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodfence.name", this.getDescription(meta).getPlankType().getName()); + return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodfence.name", this.getDescription(meta).getPlankType().getName()); } - @Override - public void getBlockTooltip(final ItemStack par1ItemStack, final List par3List) { - } - - @Override public boolean canPlaceTorchOnTop(IBlockState state, IBlockAccess world, BlockPos pos) { return true; } + + @Override + public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { + IBlockState state = worldIn.getBlockState(pos); + Block block = state.getBlock(); + if (PluginArboriculture.validFences.contains(block)) { + return true; + } -// @Override -// public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { -// if (!this.isFence(world, x, y, z)) { -// final Block block = world.getBlock(x, y, z); -// return block != null && block.getMaterial().isOpaque() && block.renderAsNormalBlock(); -// } -// return true; -// } - -// public boolean isFence(final IBlockAccess world, final int x, final int y, final int z) { -// final Block block = world.getBlock(x, y, z); -// return canConnect(block); -// } - -// public static boolean canConnect(final Block block) { -// return block == ((ItemBlock) Mods.Forestry.item("fences")).field_150939_a || block == Blocks.fence || block == Blocks.fence_gate || block == Blocks.nether_brick_fence || block instanceof IBlockFence || block == ExtraTrees.blockGate; -// } -// -// @Override -// public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { -// super.breakBlock(par1World, par2, par3, par4, par5, par6); -// par1World.removeTileEntity(par2, par3, par4); -// } + if (block != Blocks.BARRIER) { + Material blockMaterial = block.getMaterial(state); + if (block instanceof BlockFence || block instanceof BlockFenceGate || block instanceof IBlockFence) { + return blockMaterial == this.blockMaterial; + } + if (blockMaterial.isOpaque() && state.isFullCube() && blockMaterial != Material.GOURD) { + return true; + } + } + return false; + } + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) { + super.breakBlock(world, pos, state); + world.removeTileEntity(pos); + } + @Override public boolean isWood(final IBlockAccess world, final BlockPos pos) { return true; @@ -170,11 +168,10 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock // @SideOnly(Side.CLIENT) // public void registerBlockIcons(final IIconRegister p_149651_1_) { // } - -// -// @Override -// public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { -// return BlockMetadata.getPickBlock(state, target, world, pos, player); -// } + + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return BlockMetadata.getPickBlock(world, pos); + } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java index a5774bb3..cd7c1682 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java @@ -1,144 +1,165 @@ package binnie.extratrees.block.decor; +import forestry.api.arboriculture.EnumLeafType; import forestry.api.core.Tabs; +import forestry.arboriculture.PluginArboriculture; +import forestry.core.blocks.IColoredBlock; import net.minecraft.block.Block; +import net.minecraft.block.BlockFenceGate; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.ColorizerFoliage; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class BlockHedge extends Block implements IBlockFence { +public class BlockHedge extends Block implements IBlockFence, IColoredBlock { public BlockHedge() { super(Material.LEAVES); this.setCreativeTab(Tabs.tabArboriculture); this.setRegistryName("hedge"); } -// @Override -// public void addCollisionBoxesToList(final World world, final int x, final int y, final int z, final AxisAlignedBB aabb, final List list, final Entity p_149743_7_) { -// final boolean connectNegZ = this.canConnectFenceTo(world, x, y, z - 1); -// final boolean connectPosZ = this.canConnectFenceTo(world, x, y, z + 1); -// final boolean connectNegX = this.canConnectFenceTo(world, x - 1, y, z); -// final boolean connectPosX = this.canConnectFenceTo(world, x + 1, y, z); -// float f = 0.25f; -// float f2 = 0.75f; -// float f3 = 0.25f; -// float f4 = 0.75f; -// if (connectNegZ) { -// f3 = 0.0f; -// } -// if (connectPosZ) { -// f4 = 1.0f; -// } -// if (connectNegZ || connectPosZ) { -// this.setBlockBounds(f, 0.0f, f3, f2, 1.5f, f4); -// super.addCollisionBoxesToList(world, x, y, z, aabb, list, p_149743_7_); -// } -// f3 = 0.25f; -// f4 = 0.75f; -// if (connectNegX) { -// f = 0.0f; -// } -// if (connectPosX) { -// f2 = 1.0f; -// } -// if (connectNegX || connectPosX || (!connectNegZ && !connectPosZ)) { -// this.setBlockBounds(f, 0.0f, f3, f2, 1.5f, f4); -// super.addCollisionBoxesToList(world, x, y, z, aabb, list, p_149743_7_); -// } -// if (connectNegZ) { -// f3 = 0.0f; -// } -// if (connectPosZ) { -// f4 = 1.0f; -// } -// this.setBlockBounds(f, 0.0f, f3, f2, 1.0f, f4); -// } + @Override + public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, Entity entityIn) { + final boolean connectNegZ = this.canConnectFenceTo(world, pos.north()); + final boolean connectPosZ = this.canConnectFenceTo(world, pos.south()); + final boolean connectNegX = this.canConnectFenceTo(world, pos.west()); + final boolean connectPosX = this.canConnectFenceTo(world, pos.east()); + float f = 0.25f; + float f2 = 0.75f; + float f3 = 0.25f; + float f4 = 0.75f; + if (connectNegZ) { + f3 = 0.0f; + } + if (connectPosZ) { + f4 = 1.0f; + } + if (connectNegZ || connectPosZ) { + addCollisionBoxToList(pos, entityBox, collidingBoxes, new AxisAlignedBB(f, 0.0f, f3, f2, 1.5f, f4)); + } + f3 = 0.25f; + f4 = 0.75f; + if (connectNegX) { + f = 0.0f; + } + if (connectPosX) { + f2 = 1.0f; + } + if (connectNegX || connectPosX || (!connectNegZ && !connectPosZ)) { + addCollisionBoxToList(pos, entityBox, collidingBoxes, new AxisAlignedBB(f, 0.0f, f3, f2, 1.5f, f4)); + } + if (connectNegZ) { + f3 = 0.0f; + } + if (connectPosZ) { + f4 = 1.0f; + } + addCollisionBoxToList(pos, entityBox, collidingBoxes, new AxisAlignedBB(f, 0.0f, f3, f2, 1.0f, f4)); + } + + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + final boolean connectNegZ = this.canConnectFenceTo(world, pos.north()); + final boolean connectPosZ = this.canConnectFenceTo(world, pos.south()); + final boolean connectNegX = this.canConnectFenceTo(world, pos.west()); + final boolean connectPosX = this.canConnectFenceTo(world, pos.east()); + float f = 0.25f; + float f2 = 0.75f; + float f3 = 0.25f; + float f4 = 0.75f; + if (connectNegZ) { + f3 = 0.0f; + } + if (connectPosZ) { + f4 = 1.0f; + } + if (connectNegX) { + f = 0.0f; + } + if (connectPosX) { + f2 = 1.0f; + } + return new AxisAlignedBB(f, 0.0f, f3, f2, 1.0f, f4); + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } + + @Override + public boolean isPassable(IBlockAccess worldIn, BlockPos pos) { + return false; + } -// @Override -// public void setBlockBoundsBasedOnState(final IBlockAccess world, final int x, final int y, final int z) { -// final boolean connectNegZ = this.canConnectFenceTo(world, x, y, z - 1); -// final boolean connectPosZ = this.canConnectFenceTo(world, x, y, z + 1); -// final boolean connectNegX = this.canConnectFenceTo(world, x - 1, y, z); -// final boolean connectPosX = this.canConnectFenceTo(world, x + 1, y, z); -// float f = 0.25f; -// float f2 = 0.75f; -// float f3 = 0.25f; -// float f4 = 0.75f; -// if (connectNegZ) { -// f3 = 0.0f; -// } -// if (connectPosZ) { -// f4 = 1.0f; -// } -// if (connectNegX) { -// f = 0.0f; -// } -// if (connectPosX) { -// f2 = 1.0f; -// } -// this.setBlockBounds(f, 0.0f, f3, f2, 1.0f, f4); -// } + /*@Override + public int getRenderType() { + return ModuleBlocks.hedgeRenderID; + }*/ -// @Override -// public boolean isOpaqueCube() { -// return false; -// } -// -// @Override -// public boolean renderAsNormalBlock() { -// return false; -// } -// -// @Override -// public boolean getBlocksMovement(final IBlockAccess p_149655_1_, final int p_149655_2_, final int p_149655_3_, final int p_149655_4_) { -// return false; -// } + public boolean canConnectFenceTo(IBlockAccess world, BlockPos pos) { + IBlockState state = world.getBlockState(pos); + Block block = state.getBlock(); + return block == this || canConnectTo(world, pos) || block.isLeaves(state, world, pos) || (state.getMaterial().isOpaque() && state.isFullCube() && state.getMaterial() != Material.GOURD); + } + + private boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { + IBlockState state = worldIn.getBlockState(pos); + Block block = state.getBlock(); + if (PluginArboriculture.validFences.contains(block)) { + return true; + } -// @Override -// public int getRenderType() { -// return ModuleBlocks.hedgeRenderID; -// } -// -// public boolean canConnectFenceTo(final IBlockAccess p_149826_1_, final int p_149826_2_, final int p_149826_3_, final int p_149826_4_) { -// final Block block = p_149826_1_.getBlock(p_149826_2_, p_149826_3_, p_149826_4_); -// return block == this || block == Blocks.fence_gate || func_149825_a(block) || block.isLeaves(p_149826_1_, p_149826_2_, p_149826_3_, p_149826_4_) || (block.getMaterial().isOpaque() && block.renderAsNormalBlock() && block.getMaterial() != Material.gourd); -// } -// -// public static boolean func_149825_a(final Block p_149825_0_) { -// return BlockFence.canConnect(p_149825_0_); -// } + if (block != Blocks.BARRIER) { + Material blockMaterial = block.getMaterial(state); + if (block instanceof BlockFence || block instanceof BlockFenceGate || block instanceof IBlockFence) { + return blockMaterial == this.blockMaterial; + } + if (blockMaterial.isOpaque() && state.isFullCube() && blockMaterial != Material.GOURD) { + return true; + } + } + return false; + } -// @Override -// @SideOnly(Side.CLIENT) -// public boolean shouldSideBeRendered(final IBlockAccess p_149646_1_, final int p_149646_2_, final int p_149646_3_, final int p_149646_4_, final int p_149646_5_) { -// return true; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerBlockIcons(final IIconRegister p_149651_1_) { -// } + @SideOnly(Side.CLIENT) + @Override + public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + return true; + } -// private ExtraTreeSpecies.LeafType getType(final int meta) { -// return ExtraTreeSpecies.LeafType.values()[meta % 8]; -// } + private EnumLeafType getType(int meta) { + return EnumLeafType.values()[meta % 8]; + } private boolean isFull(final int meta) { return meta / 8 > 0; } -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(final int p_149691_1_, final int meta) { -// final ExtraTreeSpecies.LeafType type = this.getType(meta); -// return ForestryAPI.textureManager.getIcon(this.isFull(meta) ? type.plainUID : type.fancyUID); -// } + /*@Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(final int p_149691_1_, final int meta) { + final ExtraTreeSpecies.LeafType type = this.getType(meta); + return ForestryAPI.textureManager.getIcon(this.isFull(meta) ? type.plainUID : type.fancyUID); + }*/ @Override @SideOnly(Side.CLIENT) @@ -150,18 +171,18 @@ public class BlockHedge extends Block implements IBlockFence { } } -// @Override -// @SideOnly(Side.CLIENT) -// public int colorMultiplier(final IBlockAccess world, final int x, final int y, final int z) { -// return getColor(world.getBlockMetadata(x, y, z)); -// } + @SideOnly(Side.CLIENT) + @Override + public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { + return getColor(getMetaFromState(state)); + } - public static int getColor(final int meta) { - //TODO fix color -// final ExtraTreeSpecies.LeafType type = ExtraTreeSpecies.LeafType.values()[meta % 6]; -// if (type == ExtraTreeSpecies.LeafType.Conifer) { -// return ColorizerFoliage.getFoliageColorPine(); -// } + @SideOnly(Side.CLIENT) + public static int getColor(int meta) { + EnumLeafType type = EnumLeafType.values()[meta % 6]; + if (type == EnumLeafType.CONIFERS) { + return ColorizerFoliage.getFoliageColorPine(); + } final double d0 = 0.5; final double d2 = 1.0; return ColorizerFoliage.getFoliageColor(d0, d2); diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 6f1272fc..eb6d44e8 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -32,12 +32,12 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata { @Override - public String getBlockName(final ItemStack par1ItemStack) { + public String getDisplayName(final ItemStack par1ItemStack) { final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); final IPlankType type1 = this.getDescription(meta).getPlankType(); final IPlankType type2 = this.getDescription(meta).getSecondaryPlankType(); final boolean twoTypes = type1 != type2; final FenceType type3 = this.getDescription(meta).getFenceType(); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName()); + return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName()); } } diff --git a/src/main/java/binnie/extratrees/block/plank/ItemETPlank.java b/src/main/java/binnie/extratrees/block/plank/ItemETPlank.java deleted file mode 100644 index 2308b0a0..00000000 --- a/src/main/java/binnie/extratrees/block/plank/ItemETPlank.java +++ /dev/null @@ -1,26 +0,0 @@ -package binnie.extratrees.block.plank; - -import binnie.extratrees.block.WoodManager; -import forestry.api.arboriculture.IWoodType; -import forestry.arboriculture.IWoodTyped; -import forestry.arboriculture.items.ItemBlockWood; -import net.minecraft.item.ItemStack; - -public class ItemETPlank extends ItemBlockWood { - - public ItemETPlank(V block) { - super(block); - setHasSubtypes(true); - setMaxDamage(0); - setRegistryName(block.getRegistryName()); - } - - @Override - public String getItemStackDisplayName(ItemStack itemstack) { - IWoodTyped wood = getBlock(); - int meta = itemstack.getMetadata(); - IWoodType woodType = wood.getWoodType(meta); - return WoodManager.getDisplayName(wood, woodType); - } -} - diff --git a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java index a885f26f..d8da25cb 100644 --- a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java +++ b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java @@ -4,7 +4,6 @@ import com.google.common.base.Predicate; import binnie.extratrees.block.EnumExtraTreeLog; import binnie.extratrees.block.PlankType; -import forestry.api.arboriculture.IWoodType; public class ETWoodTypePredicate implements Predicate { private final int minWoodTypeMeta; diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java index 0b925135..11f7c8d2 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java @@ -9,10 +9,13 @@ import com.google.common.collect.Lists; import binnie.extratrees.block.EnumExtraTreeLog; import binnie.extratrees.block.PlankType; -import forestry.arboriculture.blocks.WoodTypePredicate; import forestry.arboriculture.blocks.property.PropertyWoodType; public class PropertyETWoodType extends PropertyWoodType { + + public static PropertyETWoodType[] create(@Nonnull String name, int variantsPerBlock) { + return create(name, variantsPerBlock, false); + } public static PropertyETWoodType[] create(@Nonnull String name, int variantsPerBlock, boolean isLog) { int length; if(isLog){ diff --git a/src/main/java/binnie/extratrees/block/stairs/ItemETStairs.java b/src/main/java/binnie/extratrees/block/stairs/ItemETStairs.java deleted file mode 100644 index bc51bfef..00000000 --- a/src/main/java/binnie/extratrees/block/stairs/ItemETStairs.java +++ /dev/null @@ -1,25 +0,0 @@ -package binnie.extratrees.block.stairs; - -import binnie.extratrees.block.EnumExtraTreeLog; -import binnie.extratrees.block.WoodManager; -import forestry.api.arboriculture.IWoodType; -import forestry.arboriculture.blocks.BlockForestryStairs; -import forestry.arboriculture.items.ItemBlockWood; -import net.minecraft.item.ItemStack; - -public class ItemETStairs> extends ItemBlockWood{ - - public ItemETStairs(B block) { - super(block); - setRegistryName(block.getRegistryName()); - } - - @Override - public String getItemStackDisplayName(ItemStack itemstack) { - B wood = getBlock(); - int meta = itemstack.getMetadata(); - IWoodType woodType = wood.getWoodType(meta); - return WoodManager.getDisplayName(wood, woodType); - } - -} diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java new file mode 100644 index 00000000..26dfb82d --- /dev/null +++ b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java @@ -0,0 +1,54 @@ +package binnie.extratrees.block.wood; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nonnull; + +import binnie.Constants; +import binnie.extratrees.block.EnumExtraTreeLog; +import binnie.extratrees.block.property.PropertyETWoodType; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IStateMapperRegister; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.blocks.fence.BlockForestryFence; +import net.minecraft.util.ResourceLocation; + +public abstract class BlockETFence extends BlockForestryFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { + public static List create(boolean fireproof) { + List blocks = new ArrayList<>(); + + PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK); + for (int i = 0; i < variants.length; i++) { + PropertyETWoodType variant = variants[i]; + BlockETFence block = new BlockETFence(fireproof, i) { + @Nonnull + @Override + public PropertyETWoodType getVariant() { + return variant; + } + }; + blocks.add(block); + } + return blocks; + } + + private BlockETFence(boolean fireproof, int blockNumber) { + super(fireproof, blockNumber); + String name = "fences."; + if(fireproof){ + name+="fireproof."; + } + name+=blockNumber; + setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); + setUnlocalizedName(name); + } + + @Nonnull + @Override + public EnumExtraTreeLog getWoodType(int meta) { + int variantCount = getVariant().getAllowedValues().size(); + int variantMeta = (meta % variantCount) + getBlockNumber() * VARIANTS_PER_BLOCK; + return EnumExtraTreeLog.byMetadata(variantMeta); + } +} diff --git a/src/main/java/binnie/extratrees/block/log/BlockETLog.java b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java similarity index 97% rename from src/main/java/binnie/extratrees/block/log/BlockETLog.java rename to src/main/java/binnie/extratrees/block/wood/BlockETLog.java index 278805fa..c19ff9bd 100644 --- a/src/main/java/binnie/extratrees/block/log/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java @@ -1,4 +1,4 @@ -package binnie.extratrees.block.log; +package binnie.extratrees.block.wood; import binnie.Constants; import binnie.extratrees.block.EnumExtraTreeLog; diff --git a/src/main/java/binnie/extratrees/block/plank/BlockETPlank.java b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java similarity index 97% rename from src/main/java/binnie/extratrees/block/plank/BlockETPlank.java rename to src/main/java/binnie/extratrees/block/wood/BlockETPlank.java index 1ce3d1dd..22798cfd 100644 --- a/src/main/java/binnie/extratrees/block/plank/BlockETPlank.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java @@ -1,4 +1,4 @@ -package binnie.extratrees.block.plank; +package binnie.extratrees.block.wood; import binnie.Constants; import binnie.extratrees.block.EnumExtraTreeLog; diff --git a/src/main/java/binnie/extratrees/block/slab/BlockETSlab.java b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java similarity index 97% rename from src/main/java/binnie/extratrees/block/slab/BlockETSlab.java rename to src/main/java/binnie/extratrees/block/wood/BlockETSlab.java index 5aed2e13..7ee3d4d1 100644 --- a/src/main/java/binnie/extratrees/block/slab/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java @@ -1,4 +1,4 @@ -package binnie.extratrees.block.slab; +package binnie.extratrees.block.wood; import binnie.Constants; import binnie.extratrees.block.EnumExtraTreeLog; diff --git a/src/main/java/binnie/extratrees/block/log/ItemETLog.java b/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java similarity index 73% rename from src/main/java/binnie/extratrees/block/log/ItemETLog.java rename to src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java index 580d6642..14573e9f 100644 --- a/src/main/java/binnie/extratrees/block/log/ItemETLog.java +++ b/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java @@ -1,17 +1,16 @@ -package binnie.extratrees.block.log; +package binnie.extratrees.block.wood; import binnie.extratrees.block.WoodManager; import forestry.api.arboriculture.IWoodType; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.items.ItemBlockWood; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -public class ItemETLog extends ItemBlockWood { +public class ItemBlockETWood extends ItemBlockWood { - public ItemETLog(V block) { + public ItemBlockETWood(V block) { super(block); - setHasSubtypes(true); - setMaxDamage(0); setRegistryName(block.getRegistryName()); } diff --git a/src/main/java/binnie/extratrees/block/slab/ItemETSlab.java b/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java similarity index 94% rename from src/main/java/binnie/extratrees/block/slab/ItemETSlab.java rename to src/main/java/binnie/extratrees/block/wood/ItemETSlab.java index 620075b2..a5a684ad 100644 --- a/src/main/java/binnie/extratrees/block/slab/ItemETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java @@ -1,4 +1,4 @@ -package binnie.extratrees.block.slab; +package binnie.extratrees.block.wood; import binnie.extratrees.block.WoodManager; import forestry.api.arboriculture.IWoodType; diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java index ece7ab32..70f5677d 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java @@ -26,6 +26,6 @@ public class BlockCarpentry extends BlockDesign { @Override public String getBlockName(final DesignBlock design) { - return Binnie.Language.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName()); + return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName()); } } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index c3dffa8b..51766b16 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -65,9 +65,9 @@ public class BlockCarpentryPanel extends BlockCarpentry { // } @Override - public String getBlockName(final ItemStack stack) { + public String getDisplayName(final ItemStack stack) { final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); - return Binnie.Language.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName()); + return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName()); } // @Override diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 0a137f5a..e7e97371 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -80,7 +80,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo // } @Override - public String getBlockName(final ItemStack stack) { + public String getDisplayName(final ItemStack stack) { final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); return this.getBlockName(block); } @@ -111,14 +111,14 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo // final IIcon icon = (MultipassBlockRenderer.getLayer() > 0) ? block.getSecondaryIcon(this.getDesignSystem(), BlockDesign.RENDER_DIRECTIONS[side]) : block.getPrimaryIcon(this.getDesignSystem(), BlockDesign.RENDER_DIRECTIONS[side]); // return icon; // } - + @Override - public void getBlockTooltip(final ItemStack stack, final List par3List) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { - par3List.add(block.getPrimaryMaterial().getName() + " and " + block.getSecondaryMaterial().getName()); + tooltip.add(block.getPrimaryMaterial().getName() + " and " + block.getSecondaryMaterial().getName()); } else { - par3List.add(block.getPrimaryMaterial().getName()); + tooltip.add(block.getPrimaryMaterial().getName()); } } @@ -149,11 +149,10 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo // } @Override - public int getDroppedMeta(final int blockMeta, final int tileMeta) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), tileMeta); + public int getDroppedMeta(IBlockState state, int tileMetadata) { + final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), tileMetadata); return block.getItemMetadata(this.getDesignSystem()); } - @Override public int getRenderPasses() { return 2; diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 6fee082a..138d7469 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -52,6 +52,6 @@ public class BlockStainedDesign extends BlockDesign { @Override public String getBlockName(final DesignBlock design) { - return Binnie.Language.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName()); + return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName()); } } diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index bb700769..86b70585 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -3,7 +3,6 @@ package binnie.extratrees.carpentry; import binnie.core.IInitializable; import binnie.core.block.ItemMetadata; import binnie.core.block.TileEntityMetadata; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; @@ -14,21 +13,26 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.registry.GameRegistry; public class ModuleCarpentry implements IInitializable { + + public static BlockCarpentry blockCarpentry; + public static BlockCarpentry blockPanel; + public static BlockStainedDesign blockStained; + @Override public void preInit() { - ExtraTrees.blockCarpentry = new BlockCarpentry("carpentry"); - ExtraTrees.blockPanel = new BlockCarpentryPanel(); - ExtraTrees.blockStained = new BlockStainedDesign(); - GameRegistry.register(ExtraTrees.blockCarpentry); - GameRegistry.register(new ItemMetadata(ExtraTrees.blockCarpentry).setRegistryName(ExtraTrees.blockCarpentry.getRegistryName())); - GameRegistry.register(ExtraTrees.blockPanel); - GameRegistry.register(new ItemMetadata(ExtraTrees.blockPanel).setRegistryName(ExtraTrees.blockPanel.getRegistryName())); - GameRegistry.register(ExtraTrees.blockStained); - GameRegistry.register(new ItemMetadata(ExtraTrees.blockStained).setRegistryName(ExtraTrees.blockStained.getRegistryName())); + blockCarpentry = new BlockCarpentry("carpentry"); + blockPanel = new BlockCarpentryPanel(); + blockStained = new BlockStainedDesign(); + GameRegistry.register(blockCarpentry); + GameRegistry.register(new ItemMetadata(blockCarpentry).setRegistryName(blockCarpentry.getRegistryName())); + GameRegistry.register(blockPanel); + GameRegistry.register(new ItemMetadata(blockPanel).setRegistryName(blockPanel.getRegistryName())); + GameRegistry.register(blockStained); + GameRegistry.register(new ItemMetadata(blockStained).setRegistryName(blockStained.getRegistryName())); //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockCarpentry), new MultipassItemRenderer()); //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStained), new MultipassItemRenderer()); - MinecraftForge.EVENT_BUS.register(ExtraTrees.blockCarpentry); + MinecraftForge.EVENT_BUS.register(blockCarpentry); //BinnieCore.proxy.registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer()); } diff --git a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java index 82f394c7..f0674140 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java @@ -29,7 +29,7 @@ public enum ExtraTreeTexture implements IBinnieTexture { @Override public BinnieResource getTexture() { - return Binnie.Resource.getPNG(ExtraTrees.instance, this.type, this.texture); + return Binnie.RESOURCE.getPNG(ExtraTrees.instance, this.type, this.texture); } } diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index 11b25aa2..194d093a 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -304,7 +304,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF throw Throwables.propagate(e); } } - for (final IAlleleSpecies tree : Binnie.Genetics.treeBreedingSystem.getAllSpecies()) { + for (final IAlleleSpecies tree : Binnie.GENETICS.treeBreedingSystem.getAllSpecies()) { if (tree instanceof AlleleTreeSpecies && ((IAlleleTreeSpecies) tree).getSuitableFruit().contains(familyPrune)) { ((AlleleTreeSpecies) tree).addFruitFamily(familyCitrus); } diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 8b859f5b..5b480cf3 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -63,7 +63,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { this.name = name; this.branchName = scientific.split(" ")[0].toLowerCase(); this.scientific = scientific.split(" ")[1]; - this.texture = Binnie.Resource.getPNG(ExtraTrees.instance, ResourceType.Entity, this.toString()); + this.texture = Binnie.RESOURCE.getPNG(ExtraTrees.instance, ResourceType.Entity, this.toString()); this.colour = colour; } @@ -170,7 +170,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { @Override public IButterflyRoot getRoot() { - return Binnie.Genetics.getButterflyRoot(); + return Binnie.GENETICS.getButterflyRoot(); } @Override diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index d21f25a0..ce6f7729 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -137,7 +137,7 @@ public class ExtraTreeMutation implements ITreeMutation { } public ExtraTreeMutation(final IAllele allele0, final IAllele allele1, final IAllele result, final int chance) { - this(allele0, allele1, Binnie.Genetics.getTreeRoot().getTemplate(result.getUID()), chance); + this(allele0, allele1, Binnie.GENETICS.getTreeRoot().getTemplate(result.getUID()), chance); } public ExtraTreeMutation(final IAllele allele0, final IAllele allele1, final IAllele[] template, final int chance) { @@ -151,7 +151,7 @@ public class ExtraTreeMutation implements ITreeMutation { this.allele1 = (IAlleleTreeSpecies) allele1; this.template = template; this.chance = chance; - Binnie.Genetics.getTreeRoot().registerMutation(this); + Binnie.GENETICS.getTreeRoot().registerMutation(this); } public ExtraTreeMutation setIsSecret() { @@ -233,7 +233,7 @@ public class ExtraTreeMutation implements ITreeMutation { @Override public ITreeRoot getRoot() { - return Binnie.Genetics.getTreeRoot(); + return Binnie.GENETICS.getTreeRoot(); } @Override diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 2a20699e..30cc6f4c 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -37,7 +37,7 @@ public class ModuleGenetics implements IInitializable { if (BinnieCore.isLepidopteryActive()) { for (final ButterflySpecies species2 : ButterflySpecies.values()) { //AlleleManager.alleleRegistry.registerAllele(species2); - Binnie.Genetics.getButterflyRoot().registerTemplate(species2.getTemplate()); + Binnie.GENETICS.getButterflyRoot().registerTemplate(species2.getTemplate()); final String scientific = species2.branchName.substring(0, 1).toUpperCase() + species2.branchName.substring(1).toLowerCase(); final String uid = "trees." + species2.branchName.toLowerCase(); IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid); diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java index 74d4c642..62d2df28 100644 --- a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java @@ -2,12 +2,7 @@ package binnie.extratrees.integration.jei.brewery; import binnie.extratrees.machines.brewery.BreweryRecipes; import binnie.extratrees.machines.brewery.IBreweryRecipe; -import binnie.extratrees.machines.lumbermill.LumbermillRecipes; -import net.minecraft.item.ItemStack; -import org.apache.commons.lang3.tuple.Pair; - import java.util.ArrayList; -import java.util.Collection; import java.util.List; public class BreweryRecipeMaker { diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java index 3544daea..2084a7b1 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java @@ -4,20 +4,15 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.core.geometry.Position; -import binnie.craftgui.extratrees.dictionary.ControlDistilleryProgress; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.StandardTexture; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.integration.jei.ExtraTreesJeiPlugin; import binnie.extratrees.integration.jei.RecipeUids; -import binnie.extratrees.machines.brewery.BreweryMachine; import binnie.extratrees.machines.distillery.DistilleryLogic; import binnie.extratrees.machines.distillery.DistilleryMachine; -import forestry.core.tiles.ITitled; import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IGuiFluidStackGroup; -import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.ITickTimer; import mezz.jei.api.ingredients.IIngredients; diff --git a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java index 644bda00..f7c81f15 100644 --- a/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/lumbermill/LumbermillRecipeWrapper.java @@ -2,6 +2,7 @@ package binnie.extratrees.integration.jei.lumbermill; import binnie.extratrees.ExtraTrees; import binnie.extratrees.item.ExtraTreeItems; +import binnie.extratrees.item.ModuleItems; import binnie.extratrees.machines.lumbermill.LumbermillLogic; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; @@ -27,10 +28,12 @@ public class LumbermillRecipeWrapper extends BlankRecipeWrapper { ingredients.setInput(ItemStack.class, inputLog); ingredients.setInput(FluidStack.class, WATER); + ExtraTrees.items(); + ExtraTrees.items(); ingredients.setOutputs(ItemStack.class, Arrays.asList( - ExtraTrees.itemMisc.getStack(ExtraTreeItems.Bark, 1), + ModuleItems.itemMisc.getStack(ExtraTreeItems.Bark, 1), outputPlanks, - ExtraTrees.itemMisc.getStack(ExtraTreeItems.Sawdust, 1) + ModuleItems.itemMisc.getStack(ExtraTreeItems.Sawdust, 1) )); } } diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index d0277781..a9ef973c 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -51,6 +51,7 @@ public enum ExtraTreeItems implements IItemMiscProvider { @Override public ItemStack get(final int i) { - return new ItemStack(ExtraTrees.itemMisc, i, this.ordinal()); + ExtraTrees.items(); + return new ItemStack(ModuleItems.itemMisc, i, this.ordinal()); } } diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java index d4479526..58f88d46 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java @@ -51,7 +51,7 @@ public enum ExtraTreeLiquid implements ILiquidType { @Override public FluidStack get(final int i) { - return Binnie.Liquid.getFluidStack(this.ident, i); + return Binnie.LIQUID.getFluidStack(this.ident, i); } @Override diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index 50751fa0..9413c328 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -110,7 +110,8 @@ public enum Food implements IItemMiscProvider { @Override public ItemStack get(final int i) { - return new ItemStack(ExtraTrees.itemFood, i, this.ordinal()); + ExtraTrees.items(); + return new ItemStack(ModuleItems.itemFood, i, this.ordinal()); } @Override diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 47289765..b4d53aac 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -25,26 +25,34 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleItems implements IInitializable { + + public static Item itemDictionary; + public static Item itemDictionaryLepi; + public static ItemMisc itemMisc; + public static Item itemFood; + public static Item itemHammer; + public static Item itemDurableHammer; + @Override public void preInit() { - ExtraTrees.itemMisc = new ItemMisc(Tabs.tabArboriculture, (IItemMiscProvider[]) ExtraTreeItems.values()); - ExtraTrees.proxy.registerItem(ExtraTrees.itemMisc); + itemMisc = new ItemMisc(Tabs.tabArboriculture, ExtraTreeItems.values()); + ExtraTrees.proxy.registerItem(itemMisc); - ExtraTrees.itemDictionary = new ItemDictionary(); - ExtraTrees.proxy.registerItem(ExtraTrees.itemDictionary); + itemDictionary = new ItemDictionary(); + ExtraTrees.proxy.registerItem(itemDictionary); if (BinnieCore.isLepidopteryActive()) { - ExtraTrees.itemDictionaryLepi = new ItemMothDatabase(); - ExtraTrees.proxy.registerItem(ExtraTrees.itemDictionaryLepi); + itemDictionaryLepi = new ItemMothDatabase(); + ExtraTrees.proxy.registerItem(itemDictionaryLepi); } - Binnie.Liquid.createLiquids(ExtraTreeLiquid.values(), ItemFluidContainer.LiquidExtraTree); - ExtraTrees.itemFood = new ItemETFood(); - ExtraTrees.proxy.registerItem(ExtraTrees.itemFood); + Binnie.LIQUID.createLiquids(ExtraTreeLiquid.values(), ItemFluidContainer.LiquidExtraTree); + itemFood = new ItemETFood(); + ExtraTrees.proxy.registerItem(itemFood); - ExtraTrees.itemHammer = new ItemHammer(false); - ExtraTrees.proxy.registerItem(ExtraTrees.itemHammer); - ExtraTrees.itemDurableHammer = new ItemHammer(true); - ExtraTrees.proxy.registerItem(ExtraTrees.itemDurableHammer); + itemHammer = new ItemHammer(false); + ExtraTrees.proxy.registerItem(itemHammer); + itemDurableHammer = new ItemHammer(true); + ExtraTrees.proxy.registerItem(itemDurableHammer); } @Override @@ -117,8 +125,10 @@ public class ModuleItems implements IInitializable { @Override public void postInit() { - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ExtraTrees.itemDurableHammer, 1, 0), "wiw", " s ", " s ", 'w', Blocks.OBSIDIAN, 'i', Items.GOLD_INGOT, 's', Items.STICK)); - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ExtraTrees.itemHammer, 1, 0), "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.IRON_INGOT, 's', Items.STICK)); + ModuleItems items = ExtraTrees.items(); + + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ModuleItems.itemDurableHammer, 1, 0), "wiw", " s ", " s ", 'w', Blocks.OBSIDIAN, 'i', Items.GOLD_INGOT, 's', Items.STICK)); + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(ModuleItems.itemHammer, 1, 0), "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.IRON_INGOT, 's', Items.STICK)); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeItems.Yeast.get(8), " m ", "mbm", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM)); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeItems.LagerYeast.get(8), "mbm", " m ", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM)); GameRegistry.addRecipe(ExtraTreeItems.GrainWheat.get(5), " s ", "sss", " s ", 's', Items.WHEAT_SEEDS); @@ -137,15 +147,15 @@ public class ModuleItems implements IInitializable { CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(Food.PAPAYIMAR.get(1), minium, "cropPapaya")); } catch (Exception ex) { } - RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("water", 2000), null, new ItemStack(ExtraTrees.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("water", 2000), null, new ItemStack(ExtraTrees.itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(ModuleItems.itemDictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotCopper", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(ModuleItems.itemDictionaryLepi), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotBronze", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); RecipeManagers.stillManager.addRecipe(25, ExtraTreeLiquid.Resin.get(5), ExtraTreeLiquid.Turpentine.get(3)); - RecipeManagers.carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), null, ExtraTrees.itemMisc.getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); - if (Binnie.Liquid.getFluidStack("Creosote Oil", 100) != null) { - RecipeManagers.carpenterManager.addRecipe(25, Binnie.Liquid.getFluidStack("Creosote Oil", 50), null, ExtraTrees.itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); + RecipeManagers.carpenterManager.addRecipe(25, ExtraTreeLiquid.Turpentine.get(50), null, ModuleItems.itemMisc.getStack(ExtraTreeItems.WoodWax, 4), "x", 'x', Mods.Forestry.stack("beeswax")); + if (Binnie.LIQUID.getFluidStack("Creosote Oil", 100) != null) { + RecipeManagers.carpenterManager.addRecipe(25, Binnie.LIQUID.getFluidStack("Creosote Oil", 50), null, ModuleItems.itemMisc.getStack(ExtraTreeItems.WoodWax, 1), "x", 'x', Mods.Forestry.stack("beeswax")); } for (final FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (data.fluid.isFluidEqual(Binnie.Liquid.getFluidStack("water", 0)) && data.fluid.amount == 1000) { + if (data.fluid.isFluidEqual(Binnie.LIQUID.getFluidStack("water", 0)) && data.fluid.amount == 1000) { CraftingManager.getInstance().addRecipe(Mods.Forestry.stack("mulch"), " b ", "bwb", " b ", 'b', ExtraTreeItems.Bark.get(1), 'w', data.filledContainer.copy()); } } diff --git a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java index c54b3ee5..5f72b8b3 100644 --- a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java +++ b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java @@ -41,7 +41,7 @@ public enum KitchenMachine implements IMachineType { protected PackageKitchenMachine(final String uid, final String textureName) { super(uid, false); - this.textureName = Binnie.Resource.getFile(ExtraTrees.instance, ResourceType.Tile, textureName); + this.textureName = Binnie.RESOURCE.getFile(ExtraTrees.instance, ResourceType.Tile, textureName); } protected PackageKitchenMachine(final String uid, final BinnieResource textureName) { diff --git a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java index 303da4d6..db8c2882 100644 --- a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java +++ b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java @@ -4,14 +4,18 @@ import binnie.core.IInitializable; import binnie.core.machines.MachineGroup; import binnie.extratrees.ExtraTrees; import forestry.api.core.Tabs; +import net.minecraft.block.Block; public class ModuleKitchen implements IInitializable { + + public static Block blockKitchen; + @Override public void preInit() { final MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "kitchen", "kitchen", KitchenMachine.values()); machineGroup.setCreativeTab(Tabs.tabArboriculture); machineGroup.customRenderer = false; - ExtraTrees.blockKitchen = machineGroup.getBlock(); + blockKitchen = machineGroup.getBlock(); } @Override diff --git a/src/main/java/binnie/extratrees/machines/DesignerType.java b/src/main/java/binnie/extratrees/machines/DesignerType.java index 41966a2e..3b65d65b 100644 --- a/src/main/java/binnie/extratrees/machines/DesignerType.java +++ b/src/main/java/binnie/extratrees/machines/DesignerType.java @@ -55,16 +55,19 @@ public enum DesignerType { private BlockDesign getBlock() { switch (this) { case GlassWorker: { - return ExtraTrees.blockStained; + ExtraTrees.carpentry(); + return ModuleCarpentry.blockStained; } case Panelworker: { - return ExtraTrees.blockPanel; + ExtraTrees.carpentry(); + return ModuleCarpentry.blockPanel; } case Tileworker: { return Botany.ceramicTile; } default: { - return ExtraTrees.blockCarpentry; + ExtraTrees.carpentry(); + return ModuleCarpentry.blockCarpentry; } } } diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index 9fe4ae4f..4af75cb6 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -53,7 +53,8 @@ public enum ExtraTreeMachine implements IMachineType { } public ItemStack get(final int i) { - return new ItemStack(ExtraTrees.blockMachine, i, this.ordinal()); + ExtraTrees.machine(); + return new ItemStack(ModuleMachine.blockMachine, i, this.ordinal()); } public static class ComponentExtraTreeGUI extends MachineComponent implements IInteraction.RightClick { @@ -76,7 +77,7 @@ public enum ExtraTreeMachine implements IMachineType { protected PackageExtraTreeMachine(final String uid, final String textureName, final boolean powered) { super(uid, powered); - this.textureName = Binnie.Resource.getFile(ExtraTrees.instance, ResourceType.Tile, textureName); + this.textureName = Binnie.RESOURCE.getFile(ExtraTrees.instance, ResourceType.Tile, textureName); } protected PackageExtraTreeMachine(final String uid, final BinnieResource textureName, final boolean powered) { diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index eaf1e8b6..f497af7a 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -7,6 +7,7 @@ import binnie.core.machines.MachineGroup; import binnie.extratrees.ExtraTrees; import binnie.extratrees.item.ExtraTreeItems; import forestry.api.core.Tabs; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.crafting.CraftingManager; @@ -14,11 +15,14 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { + + public static Block blockMachine; + @Override public void preInit() { final MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "machine", "machine", ExtraTreeMachine.values()); machineGroup.setCreativeTab(Tabs.tabArboriculture); - ExtraTrees.blockMachine = machineGroup.getBlock(); + blockMachine = machineGroup.getBlock(); // TODO fix rendering Object rendererMachine = null;// BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"); BinnieCore.proxy.registerTileEntity(TileEntityNursery.class, "binnie.tile.nursery", rendererMachine); diff --git a/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java index 870df1b9..1d22e92b 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java @@ -14,7 +14,7 @@ import java.util.Collections; import java.util.List; public class BrewedGrainRecipe implements IBreweryRecipe { - public static final FluidStack WATER = Binnie.Liquid.getFluidStack("water", Fluid.BUCKET_VOLUME); + public static final FluidStack WATER = Binnie.LIQUID.getFluidStack("water", Fluid.BUCKET_VOLUME); private final FluidStack output; private final int grainOreId; @@ -90,6 +90,7 @@ public class BrewedGrainRecipe implements IBreweryRecipe { return ingredientOreId != null && OreDictionaryUtil.hasOreId(itemstack, ingredientOreId); } + @Override public List getIngredients() { if (ingredientOreId == null) { return Collections.emptyList(); diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index de1a5d36..88a5008a 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -6,7 +6,8 @@ import binnie.Constants; import binnie.core.models.ModelManager; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.BlockETDecorativeLeaves; -import binnie.extratrees.block.slab.BlockETSlab; +import binnie.extratrees.block.ModuleBlocks; +import binnie.extratrees.block.wood.BlockETSlab; import binnie.extratrees.models.ModelETDecorativeLeaves; import forestry.arboriculture.PluginArboriculture; import forestry.core.models.BlockModelEntry; @@ -64,7 +65,8 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { @Override public void registerModels() { - for (BlockETDecorativeLeaves leaves : ExtraTrees.leavesDecorative) { + ExtraTrees.blocks(); + for (BlockETDecorativeLeaves leaves : ModuleBlocks.leavesDecorative) { String resourceName = leaves.getRegistryName().toString(); ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName); ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory"); @@ -72,10 +74,12 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { registerBlockModel(blockModelIndex); } - for(BlockETSlab slab : ExtraTrees.slabsDouble){ + ExtraTrees.blocks(); + for(BlockETSlab slab : ModuleBlocks.slabsDouble){ PluginArboriculture.proxy.registerWoodModel(slab, true); } - for(BlockETSlab slab : ExtraTrees.slabsDoubleFireproof){ + ExtraTrees.blocks(); + for(BlockETSlab slab : ModuleBlocks.slabsDoubleFireproof){ PluginArboriculture.proxy.registerWoodModel(slab, true); } getModelManager().registerModels(); diff --git a/src/main/java/binnie/genetics/core/GeneticsTexture.java b/src/main/java/binnie/genetics/core/GeneticsTexture.java index 9ac08e03..9409c441 100644 --- a/src/main/java/binnie/genetics/core/GeneticsTexture.java +++ b/src/main/java/binnie/genetics/core/GeneticsTexture.java @@ -26,7 +26,7 @@ public enum GeneticsTexture implements IBinnieTexture { String texture; ResourceType type; - public static BinnieIcon dnaIcon = Binnie.Resource.getItemIcon(Genetics.instance, "dna"); + public static BinnieIcon dnaIcon = Binnie.RESOURCE.getItemIcon(Genetics.instance, "dna"); GeneticsTexture(final ResourceType base, final String texture) { this.texture = texture; @@ -35,7 +35,7 @@ public enum GeneticsTexture implements IBinnieTexture { @Override public BinnieResource getTexture() { - return Binnie.Resource.getPNG(Genetics.instance, this.type, this.texture); + return Binnie.RESOURCE.getPNG(Genetics.instance, this.type, this.texture); } } diff --git a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index 2d168ea4..8f6c8916 100644 --- a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -56,7 +56,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { } else { list.add(totalList.get(0)); list.add(totalList.get(1)); - list.add(totalList.size() - 2 + " " + Binnie.Language.localise("genetic.item.gene.more.genes")); + list.add(totalList.size() - 2 + " " + Binnie.LANGUAGE.localise("genetic.item.gene.more.genes")); } } @@ -64,8 +64,8 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { if (this.genes.size() == 0) { return null; } - final BreedingSystem system = Binnie.Genetics.getSystem(this.genes.get(0).getSpeciesRoot().getUID()); - return (system == null) ? Binnie.Genetics.getActiveSystems().iterator().next() : system; + final BreedingSystem system = Binnie.GENETICS.getSystem(this.genes.get(0).getSpeciesRoot().getUID()); + return (system == null) ? Binnie.GENETICS.getActiveSystems().iterator().next() : system; } public List getGenes() { diff --git a/src/main/java/binnie/genetics/genetics/GeneItem.java b/src/main/java/binnie/genetics/genetics/GeneItem.java index 3c8c20fc..b3fdae7a 100644 --- a/src/main/java/binnie/genetics/genetics/GeneItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneItem.java @@ -59,7 +59,7 @@ public class GeneItem implements INbtReadable, INbtWritable, IGeneItem { if (this.gene == null) { return null; } - return Binnie.Genetics.getSystem(this.gene.getSpeciesRoot().getUID()); + return Binnie.GENETICS.getSystem(this.gene.getSpeciesRoot().getUID()); } public IGene getGene() { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java index 4318efa2..cbd815c1 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java @@ -47,7 +47,7 @@ public class AnalystPageBehaviour extends ControlAnalystPage { } if (ind instanceof IButterfly) { final IButterfly bee2 = (IButterfly) ind; - new ControlTextCentered(this, y, "§oMetabolism: " + Binnie.Genetics.mothBreedingSystem.getAlleleName(EnumButterflyChromosome.METABOLISM, ind.getGenome().getActiveAllele(EnumButterflyChromosome.METABOLISM))).setColour(this.getColour()); + new ControlTextCentered(this, y, "§oMetabolism: " + Binnie.GENETICS.mothBreedingSystem.getAlleleName(EnumButterflyChromosome.METABOLISM, ind.getGenome().getActiveAllele(EnumButterflyChromosome.METABOLISM))).setColour(this.getColour()); y += 20; new ControlTextCentered(this, y, "Pollinates nearby\n" + bee2.getGenome().getFlowerProvider().getDescription()).setColour(this.getColour()); y += 20; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java index 23997d73..42ff21b5 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java @@ -63,7 +63,7 @@ public class AnalystPageBiology extends ControlAnalystPage { } y += 30; } else if (ind instanceof ITree) { - new ControlTextCentered(this, y, "§oSappiness: " + Binnie.Genetics.treeBreedingSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, ind.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS))).setColour(this.getColour()); + new ControlTextCentered(this, y, "§oSappiness: " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, ind.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS))).setColour(this.getColour()); y += 20; } else { y += 10; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/AnalystPageFruit.java index 4679b821..6bd99ccf 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageFruit.java @@ -30,7 +30,7 @@ public class AnalystPageFruit extends AnalystPageProduce { int y = 4; new ControlTextCentered(this, y, "§nFruit").setColour(this.getColour()); y += 12; - new ControlTextCentered(this, y, "§oYield: " + Binnie.Genetics.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColour(this.getColour()); + new ControlTextCentered(this, y, "§oYield: " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColour(this.getColour()); y += 20; final Collection products = new UniqueItemStackSet(); final Collection specialties = new UniqueItemStackSet(); @@ -94,7 +94,7 @@ public class AnalystPageFruit extends AnalystPageProduce { } new ControlTextCentered(this, y, "Possible Fruits").setColour(this.getColour()); y += 12; - final Collection fruitAlleles = Binnie.Genetics.getChromosomeMap(Binnie.Genetics.getTreeRoot()).get(EnumTreeChromosome.FRUITS); + final Collection fruitAlleles = Binnie.GENETICS.getChromosomeMap(Binnie.GENETICS.getTreeRoot()).get(EnumTreeChromosome.FRUITS); for (final IFruitFamily fam : ind.getGenome().getPrimary().getSuitableFruit()) { final Collection stacks = new UniqueItemStackSet(); for (final IAllele a : fruitAlleles) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index 7583275b..604c32ae 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -28,7 +28,7 @@ public class AnalystPageGenome extends ControlAnalystPage { new ControlTextCentered(this, y, "§n" + this.getTitle()).setColour(this.getColour()); y += 16; final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind.getClass()); - final BreedingSystem system = Binnie.Genetics.getSystem(root); + final BreedingSystem system = Binnie.GENETICS.getSystem(root); final Control scaled = new Control(this, 0.0f, y, 0.0f, 0.0f) { @Override public void onRenderBackground() { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java b/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java index 6bb82e87..f9c9d962 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java @@ -24,9 +24,9 @@ public class AnalystPageGrowth extends ControlAnalystPage { y += 12; new ControlTextCentered(this, y, "§l" + this.getTimeString(1373.3999f * mat)).setColour(this.getColour()); y += 22; - new ControlTextCentered(this, y, "§oHeight: " + Binnie.Genetics.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColour(this.getColour()); + new ControlTextCentered(this, y, "§oHeight: " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColour(this.getColour()); y += 12; - new ControlTextCentered(this, y, "§oGirth: " + Binnie.Genetics.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColour(this.getColour()); + new ControlTextCentered(this, y, "§oGirth: " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColour(this.getColour()); y += 20; new ControlTextCentered(this, y, "Growth Conditions").setColour(this.getColour()); y += 12; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java index 1671acbe..2bc0ef47 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java @@ -19,7 +19,7 @@ public class AnalystPageKaryogram extends ControlAnalystPage { y += 16; y += 8; final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind.getClass()); - final BreedingSystem system = Binnie.Genetics.getSystem(root); + final BreedingSystem system = Binnie.GENETICS.getSystem(root); final int maxBiomePerLine = (int) ((this.w() + 4.0f - 16.0f) / 22.0f); float karygramX = (this.w() - (Math.min(maxBiomePerLine, system.getActiveKaryotype().size()) * 18 - 4)) / 2.0f; int dx = 0; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index 3b6481ae..ebcea074 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -35,7 +35,7 @@ public class AnalystPageMutations extends ControlAnalystPage { int y = 4; new ControlTextCentered(this, y, "§nMutations").setColour(this.getColour()); y += 18; - final BreedingSystem system = Binnie.Genetics.getSystem(ind.getGenome().getSpeciesRoot()); + final BreedingSystem system = Binnie.GENETICS.getSystem(ind.getGenome().getSpeciesRoot()); final List discovered = system.getDiscoveredMutations(Window.get(this).getWorld(), Window.get(this).getUsername()); final IAlleleSpecies speciesCurrent = ind.getGenome().getPrimary(); final Collection resultant = system.getResultantMutations(speciesCurrent); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java index 08a4d3d2..3e213e00 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java @@ -17,12 +17,10 @@ import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.apiculture.PluginApiculture; -import forestry.core.fluids.FluidHelper; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; @@ -39,11 +37,11 @@ public class AnalystPageProducts extends AnalystPageProduce { this.setColour(13382400); final IBeeGenome genome = ind.getGenome(); final float speed = genome.getSpeed(); - final float modeSpeed = Binnie.Genetics.getBeeRoot().getBeekeepingMode(BinnieCore.proxy.getWorld()).getBeeModifier().getProductionModifier(genome, 1.0f); + final float modeSpeed = Binnie.GENETICS.getBeeRoot().getBeekeepingMode(BinnieCore.proxy.getWorld()).getBeeModifier().getProductionModifier(genome, 1.0f); int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.produces.rate") + ": " + Binnie.Genetics.beeBreedingSystem.getAlleleName(EnumBeeChromosome.SPEED, ind.getGenome().getActiveAllele(EnumBeeChromosome.SPEED))).setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.produces.rate") + ": " + Binnie.GENETICS.beeBreedingSystem.getAlleleName(EnumBeeChromosome.SPEED, ind.getGenome().getActiveAllele(EnumBeeChromosome.SPEED))).setColour(this.getColour()); y += 20; final Collection refinedProducts = new UniqueItemStackSet(); final Collection productList = new UniqueItemStackSet(); diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java index 4c48e0c7..00698e1b 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java @@ -47,7 +47,7 @@ public class ControlAnalystChromosome extends Control implements ITooltip { @Override public void getTooltip(final Tooltip tooltip) { - final BreedingSystem system = Binnie.Genetics.getSystem(this.root); + final BreedingSystem system = Binnie.GENETICS.getSystem(this.root); tooltip.add(system.getChromosomeName(this.chromosomeType)); if (this.isHomozygous()) { tooltip.add(system.getAlleleName(this.chromosomeType, this.allele0)); diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index 827207a6..7b0b391e 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -51,6 +51,6 @@ public class ControlChromoPicker extends Control implements ITooltip { @Override public void getTooltip(final Tooltip tooltip) { - tooltip.add(Binnie.Genetics.getSystem(this.parent.getRoot()).getChromosomeName(this.type)); + tooltip.add(Binnie.GENETICS.getSystem(this.parent.getRoot()).getChromosomeName(this.type)); } } diff --git a/src/main/java/binnie/genetics/gui/ControlChromosome.java b/src/main/java/binnie/genetics/gui/ControlChromosome.java index 524e8546..5f4591ed 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlChromosome.java @@ -42,7 +42,7 @@ public class ControlChromosome extends Control implements IControlValue subtypes = GeneticsJeiPlugin.jeiHelpers.getStackHelper().getSubtypes(inputStack); for (ItemStack larvae : subtypes) { IncubatorRecipe recipe = new IncubatorRecipe(larvae, recipeLarvae.getInput(), recipeLarvae.getOutput(), recipeLarvae.getLossChance(), recipeLarvae.getChance()); - final IBee bee = Binnie.Genetics.getBeeRoot().getMember(larvae); - ItemStack drone = Binnie.Genetics.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); + final IBee bee = Binnie.GENETICS.getBeeRoot().getMember(larvae); + ItemStack drone = Binnie.GENETICS.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); recipe.setOutputStack(drone); recipes.add(new LarvaeIncubatorRecipeWrapper(recipe)); } diff --git a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java index 1bccb2d4..67a1c22c 100644 --- a/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/inoculator/InoculatorRecipeMaker.java @@ -21,7 +21,7 @@ public class InoculatorRecipeMaker { public static List create() { List recipes = new ArrayList<>(); - for (BreedingSystem system : Binnie.Genetics.getActiveSystems()) { + for (BreedingSystem system : Binnie.GENETICS.getActiveSystems()) { ISpeciesRoot root = system.getSpeciesRoot(); IChromosomeType speciesChromosomeType = root.getSpeciesChromosomeType(); IAllele[] defaultTemplate = root.getDefaultTemplate(); diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/src/main/java/binnie/genetics/item/GeneticLiquid.java index 29cea0f0..8770223b 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -64,7 +64,7 @@ public enum GeneticLiquid implements IFluidType { @Override public FluidStack get(final int amount) { - return Binnie.Liquid.getFluidStack(this.getIdentifier(), amount); + return Binnie.LIQUID.getFluidStack(this.getIdentifier(), amount); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index b2cc58c7..aff54f59 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -43,11 +43,11 @@ public abstract class ItemGene extends ItemCore { super.addInformation(itemstack, entityPlayer, list, advanced); final int damage = this.getMaxDamage() - itemstack.getItemDamage(); if (damage == 0) { - list.add(Binnie.Language.localise("genetic.item.gene.empty")); + list.add(Binnie.LANGUAGE.localise("genetic.item.gene.empty")); } else if (damage == 1) { - list.add("1 " + Binnie.Language.localise("genetic.item.gene.charge")); + list.add("1 " + Binnie.LANGUAGE.localise("genetic.item.gene.charge")); } else { - list.add(damage + " " + Binnie.Language.localise("genetic.item.gene.charges")); + list.add(damage + " " + Binnie.LANGUAGE.localise("genetic.item.gene.charges")); } final IGeneItem gene = this.getGeneItem(itemstack); gene.getInfo(list); diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index 5ae2b645..8135fa43 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -74,7 +74,7 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar @Override public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { final IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.speciesMeadows"); - itemList.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.Genetics.getBeeRoot()), false)); + itemList.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.GENETICS.getBeeRoot()), false)); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 82b576fe..1eea5548 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -46,7 +46,7 @@ public class ItemSerum extends ItemGene implements IItemSerum { @Override public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) { for (final ISpeciesRoot root : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - final Map> chromosomeMap = Binnie.Genetics.getChromosomeMap(root); + final Map> chromosomeMap = Binnie.GENETICS.getChromosomeMap(root); for (final Map.Entry> entry : chromosomeMap.entrySet()) { final IChromosomeType chromosome = entry.getKey(); for (final IAllele allele : entry.getValue()) { @@ -87,8 +87,8 @@ public class ItemSerum extends ItemGene implements IItemSerum { public String getItemStackDisplayName(final ItemStack itemstack) { final GeneItem gene = this.getGeneItem(itemstack); if (!gene.isCorrupted()) - return Binnie.Genetics.getSystem(gene.getSpeciesRoot()).getDescriptor() + " " + Binnie.Language.localise("genetic.item.gene.serum"); - return Binnie.Language.localise("genetic.item.gene.corrupted.serum"); + return Binnie.GENETICS.getSystem(gene.getSpeciesRoot()).getDescriptor() + " " + Binnie.LANGUAGE.localise("genetic.item.gene.serum"); + return Binnie.LANGUAGE.localise("genetic.item.gene.corrupted.serum"); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index d3ccf0f7..ea9ce237 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -101,7 +101,7 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { public String getItemStackDisplayName(final ItemStack itemstack) { ISpeciesRoot speciesRoot = getGeneItem(itemstack).getSpeciesRoot(); if (speciesRoot != null) - return Binnie.Genetics.getSystem(getGeneItem(itemstack).getSpeciesRoot()).getDescriptor() + " Serum Array"; + return Binnie.GENETICS.getSystem(getGeneItem(itemstack).getSpeciesRoot()).getDescriptor() + " Serum Array"; return "Corrupted Serum Array"; } diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index 14a10c4f..26dcb48c 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -11,6 +11,7 @@ import binnie.core.liquid.ItemFluidContainer; import binnie.core.resource.BinnieIcon; import binnie.extrabees.ExtraBees; import binnie.extratrees.ExtraTrees; +import binnie.extratrees.item.ModuleItems; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import forestry.api.recipes.RecipeManagers; @@ -44,7 +45,7 @@ public class ModuleItem implements IInitializable { Genetics.itemSerum = new ItemSerum(); Genetics.itemSerumArray = new ItemSerumArray(); Genetics.itemSequencer = new ItemSequence(); - Genetics.setItemGenetics(new ItemMisc(CreativeTabGenetics.instance, (IItemMiscProvider[]) GeneticsItems.values())); + Genetics.setItemGenetics(new ItemMisc(CreativeTabGenetics.instance, GeneticsItems.values())); Genetics.proxy.registerItem(Genetics.itemSerum); Genetics.proxy.registerItem(Genetics.itemSerumArray); Genetics.proxy.registerItem(Genetics.itemSequencer); @@ -59,26 +60,26 @@ public class ModuleItem implements IInitializable { Genetics.proxy.registerItem(Genetics.registry); Genetics.proxy.registerItem(Genetics.masterRegistry); - Binnie.Liquid.createLiquids(GeneticLiquid.values(), ItemFluidContainer.LiquidGenetics); + Binnie.LIQUID.createLiquids(GeneticLiquid.values(), ItemFluidContainer.LiquidGenetics); } @Override public void init() { - ModuleItem.iconNight = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.night"); - ModuleItem.iconDaytime = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.day"); - ModuleItem.iconAllDay = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.allday"); - ModuleItem.iconRain = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.rain"); - ModuleItem.iconNoRain = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.norain"); - ModuleItem.iconSky = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.sky"); - ModuleItem.iconNoSky = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.nosky"); - ModuleItem.iconFire = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.fire"); - ModuleItem.iconNoFire = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.nofire"); - ModuleItem.iconAdd = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.add"); - ModuleItem.iconArrow = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.arrow"); - ModuleItem.iconAdd0 = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.add.0"); - ModuleItem.iconArrow0 = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.arrow.0"); - ModuleItem.iconAdd1 = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.add.1"); - ModuleItem.iconArrow1 = Binnie.Resource.getItemIcon(BinnieCore.instance, "gui/analyst.arrow.1"); + ModuleItem.iconNight = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.night"); + ModuleItem.iconDaytime = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.day"); + ModuleItem.iconAllDay = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.allday"); + ModuleItem.iconRain = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.rain"); + ModuleItem.iconNoRain = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.norain"); + ModuleItem.iconSky = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.sky"); + ModuleItem.iconNoSky = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.nosky"); + ModuleItem.iconFire = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.fire"); + ModuleItem.iconNoFire = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.nofire"); + ModuleItem.iconAdd = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.add"); + ModuleItem.iconArrow = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.arrow"); + ModuleItem.iconAdd0 = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.add.0"); + ModuleItem.iconArrow0 = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.arrow.0"); + ModuleItem.iconAdd1 = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.add.1"); + ModuleItem.iconArrow1 = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.arrow.1"); } @Override @@ -122,7 +123,7 @@ public class ModuleItem implements IInitializable { 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', Items.DIAMOND)); - RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("water", 2000), null, + RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), null, new ItemStack(Genetics.database), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.DIAMOND, 'Y', Items.DIAMOND, 'R', Items.REDSTONE, 'D', Items.ENDER_EYE, 'E', Blocks.OBSIDIAN); @@ -136,7 +137,9 @@ public class ModuleItem implements IInitializable { 'a', Mods.Forestry.item("portableAlyzer"), 'd', new ItemStack(Items.DIAMOND)); - final Item[] dbs = {ExtraBees.dictionary, ExtraTrees.itemDictionary, ExtraTrees.itemDictionaryLepi, Botany.database}; + ExtraTrees.items(); + ExtraTrees.items(); + final Item[] dbs = {ExtraBees.dictionary, ModuleItems.itemDictionary, ModuleItems.itemDictionaryLepi, Botany.database}; if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) { for (final Item a2 : dbs) { for (final Item b2 : dbs) { diff --git a/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java b/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java index 5f1b0b13..9847c98a 100644 --- a/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java +++ b/src/main/java/binnie/genetics/machine/ComponentIndexerInventory.java @@ -194,9 +194,9 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im } for (final SpeciesList sortableList : speciesList.values()) { for (final ItemStack beeStack : sortableList.bees) { - if (Binnie.Genetics.getBeeRoot().isDrone(beeStack)) { + if (Binnie.GENETICS.getBeeRoot().isDrone(beeStack)) { sortableList.drones.add(this.indexerInventory.indexOf(beeStack)); - } else if (Binnie.Genetics.getBeeRoot().isMated(beeStack)) { + } else if (Binnie.GENETICS.getBeeRoot().isMated(beeStack)) { sortableList.queens.add(this.indexerInventory.indexOf(beeStack)); } else { sortableList.princesses.add(this.indexerInventory.indexOf(beeStack)); diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index f9e2db90..76c25313 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -83,17 +83,17 @@ public class Acclimatiser { public static void setupRecipes() { if (BinnieCore.isApicultureActive()) { - addTolerance(Binnie.Genetics.getBeeRoot().getUID(), EnumBeeChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); - addTolerance(Binnie.Genetics.getBeeRoot().getUID(), EnumBeeChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); + addTolerance(Binnie.GENETICS.getBeeRoot().getUID(), EnumBeeChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); + addTolerance(Binnie.GENETICS.getBeeRoot().getUID(), EnumBeeChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); } if (BinnieCore.isLepidopteryActive()) { - addTolerance(Binnie.Genetics.getButterflyRoot().getUID(), EnumButterflyChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); - addTolerance(Binnie.Genetics.getButterflyRoot().getUID(), EnumButterflyChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); + addTolerance(Binnie.GENETICS.getButterflyRoot().getUID(), EnumButterflyChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); + addTolerance(Binnie.GENETICS.getButterflyRoot().getUID(), EnumButterflyChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); } if (BinnieCore.isBotanyActive()) { - addTolerance(Binnie.Genetics.getFlowerRoot().getUID(), EnumFlowerChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); - addTolerance(Binnie.Genetics.getFlowerRoot().getUID(), EnumFlowerChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); - addTolerance(Binnie.Genetics.getFlowerRoot().getUID(), EnumFlowerChromosome.PH_TOLERANCE, ToleranceType.PH); + addTolerance(Binnie.GENETICS.getFlowerRoot().getUID(), EnumFlowerChromosome.HUMIDITY_TOLERANCE, ToleranceType.Humidity); + addTolerance(Binnie.GENETICS.getFlowerRoot().getUID(), EnumFlowerChromosome.TEMPERATURE_TOLERANCE, ToleranceType.Temperature); + addTolerance(Binnie.GENETICS.getFlowerRoot().getUID(), EnumFlowerChromosome.PH_TOLERANCE, ToleranceType.PH); } addTemperatureItem(new ItemStack(Items.BLAZE_POWDER), 0.5f); addTemperatureItem(new ItemStack(Items.BLAZE_ROD), 0.75f); diff --git a/src/main/java/binnie/genetics/machine/analyser/Analyser.java b/src/main/java/binnie/genetics/machine/analyser/Analyser.java index f27485d2..4198b5e6 100644 --- a/src/main/java/binnie/genetics/machine/analyser/Analyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/Analyser.java @@ -16,7 +16,7 @@ public class Analyser { public static boolean isAnalysable(final ItemStack stack) { final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); - return ind != null || stack.getItem() instanceof IItemAnalysable || Binnie.Genetics.getConversion(stack) != null; + return ind != null || stack.getItem() instanceof IItemAnalysable || Binnie.GENETICS.getConversion(stack) != null; } public static boolean isAnalysed(final ItemStack stack) { @@ -28,7 +28,7 @@ public class Analyser { } public static ItemStack analyse(ItemStack stack) { - final ItemStack conv = Binnie.Genetics.getConversionStack(stack); + final ItemStack conv = Binnie.GENETICS.getConversionStack(stack); if (conv != null) { stack = conv; } diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java index 7cd2116f..ef05183e 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolLogic.java @@ -18,11 +18,11 @@ public class GenepoolLogic extends ComponentProcessSetCost implements IProcess { public static int getDNAAmount(final ItemStack stack) { final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); - if (root == Binnie.Genetics.getBeeRoot()) { - if (Binnie.Genetics.getBeeRoot().isDrone(stack)) { + if (root == Binnie.GENETICS.getBeeRoot()) { + if (Binnie.GENETICS.getBeeRoot().isDrone(stack)) { return 10; } - if (Binnie.Genetics.getBeeRoot().isMated(stack)) { + if (Binnie.GENETICS.getBeeRoot().isMated(stack)) { return 50; } return 30; diff --git a/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/src/main/java/binnie/genetics/machine/incubator/Incubator.java index 9060c9db..a445c9c8 100644 --- a/src/main/java/binnie/genetics/machine/incubator/Incubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -28,7 +28,7 @@ public class Incubator { private static IncubatorRecipeLarvae LARVAE_RECIPE; public static void addRecipes() { - Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), Binnie.Liquid.getFluidStack("water", 25), GeneticLiquid.GrowthMedium.get(25), 0.2f)); + Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), Binnie.LIQUID.getFluidStack("water", 25), GeneticLiquid.GrowthMedium.get(25), 0.2f)); Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.WHEAT), GeneticLiquid.GrowthMedium.get(25), GeneticLiquid.Bacteria.get(5), 0.2f)); Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), GeneticLiquid.Bacteria.get(0), GeneticLiquid.Bacteria.get(5), 0.05f)); Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.SUGAR), GeneticLiquid.Bacteria.get(2), null, 0.5f, 0.2f) @@ -42,8 +42,8 @@ public class Incubator { @Override public ItemStack getOutputStack(final MachineUtil machine) { final ItemStack larvae = machine.getStack(3); - final IBee bee = Binnie.Genetics.getBeeRoot().getMember(larvae); - return Binnie.Genetics.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); + final IBee bee = Binnie.GENETICS.getBeeRoot().getMember(larvae); + return Binnie.GENETICS.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); } @Override diff --git a/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java b/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java index f56a56a7..bc0bd7e7 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java +++ b/src/main/java/binnie/genetics/machine/inoculator/ValidatorIndividualInoculate.java @@ -14,7 +14,7 @@ public class ValidatorIndividualInoculate extends SlotValidator { @Override public boolean isValid(final ItemStack object) { final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(object); - return root != null && Binnie.Genetics.getSystem(root).isDNAManipulable(object); + return root != null && Binnie.GENETICS.getSystem(root).isDNAManipulable(object); } @Override diff --git a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java index 86cc390c..cc18ef88 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java @@ -22,10 +22,10 @@ import net.minecraft.tileentity.TileEntity; public class PackageSequencer extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageSequencer() { super("sequencer", GeneticsTexture.Sequencer, 12058418, true); - Sequencer.fxSeqA = Binnie.Resource.getBlockIcon(Genetics.instance, "fx/sequencer.a"); - Sequencer.fxSeqG = Binnie.Resource.getBlockIcon(Genetics.instance, "fx/sequencer.g"); - Sequencer.fxSeqT = Binnie.Resource.getBlockIcon(Genetics.instance, "fx/sequencer.t"); - Sequencer.fxSeqC = Binnie.Resource.getBlockIcon(Genetics.instance, "fx/sequencer.c"); + Sequencer.fxSeqA = Binnie.RESOURCE.getBlockIcon(Genetics.instance, "fx/sequencer.a"); + Sequencer.fxSeqG = Binnie.RESOURCE.getBlockIcon(Genetics.instance, "fx/sequencer.g"); + Sequencer.fxSeqT = Binnie.RESOURCE.getBlockIcon(Genetics.instance, "fx/sequencer.t"); + Sequencer.fxSeqC = Binnie.RESOURCE.getBlockIcon(Genetics.instance, "fx/sequencer.c"); } @Override diff --git a/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java b/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java index 3bdff392..bfd2f922 100644 --- a/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java +++ b/src/main/java/binnie/genetics/machine/splicer/ValidatorIndividualInoculate.java @@ -15,7 +15,7 @@ public class ValidatorIndividualInoculate extends SlotValidator { @Override public boolean isValid(final ItemStack object) { final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(object); - return root != null && Binnie.Genetics.getSystem(root).isDNAManipulable(object); + return root != null && Binnie.GENETICS.getSystem(root).isDNAManipulable(object); } @Override