From 1ffaad9fcd75d8bbbd6f53a965857a1223b1bf0e Mon Sep 17 00:00:00 2001 From: Alexander Kornilov Date: Wed, 7 Jun 2017 07:43:47 +0300 Subject: [PATCH] [1.7.10] Some refactoring (#102) * Some refactoring * Some refactoring Added some localization * Added some localization Fix wrong branch localization in page branch overview Simplify some localization * Simplify some localization * Removed unused localize method * Simplify some localization * Removed proxy.localise method * Simplify localization --- binnie-mods-2.0(1.7.10)-ru-u8.zs | 6 - src/main/java/binnie/botany/Botany.java | 100 +++-- .../java/binnie/botany/CreativeTabBotany.java | 3 +- .../binnie/botany/ceramic/BlockCeramic.java | 2 +- .../botany/ceramic/BlockCeramicBrick.java | 4 +- .../botany/ceramic/BlockCeramicPatterned.java | 3 +- .../binnie/botany/ceramic/BlockStained.java | 2 +- .../craftgui/ControlColourMixSymbol.java | 3 +- .../craftgui/PageColorMixResultant.java | 11 +- .../binnie/botany/craftgui/PageColourMix.java | 11 +- .../craftgui/PageSpeciesFlowerGenome.java | 31 +- .../craftgui/WindowBotanistDatabase.java | 4 +- .../binnie/botany/farm/CircuitGarden.java | 11 +- .../java/binnie/botany/flower/ItemBotany.java | 16 +- .../botany/flower/ItemInsulatedTube.java | 26 +- .../java/binnie/botany/flower/ItemPollen.java | 3 +- .../java/binnie/botany/flower/ItemSeed.java | 3 +- .../binnie/botany/gardening/BlockPlant.java | 2 +- .../binnie/botany/gardening/ItemSoil.java | 13 +- .../botany/gardening/ItemSoilMeter.java | 9 +- .../botany/genetics/AlleleEffectNone.java | 3 +- .../botany/genetics/EnumFlowerColor.java | 4 +- .../java/binnie/botany/genetics/Flower.java | 13 +- .../binnie/botany/genetics/FlowerSpecies.java | 3 +- .../botany/genetics/ItemDictionary.java | 4 +- .../java/binnie/botany/items/BotanyItems.java | 2 +- .../java/binnie/botany/items/ItemClay.java | 2 +- .../binnie/botany/items/ItemFieldKit.java | 8 +- .../java/binnie/botany/items/ItemPigment.java | 2 +- .../core/circuits/BinnieCircuitLayout.java | 4 +- .../binnie/core/craftgui/WindowFieldKit.java | 14 +- .../binnie/core/craftgui/WindowGenesis.java | 2 +- .../core/craftgui/controls/ControlButton.java | 2 +- .../craftgui/controls/ControlCheckbox.java | 2 +- .../core/craftgui/controls/ControlText.java | 2 +- .../controls/ControlTextCentered.java | 2 +- .../controls/listbox/ControlTextOption.java | 2 +- .../ControlDatabaseIndividualDisplay.java | 14 +- .../database/ControlMutationItem.java | 34 +- .../database/ControlSpeciesBoxOption.java | 3 +- .../core/craftgui/database/DatabaseTab.java | 4 +- .../craftgui/database/PageBranchOverview.java | 12 +- .../craftgui/database/PageBranchSpecies.java | 5 +- .../core/craftgui/database/PageBreeder.java | 9 +- .../database/PageSpeciesMutations.java | 11 +- .../database/PageSpeciesOverview.java | 12 +- .../database/PageSpeciesResultant.java | 5 +- .../database/WindowAbstractDatabase.java | 6 +- .../core/craftgui/geometry/CraftGUIUtil.java | 4 +- .../craftgui/geometry/TextJustification.java | 18 +- .../minecraft/control/ControlEnergyBar.java | 14 +- .../minecraft/control/ControlHelp.java | 9 +- .../minecraft/control/ControlInfo.java | 3 +- .../minecraft/control/ControlLiquidTank.java | 18 +- .../minecraft/control/ControlPowerSystem.java | 5 +- .../control/ControlProgressBase.java | 23 +- .../minecraft/control/ControlSlide.java | 2 +- .../minecraft/control/ControlSlot.java | 17 +- .../minecraft/control/ControlUser.java | 3 +- .../core/craftgui/renderer/Renderer.java | 2 +- .../core/genetics/BeeBreedingSystem.java | 9 +- .../binnie/core/genetics/BreedingSystem.java | 17 +- .../binnie/core/genetics/EnumBeeModifier.java | 3 +- .../core/genetics/FlowerBreedingSystem.java | 9 +- .../core/genetics/MothBreedingSystem.java | 15 +- .../core/genetics/TreeBreedingSystem.java | 9 +- .../java/binnie/core/item/ItemGenesis.java | 2 +- .../binnie/core/liquid/FluidContainer.java | 3 +- .../core/liquid/ItemFluidContainer.java | 3 +- .../binnie/core/liquid/ManagerLiquid.java | 3 +- .../binnie/core/machines/MachinePackage.java | 4 +- .../machines/inventory/InventorySlot.java | 3 +- .../core/machines/inventory/MachineSide.java | 19 +- .../machines/inventory/SlotValidator.java | 3 +- .../core/machines/inventory/TankSlot.java | 3 +- .../core/machines/power/ErrorState.java | 17 +- .../machines/storage/WindowCompartment.java | 2 +- .../binnie/core/proxy/BinnieModProxy.java | 9 - src/main/java/binnie/core/util/I18N.java | 19 +- .../extrabees/apiary/EnumHiveFrame.java | 4 +- .../extrabees/apiary/IndustrialFrame.java | 143 ------ .../extrabees/apiary/ItemIndustrialFrame.java | 63 --- .../binnie/extrabees/apiary/ModuleApiary.java | 6 +- .../extrabees/apiary/TileExtraBeeAlveary.java | 28 +- .../apiary/machine/AlvearyFrame.java | 123 ----- .../apiary/machine/AlvearyHatchery.java | 93 ---- .../apiary/machine/AlvearyLighting.java | 32 -- .../apiary/machine/AlvearyMachine.java | 21 +- .../apiary/machine/AlvearyMutator.java | 107 ----- .../apiary/machine/AlvearyRainShield.java | 32 -- .../apiary/machine/AlvearyStimulator.java | 419 ------------------ .../apiary/machine/AlvearyTransmission.java | 74 ---- .../apiary/machine/frame/AlvearyFrame.java | 5 + .../machine/frame/FrameAlvearyPackage.java | 24 + .../machine/frame/FrameComponentModifier.java | 80 ++++ .../machine/frame/FrameSlotValidator.java | 23 + .../machine/hatchery/AlvearyHatchery.java | 5 + .../hatchery/HatcheryAlvearyPackage.java | 26 ++ .../hatchery/HatcheryComponentModifier.java | 50 +++ .../machine/hatchery/LarvaeSlotValidator.java | 23 + .../lighting/LightingAlvearyPackage.java | 17 + .../lighting/LightingComponentModifier.java | 17 + .../machine/mutator/AlvearyMutator.java | 41 ++ .../mutator/MutatorAlvearyPackage.java | 24 + .../mutator/MutatorModifierComponent.java | 29 ++ .../machine/mutator/MutatorSlotValidator.java | 23 + .../rainShield/RainShieldAlvearyPackage.java | 17 + .../RainShieldModifierComponent.java | 17 + .../machine/stimulator/AlvearyStimulator.java | 5 + .../stimulator/CircuitSlotValidator.java | 22 + .../machine/stimulator/CircuitType.java | 115 +++++ .../stimulator/StimulatorAlvearyPackage.java | 26 ++ .../machine/stimulator/StimulatorCircuit.java | 70 +++ .../StimulatorModifierComponent.java | 199 +++++++++ .../TransmissionAlvearyPackage.java | 19 + .../TransmissionModifierComponent.java | 57 +++ .../binnie/extrabees/core/ExtraBeeItems.java | 2 +- .../genetics/ExtraBeeBranchDefinition.java | 4 +- .../extrabees/genetics/ExtraBeesFlowers.java | 6 +- .../genetics/effect/EntityBeeLightning.java | 4 +- .../genetics/effect/ExtraBeesEffect.java | 58 +-- .../genetics/effect/FireworkCreator.java | 6 +- .../genetics/items/ItemDictionary.java | 9 +- .../requirements/DummyMutationCondition.java | 3 +- .../requirements/RequirementPerson.java | 3 +- .../extrabees/gui/WindowAlvearyHatchery.java | 4 +- .../extrabees/gui/WindowAlvearyMutator.java | 4 +- .../gui/WindowAlvearyStimulator.java | 4 +- .../extrabees/gui/database/ControlBiomes.java | 11 - .../gui/database/ControlClimateBar.java | 35 +- .../gui/database/ControlProductsItem.java | 7 +- .../gui/database/PageSpeciesGenome.java | 43 +- .../extrabees/liquids/ExtraBeeLiquid.java | 3 +- .../extrabees/products/EnumHoneyComb.java | 3 +- .../extrabees/products/EnumHoneyDrop.java | 3 +- .../extrabees/products/EnumPropolis.java | 3 +- .../extrabees/products/ItemHoneyCrystal.java | 3 +- .../products/ItemHoneyCrystalEmpty.java | 3 +- .../extrabees/worldgen/ItemBeehive.java | 3 +- .../binnie/extratrees/alcohol/Alcohol.java | 3 +- .../binnie/extratrees/alcohol/Glassware.java | 4 +- .../binnie/extratrees/block/BlockETDoor.java | 18 +- .../binnie/extratrees/block/BlockETLog.java | 6 +- .../extratrees/block/BlockETPlanks.java | 5 +- .../binnie/extratrees/block/BlockETSlab.java | 14 +- .../extratrees/block/BlockETStairs.java | 5 +- .../extratrees/block/BranchBlockRenderer.java | 1 + .../binnie/extratrees/block/DoorType.java | 16 +- .../binnie/extratrees/block/ILogType.java | 2 +- .../binnie/extratrees/block/ModuleBlocks.java | 8 +- .../binnie/extratrees/block/PlankType.java | 17 +- .../extratrees/block/decor/BlockFence.java | 2 +- .../extratrees/block/decor/BlockGate.java | 3 +- .../block/decor/BlockMultiFence.java | 3 +- .../extratrees/carpentry/BlockCarpentry.java | 3 +- .../carpentry/BlockCarpentryPanel.java | 3 +- .../extratrees/carpentry/BlockDesign.java | 3 +- .../carpentry/BlockStainedDesign.java | 3 +- .../extratrees/carpentry/DesignBlock.java | 104 ++--- .../extratrees/carpentry/EnumDesign.java | 3 +- .../carpentry/EnumDesignCategory.java | 3 +- .../dictionary/ControlTileSelect.java | 6 +- .../craftgui/dictionary/PageFruit.java | 4 +- .../dictionary/PagePlanksOverview.java | 19 +- .../craftgui/dictionary/PagePlanksTrees.java | 2 +- .../dictionary/PageSpeciesTreeGenome.java | 52 +-- .../craftgui/dictionary/PageWood.java | 2 +- .../dictionary/WindowArboristDatabase.java | 3 +- .../craftgui/dictionary/WindowWoodworker.java | 4 +- .../genetics/ExtraTreeFruitGene.java | 3 +- .../extratrees/genetics/ExtraTreeSpecies.java | 7 +- .../extratrees/item/ExtraTreeItems.java | 2 +- .../java/binnie/extratrees/item/Food.java | 3 +- .../binnie/extratrees/item/ItemHammer.java | 4 +- .../extratrees/worldgen/WorldGenTree.java | 4 - .../binnie/genetics/GeneticsCreativeTab.java | 4 +- .../craftgui/ControlSequencerProgress.java | 2 +- .../genetics/craftgui/WindowAcclimatiser.java | 2 +- .../genetics/craftgui/WindowAnalyser.java | 2 +- .../genetics/craftgui/WindowGenepool.java | 2 +- .../genetics/craftgui/WindowIncubator.java | 2 +- .../genetics/craftgui/WindowInoculator.java | 4 +- .../genetics/craftgui/WindowIsolator.java | 2 +- .../genetics/craftgui/WindowPolymeriser.java | 2 +- .../genetics/craftgui/WindowSequencer.java | 8 +- .../genetics/craftgui/WindowSplicer.java | 4 +- .../genetics/genetics/AlleleHelper.java | 7 +- .../genetics/gui/AnalystPageBehaviour.java | 10 +- .../genetics/gui/AnalystPageClimate.java | 6 +- .../genetics/gui/AnalystPageDatabase.java | 2 +- .../genetics/gui/AnalystPageDescription.java | 4 +- .../genetics/gui/AnalystPageGenome.java | 4 +- .../genetics/gui/AnalystPageMutations.java | 2 +- .../binnie/genetics/gui/AnalystPageSoil.java | 8 +- .../genetics/gui/ControlGenesisOption.java | 4 +- .../binnie/genetics/gui/WindowAnalyst.java | 2 +- .../binnie/genetics/item/GeneticsItems.java | 3 +- .../binnie/genetics/item/ItemAnalyst.java | 2 +- .../binnie/genetics/item/ItemDatabase.java | 2 +- .../java/binnie/genetics/item/ItemGene.java | 2 +- .../genetics/item/ItemMasterRegistry.java | 2 +- .../binnie/genetics/item/ItemRegistry.java | 2 +- .../binnie/genetics/item/ItemSequence.java | 5 +- .../java/binnie/genetics/item/ModuleItem.java | 2 +- .../genetics/machine/ModuleMachine.java | 2 +- .../AcclimatiserComponentLogic.java | 7 +- .../AcclimatiserItemSlotValidator.java | 3 +- .../analyser/AnalyserComponentLogic.java | 11 +- .../machine/analyser/DyeSlotValidator.java | 3 +- .../analyser/UnanalysedSlotValidator.java | 3 +- .../genepool/GenepoolComponentLogic.java | 9 +- .../incubator/IncubatorComponentLogic.java | 9 +- .../IndividualInoculateValidator.java | 3 +- .../inoculator/InoculatorComponentLogic.java | 27 +- .../inoculator/SerumSlotValidator.java | 3 +- .../isolator/IsolatorComponentLogic.java | 11 +- .../PolymeriserComponentLogic.java | 13 +- .../UnfilledSerumSlotValidator.java | 3 +- .../sequencer/SequencerComponentLogic.java | 9 +- .../sequencer/UnsequencedSlotValidator.java | 2 +- .../splicer/IndividualInoculateValidator.java | 3 +- .../machine/splicer/SerumSlotValidator.java | 3 +- .../splicer/SplicerComponentLogic.java | 29 +- .../assets/binniecore/lang/en_US.lang | 2 +- .../assets/binniecore/lang/ru_RU.lang | 2 +- .../assets/binniecore/lang/zh_CN.lang | 2 +- .../resources/assets/botany/lang/en_US.lang | 5 +- .../resources/assets/botany/lang/ru_RU.lang | 113 +++++ .../assets/extrabees/lang/en_US.lang | 81 ++-- .../assets/extrabees/lang/ru_RU.lang | 112 ++--- .../assets/extrabees/lang/zh_CN.lang | 60 +-- .../assets/extratrees/lang/ru_RU.lang | 2 +- 232 files changed, 1947 insertions(+), 2054 deletions(-) delete mode 100644 src/main/java/binnie/extrabees/apiary/IndustrialFrame.java delete mode 100644 src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java delete mode 100644 src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java delete mode 100644 src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java delete mode 100644 src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java delete mode 100644 src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java delete mode 100644 src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java delete mode 100644 src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java delete mode 100644 src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/frame/AlvearyFrame.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/frame/FrameAlvearyPackage.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/frame/FrameSlotValidator.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/hatchery/AlvearyHatchery.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryAlvearyPackage.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryComponentModifier.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/hatchery/LarvaeSlotValidator.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/lighting/LightingAlvearyPackage.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/lighting/LightingComponentModifier.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/mutator/AlvearyMutator.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorAlvearyPackage.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorSlotValidator.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldAlvearyPackage.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldModifierComponent.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/stimulator/AlvearyStimulator.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitSlotValidator.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorAlvearyPackage.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorCircuit.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionAlvearyPackage.java create mode 100644 src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java diff --git a/binnie-mods-2.0(1.7.10)-ru-u8.zs b/binnie-mods-2.0(1.7.10)-ru-u8.zs index 0864970a..b7be542e 100644 --- a/binnie-mods-2.0(1.7.10)-ru-u8.zs +++ b/binnie-mods-2.0(1.7.10)-ru-u8.zs @@ -20,12 +20,6 @@ import mods.nei.NEI; # DATABASES -# Apiarist Database -NEI.overrideName(,"База данных пчеловода"); -.addTooltip(format.darkGreen("Apiarist Database")); -# Master Apiarist Database -NEI.overrideName(,"База данных пчеловода-мастера"); -.addTooltip(format.darkGreen("Master Apiarist Database")); # Arborist Database NEI.overrideName(,"База данных лесовода"); .addTooltip(format.darkGreen("Arborist Database")); diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 4397d6dd..b0a119a7 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -189,54 +189,54 @@ public class Botany extends AbstractMod { return; } - if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null) { - int y = event.y; - Block block = event.world.getBlock(event.x, y, event.z); - if (block == null || !Gardening.isSoil(block)) { - block = event.world.getBlock(event.x, --y, event.z); - } - if (block == null) { + if (event.entityPlayer == null || event.entityPlayer.getHeldItem() == null) { + return; + } + + int y = event.y; + Block block = event.world.getBlock(event.x, y, event.z); + if (block == null || !Gardening.isSoil(block)) { + block = event.world.getBlock(event.x, --y, event.z); + } + if (block == null || !Gardening.isSoil(block)) { + return; + } + + IBlockSoil soil = (IBlockSoil) block; + if (Gardening.isNutrientFertiliser(event.entityPlayer.getHeldItem()) && soil.getType(event.world, event.x, y, event.z) != EnumSoilType.FLOWERBED) { + EnumSoilType type = soil.getType(event.world, event.x, y, event.z); + int next = Math.min(type.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2); + if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) { + ItemStack heldItem = event.entityPlayer.getHeldItem(); + heldItem.stackSize--; return; } + } - if (Gardening.isSoil(block)) { - IBlockSoil soil = (IBlockSoil) block; - if (Gardening.isNutrientFertiliser(event.entityPlayer.getHeldItem()) && soil.getType(event.world, event.x, y, event.z) != EnumSoilType.FLOWERBED) { - EnumSoilType type = soil.getType(event.world, event.x, y, event.z); - int next = Math.min(type.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2); - if (soil.fertilise(event.world, event.x, y, event.z, EnumSoilType.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) { - ItemStack heldItem = event.entityPlayer.getHeldItem(); - heldItem.stackSize--; - return; - } - } - - if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ACID) { - EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z); - int next = Math.max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0); - if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) { - ItemStack heldItem2 = event.entityPlayer.getHeldItem(); - heldItem2.stackSize--; - return; - } - } - - if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ALKALINE) { - EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z); - int next = Math.min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2); - if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) { - ItemStack heldItem3 = event.entityPlayer.getHeldItem(); - heldItem3.stackSize--; - return; - } - } - - if (Gardening.isWeedkiller(event.entityPlayer.getHeldItem()) && Gardening.addWeedKiller(event.world, event.x, y, event.z) && !event.entityPlayer.capabilities.isCreativeMode) { - ItemStack heldItem4 = event.entityPlayer.getHeldItem(); - --heldItem4.stackSize; - } + if (Gardening.isAcidFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ACID) { + EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z); + int next = Math.max(pH.ordinal() - Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 0); + if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) { + ItemStack heldItem2 = event.entityPlayer.getHeldItem(); + heldItem2.stackSize--; + return; } } + + if (Gardening.isAlkalineFertiliser(event.entityPlayer.getHeldItem()) && soil.getPH(event.world, event.x, y, event.z) != EnumAcidity.ALKALINE) { + EnumAcidity pH = soil.getPH(event.world, event.x, y, event.z); + int next = Math.min(pH.ordinal() + Gardening.getFertiliserStrength(event.entityPlayer.getHeldItem()), 2); + if (soil.setPH(event.world, event.x, y, event.z, EnumAcidity.values()[next]) && !event.entityPlayer.capabilities.isCreativeMode) { + ItemStack heldItem3 = event.entityPlayer.getHeldItem(); + heldItem3.stackSize--; + return; + } + } + + if (Gardening.isWeedkiller(event.entityPlayer.getHeldItem()) && Gardening.addWeedKiller(event.world, event.x, y, event.z) && !event.entityPlayer.capabilities.isCreativeMode) { + ItemStack heldItem4 = event.entityPlayer.getHeldItem(); + heldItem4.stackSize--; + } } @SubscribeEvent @@ -275,12 +275,14 @@ public class Botany extends AbstractMod { py = 1; } - if (py >= 0) { - IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.entityPlayer.getHeldItem()); - if (flower != null && Gardening.plant(world, x, y + py, z, flower, event.entityPlayer.getGameProfile()) && !event.entityPlayer.capabilities.isCreativeMode) { - ItemStack heldItem = event.entityPlayer.getHeldItem(); - --heldItem.stackSize; - } + if (py < 0) { + return; + } + + IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.entityPlayer.getHeldItem()); + if (flower != null && Gardening.plant(world, x, y + py, z, flower, event.entityPlayer.getGameProfile()) && !event.entityPlayer.capabilities.isCreativeMode) { + ItemStack heldItem = event.entityPlayer.getHeldItem(); + heldItem.stackSize--; } } diff --git a/src/main/java/binnie/botany/CreativeTabBotany.java b/src/main/java/binnie/botany/CreativeTabBotany.java index ea7c4aaa..09f2c05d 100644 --- a/src/main/java/binnie/botany/CreativeTabBotany.java +++ b/src/main/java/binnie/botany/CreativeTabBotany.java @@ -1,5 +1,6 @@ package binnie.botany; +import binnie.core.util.I18N; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; @@ -27,7 +28,7 @@ public class CreativeTabBotany extends CreativeTabs { @Override @SideOnly(Side.CLIENT) public String getTabLabel() { - return Botany.proxy.localise("tab.botany"); + return I18N.localise("botany.tab.botany"); } @Override diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 0bd40f59..762f658c 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -75,7 +75,7 @@ public class BlockCeramic extends Block implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { - return I18N.localise(Botany.instance, "ceramicBlock"); + return I18N.localise("botany.ceramicBlock"); } @Override diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index 019446dc..3b2223bf 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -531,13 +531,13 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } public String getName() { - return I18N.localise(Botany.instance, type.name); + return I18N.localise("botany." + type.name); } public void addTooltip(List tooltip) { String name = color1.getName(); if (type.canDouble() && color2 != color1) { - name = I18N.localise(Botany.instance, "colour.double", name, color2.getName()); + name = I18N.localise("botany.colour.double", name, color2.getName()); } tooltip.add(EnumChatFormatting.GRAY + name); } diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java b/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java index d0148422..3b4ce973 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java @@ -1,6 +1,5 @@ package binnie.botany.ceramic; -import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.block.TileEntityMetadata; @@ -31,7 +30,7 @@ public class BlockCeramicPatterned extends BlockDesign { @Override public String getBlockName(DesignBlock design) { - return I18N.localise(Botany.instance, "ceramicBlock"); + return I18N.localise("botany.ceramicBlock"); } @Override diff --git a/src/main/java/binnie/botany/ceramic/BlockStained.java b/src/main/java/binnie/botany/ceramic/BlockStained.java index 42b406b0..ad59d31e 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStained.java +++ b/src/main/java/binnie/botany/ceramic/BlockStained.java @@ -106,7 +106,7 @@ public class BlockStained extends Block implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { - return I18N.localise(Botany.instance, "pigmentedGlass"); + return I18N.localise("botany.pigmentedGlass"); } @Override diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index b5183686..c7b92add 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -1,6 +1,5 @@ package binnie.botany.craftgui; -import binnie.botany.Botany; import binnie.botany.api.IColourMix; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -47,7 +46,7 @@ public class ControlColourMixSymbol extends Control implements ITooltip { public void getTooltip(Tooltip tooltip) { if (type == 1) { float chance = value.getChance(); - tooltip.add(I18N.localise(Botany.instance, "gui.controls.colorMixSymbol.chance", chance)); + tooltip.add(I18N.localise("botany.gui.controls.colorMixSymbol.chance", chance)); } } } diff --git a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java b/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java index defc68b1..3ad906e6 100644 --- a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java +++ b/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java @@ -1,6 +1,5 @@ package binnie.botany.craftgui; -import binnie.botany.Botany; import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColor; import binnie.botany.core.BotanyCore; @@ -15,13 +14,13 @@ import java.util.ArrayList; import java.util.List; public class PageColorMixResultant extends PageAbstract { - protected ControlText pageSpeciesFurtherTitle; - protected ControlColorMixBox pageSpeciesFurtherList; + protected ControlText title; + protected ControlColorMixBox list; public PageColorMixResultant(IWidget parent, DatabaseTab tab) { super(parent, tab); - pageSpeciesFurtherTitle = new ControlTextCentered(this, 8.0f, I18N.localise(Botany.instance, "gui.controls.pageSpeciesFurtherTitle")); - pageSpeciesFurtherList = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Resultant); + title = new ControlTextCentered(this, 8.0f, I18N.localise("botany.gui.controls.pageSpeciesFurtherTitle")); + list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Resultant); } @Override @@ -32,6 +31,6 @@ public class PageColorMixResultant extends PageAbstract { mixes.add(mix); } } - pageSpeciesFurtherList.setOptions(mixes); + list.setOptions(mixes); } } diff --git a/src/main/java/binnie/botany/craftgui/PageColourMix.java b/src/main/java/binnie/botany/craftgui/PageColourMix.java index 13e8351c..a27d264c 100644 --- a/src/main/java/binnie/botany/craftgui/PageColourMix.java +++ b/src/main/java/binnie/botany/craftgui/PageColourMix.java @@ -1,6 +1,5 @@ package binnie.botany.craftgui; -import binnie.botany.Botany; import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColor; import binnie.botany.core.BotanyCore; @@ -15,13 +14,13 @@ import java.util.ArrayList; import java.util.List; public class PageColourMix extends PageAbstract { - ControlText pageSpeciesFurtherTitle; - ControlColorMixBox pageSpeciesFurtherList; + ControlText title; + ControlColorMixBox list; public PageColourMix(IWidget parent, DatabaseTab tab) { super(parent, tab); - pageSpeciesFurtherTitle = new ControlTextCentered(this, 8.0f, I18N.localise(Botany.instance, "gui.controls.pageColorFurtherTitle")); - pageSpeciesFurtherList = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Further); + title = new ControlTextCentered(this, 8.0f, I18N.localise("botany.gui.controls.pageColorFurtherTitle")); + list = new ControlColorMixBox(this, 4, 20, 136, 152, ControlColorMixBox.Type.Further); } @Override @@ -32,6 +31,6 @@ public class PageColourMix extends PageAbstract { mixes.add(mix); } } - pageSpeciesFurtherList.setOptions(mixes); + list.setOptions(mixes); } } diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index dbf55274..5074b89a 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -1,7 +1,6 @@ package binnie.botany.craftgui; import binnie.Binnie; -import binnie.botany.Botany; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IAlleleFlowerSpecies; @@ -18,8 +17,8 @@ import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.genetics.genetics.AlleleHelper; import binnie.core.util.I18N; +import binnie.genetics.genetics.AlleleHelper; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; @@ -48,7 +47,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies { int w = 144; int h = 176; - new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), I18N.localise(Botany.instance, "gui.database.tab.genome"), TextJustification.MiddleCenter); + new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), I18N.localise("botany.gui.database.tab.genome"), TextJustification.MIDDLE_CENTER); ControlScrollableContent scrollable = new ControlScrollableContent(this, 4.0f, 20.0f, w - 8, h - 8 - 16, 12.0f); Control contents = new Control(scrollable, 0.0f, 0.0f, w - 8 - 12, h - 8 - 16); @@ -58,30 +57,30 @@ public class PageSpeciesFlowerGenome extends PageSpecies { int y = 0; int th = 14; int valueX = w2 + 4; - new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.temp"), TextJustification.MiddleRight); - new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getTemperature()), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.temp"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getTemperature()), TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.moist"), TextJustification.MiddleRight); - new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getMoisture()), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.moist"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getMoisture()), TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.ph"), TextJustification.MiddleRight); - new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getPH()), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.ph"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getPH()), TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.fertility"), TextJustification.MiddleRight); - new ControlText(contents, new IArea(valueX, y, w3, th), genome.getFertility() + "x", TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.fertility"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(valueX, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFT); y += th; float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f; String lifespanValue = String.format("%.2f", lifespan); - new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.lifespan"), TextJustification.MiddleRight); - new ControlText(contents, new IArea(valueX, y, w3, th), I18N.localise(Botany.instance, "gui.database.tab.genome.lifespan.value", lifespanValue), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.lifespan"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(valueX, y, w3, th), I18N.localise("botany.gui.database.tab.genome.lifespan.value", lifespanValue), TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.nectar"), TextJustification.MiddleRight); - new ControlText(contents, new IArea(valueX, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("botany.gui.database.tab.genome.nectar"), TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(valueX, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MIDDLE_LEFT); y += th; int x = w2; @@ -101,7 +100,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies { } int numOfLines = 1 + (tot - 1) / 3; - new ControlText(contents, new IArea(0.0f, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), I18N.localise(Botany.instance, "gui.database.tab.genome.varieties"), TextJustification.MiddleRight); + new ControlText(contents, new IArea(0.0f, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), I18N.localise("botany.gui.database.tab.genome.varieties"), TextJustification.MIDDLE_RIGHT); y += th; contents.setSize(new IPoint(contents.size().x(), y)); scrollable.setScrollableContent(contents); diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index 45d13d2e..919f8586 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -58,7 +58,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { @Override protected String getName() { - return I18N.localise(Botany.instance, "gui.database.name"); + return I18N.localise("botany.gui.database.name"); } enum FlowerMode implements IDatabaseMode { @@ -66,7 +66,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { @Override public String getName() { - return Botany.proxy.localise("gui.database.tab." + name().toLowerCase()); + return I18N.localise("botany.gui.database.tab." + name().toLowerCase()); } } diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index ce7bece7..4a8ce1a6 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -1,6 +1,5 @@ package binnie.botany.farm; -import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.core.circuits.BinnieCircuit; @@ -29,13 +28,13 @@ public class CircuitGarden extends BinnieCircuit { if (moisture == EnumMoisture.DRY) { info += EnumChatFormatting.YELLOW - + I18N.localise(Botany.instance, "moisture.dry") + + I18N.localise("botany.moisture.dry") + EnumChatFormatting.RESET; } if (moisture == EnumMoisture.DAMP) { info += EnumChatFormatting.YELLOW - + I18N.localise(Botany.instance, "moisture.damp") + + I18N.localise("botany.moisture.damp") + EnumChatFormatting.RESET; } @@ -44,7 +43,7 @@ public class CircuitGarden extends BinnieCircuit { info += ", "; } info += EnumChatFormatting.RED - + I18N.localise(Botany.instance, "ph.acid") + + I18N.localise("botany.ph.acid") + EnumChatFormatting.RESET; } @@ -53,7 +52,7 @@ public class CircuitGarden extends BinnieCircuit { info += ", "; } info += EnumChatFormatting.GREEN - + I18N.localise(Botany.instance, "ph.neutral") + + I18N.localise("botany.ph.neutral") + EnumChatFormatting.RESET; } @@ -62,7 +61,7 @@ public class CircuitGarden extends BinnieCircuit { info += ", "; } info += EnumChatFormatting.AQUA - + I18N.localise(Botany.instance, "ph.alkaline") + + I18N.localise("botany.ph.alkaline") + EnumChatFormatting.RESET; } diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index aa58ff6d..89465549 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -79,7 +79,7 @@ public abstract class ItemBotany extends Item { } IFlower individual = (IFlower) getIndividual(itemstack); if (individual == null) { - tooltip.add(I18N.localise(Botany.instance, "item.tooltip.bugged")); + tooltip.add(I18N.localise("botany.item.tooltip.bugged")); return; } @@ -89,19 +89,19 @@ public abstract class ItemBotany extends Item { IFlowerColor stemColor = genome.getStemColor(); if (primaryColor == secondColor) { - tooltip.add(EnumChatFormatting.YELLOW + I18N.localise(Botany.instance, "item.tooltip.flowerColor1", primaryColor.getName(), stemColor.getName())); + tooltip.add(EnumChatFormatting.YELLOW + I18N.localise("botany.item.tooltip.flowerColor1", primaryColor.getName(), stemColor.getName())); } else { - tooltip.add(EnumChatFormatting.YELLOW + I18N.localise(Botany.instance, "item.tooltip.flowerColor2", primaryColor.getName(), secondColor.getName(), stemColor.getName())); + tooltip.add(EnumChatFormatting.YELLOW + I18N.localise("botany.item.tooltip.flowerColor2", primaryColor.getName(), secondColor.getName(), stemColor.getName())); } if (individual.isAnalyzed()) { if (BinnieCore.proxy.isShiftDown()) { individual.addTooltip(tooltip); } else { - tooltip.add(EnumChatFormatting.GRAY + I18N.localise(Botany.instance, "item.tooltip.holdMore")); + tooltip.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.holdMore")); } } else { - tooltip.add(I18N.localise(Botany.instance, "item.tooltip.unknownGenome")); + tooltip.add(I18N.localise("botany.item.tooltip.unknownGenome")); } } @@ -117,7 +117,7 @@ public abstract class ItemBotany extends Item { @Override public String getItemStackDisplayName(ItemStack itemstack) { if (!itemstack.hasTagCompound()) { - return I18N.localise(Botany.instance, "item.tooltip.unknown"); + return I18N.localise("botany.item.tooltip.unknown"); } IIndividual individual = getIndividual(itemstack); @@ -126,9 +126,9 @@ public abstract class ItemBotany extends Item { if (tag == null || tag.isEmpty()) { return individual.getDisplayName(); } - return I18N.localise(Botany.instance, "item.botany.name", individual.getDisplayName(), tag); + return I18N.localise("botany.item.botany.name", individual.getDisplayName(), tag); } - return I18N.localise(Botany.instance, "item.flowerCorrupted.name"); + return I18N.localise("botany.item.flowerCorrupted.name"); } @Override diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index a0e75613..5d3d5b8f 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -67,7 +67,7 @@ public class ItemInsulatedTube extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { return Material.get(stack.getItemDamage()).getName() + " " - + I18N.localise(Botany.instance, "tube.name"); + + I18N.localise("botany.tube.name"); } @Override @@ -86,10 +86,10 @@ public class ItemInsulatedTube extends Item { } enum Material { - Copper(0xe3b78e, "tube.cooper"), - Tin(0xe1eef4, "tube.tin"), - Bronze(0xddc276, "tube.bronze"), - Iron(0xd8d8d8, "tube.iron"); + Copper(0xe3b78e, "cooper"), + Tin(0xe1eef4, "tin"), + Bronze(0xddc276, "bronze"), + Iron(0xd8d8d8, "iron"); protected int color; protected String name; @@ -108,17 +108,17 @@ public class ItemInsulatedTube extends Item { } public String getName() { - return I18N.localise(Botany.instance, name); + return I18N.localise("botany.tube." + name); } } enum Insulate { - Clay(0xa1aacc, "tube.insulate.clay"), - Cobble(0x7b7b7b, "tube.insulate.cobblestone"), - Sand(0xefeab5, "tube.insulate.sand"), - HardenedClay(0x935c43, "tube.insulate.hardenedClay"), - Stone(0x6d6d6d, "tube.insulate.smoothStone"), - Sandstone(0xc1b989, "tube.insulate.sandstone"); + Clay(0xa1aacc, "clay"), + Cobble(0x7b7b7b, "cobblestone"), + Sand(0xefeab5, "sand"), + HardenedClay(0x935c43, "hardenedClay"), + Stone(0x6d6d6d, "smoothStone"), + Sandstone(0xc1b989, "sandstone"); protected int color; protected String name; @@ -137,7 +137,7 @@ public class ItemInsulatedTube extends Item { } public String getName() { - return I18N.localise(Botany.instance, name); + return I18N.localise("botany.tube.insulate." + name); } public ItemStack getStack() { diff --git a/src/main/java/binnie/botany/flower/ItemPollen.java b/src/main/java/binnie/botany/flower/ItemPollen.java index 7513ad97..3b254a88 100644 --- a/src/main/java/binnie/botany/flower/ItemPollen.java +++ b/src/main/java/binnie/botany/flower/ItemPollen.java @@ -1,6 +1,5 @@ package binnie.botany.flower; -import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; import binnie.core.util.I18N; @@ -16,6 +15,6 @@ public class ItemPollen extends ItemBotany { @Override public String getTag() { - return I18N.localise(Botany.instance, "item.pollen.tag.name"); + return I18N.localise("botany.tube.item.pollen.tag.name"); } } diff --git a/src/main/java/binnie/botany/flower/ItemSeed.java b/src/main/java/binnie/botany/flower/ItemSeed.java index af1defd0..5262b9ab 100644 --- a/src/main/java/binnie/botany/flower/ItemSeed.java +++ b/src/main/java/binnie/botany/flower/ItemSeed.java @@ -1,6 +1,5 @@ package binnie.botany.flower; -import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; import binnie.core.util.I18N; @@ -16,6 +15,6 @@ public class ItemSeed extends ItemBotany { @Override public String getTag() { - return I18N.localise(Botany.instance, "item.germling.tag.name"); + return I18N.localise("botany.tube.item.germling.tag.name"); } } diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index e24c7fba..045e022b 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -150,7 +150,7 @@ public class BlockPlant extends BlockBush { } public String getName() { - return I18N.localise(Botany.instance, "plant." + name); + return I18N.localise("botany.tube.plant." + name); } } } diff --git a/src/main/java/binnie/botany/gardening/ItemSoil.java b/src/main/java/binnie/botany/gardening/ItemSoil.java index 75030ac8..ce816b03 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoil.java +++ b/src/main/java/binnie/botany/gardening/ItemSoil.java @@ -1,6 +1,5 @@ package binnie.botany.gardening; -import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; @@ -38,12 +37,12 @@ public class ItemSoil extends ItemBlock { if (moisture == EnumMoisture.DRY) { info += EnumChatFormatting.YELLOW - + I18N.localise(Botany.instance, "moisture.dry") + + I18N.localise("botany.tube.moisture.dry") + EnumChatFormatting.RESET; } if (moisture == EnumMoisture.DAMP) { info += EnumChatFormatting.YELLOW - + I18N.localise(Botany.instance, "moisture.damp") + + I18N.localise("botany.tube.moisture.damp") + EnumChatFormatting.RESET; } @@ -52,7 +51,7 @@ public class ItemSoil extends ItemBlock { info += ", "; } info += EnumChatFormatting.YELLOW - + I18N.localise(Botany.instance, "ph.acid") + + I18N.localise("botany.tube.ph.acid") + EnumChatFormatting.RESET; } @@ -61,7 +60,7 @@ public class ItemSoil extends ItemBlock { info += ", "; } info += EnumChatFormatting.YELLOW - + I18N.localise(Botany.instance, "ph.alkaline") + + I18N.localise("botany.tube.ph.alkaline") + EnumChatFormatting.RESET; } @@ -70,14 +69,14 @@ public class ItemSoil extends ItemBlock { } if (noWeed) { - tooltip.add(I18N.localise(Botany.instance, "soil.weedkiller")); + tooltip.add(I18N.localise("botany.tube.soil.weedkiller")); } } @Override public String getItemStackDisplayName(ItemStack stack) { String soilName = type.name().toLowerCase(Locale.ENGLISH); - return I18N.localise(Botany.instance, "soil." + soilName); + return I18N.localise("botany.tube.soil." + soilName); } @Override diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 33c85ba4..d76d02ac 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -42,13 +42,12 @@ public class ItemSoilMeter extends Item { EnumMoisture moisture = soil.getMoisture(world, x, y, z); EnumAcidity pH = soil.getPH(world, x, y, z); - // TODO remove hardcoded strings ans localize EnumChatFormatting[] colors = new EnumChatFormatting[]{ EnumChatFormatting.DARK_GRAY, EnumChatFormatting.GOLD, EnumChatFormatting.LIGHT_PURPLE, }; - String info = "Type: "; + String info = I18N.localise("botany.soil.tooltip.type") + " "; info += colors[type.ordinal()] + AlleleHelper.toDisplay(type) + EnumChatFormatting.RESET; colors = new EnumChatFormatting[]{ @@ -56,7 +55,7 @@ public class ItemSoilMeter extends Item { EnumChatFormatting.GRAY, EnumChatFormatting.BLUE, }; - info += ", Moisture: "; + info += ", " + I18N.localise("botany.soil.tooltip.moisture") + " "; info += colors[moisture.ordinal()] + AlleleHelper.toDisplay(moisture) + EnumChatFormatting.RESET; colors = new EnumChatFormatting[]{ @@ -64,7 +63,7 @@ public class ItemSoilMeter extends Item { EnumChatFormatting.GREEN, EnumChatFormatting.AQUA, }; - info += ", pH: "; + info += ", " + I18N.localise("botany.soil.tooltip.pH") + " "; info += colors[pH.ordinal()] + AlleleHelper.toDisplay(pH) + EnumChatFormatting.RESET; IChatComponent chat = new ChatComponentText(info); player.addChatMessage(chat); @@ -80,6 +79,6 @@ public class ItemSoilMeter extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return I18N.localise(Botany.instance, "item.soilMeter.name"); + return I18N.localise("botany.tube.item.soilMeter.name"); } } diff --git a/src/main/java/binnie/botany/genetics/AlleleEffectNone.java b/src/main/java/binnie/botany/genetics/AlleleEffectNone.java index ef90d1f6..3079b910 100644 --- a/src/main/java/binnie/botany/genetics/AlleleEffectNone.java +++ b/src/main/java/binnie/botany/genetics/AlleleEffectNone.java @@ -2,7 +2,6 @@ package binnie.botany.genetics; import binnie.botany.api.IAlleleFlowerEffect; import binnie.botany.api.IFlowerGenome; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import forestry.api.genetics.IEffectData; import net.minecraft.world.World; @@ -30,7 +29,7 @@ public class AlleleEffectNone implements IAlleleFlowerEffect { @Override public String getName() { - return I18N.localise(BinnieCore.instance, "allele.none"); + return I18N.localise("botany.tube.allele.none"); } @Override diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java index 91d47e33..161c3b37 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java @@ -1,8 +1,8 @@ package binnie.botany.genetics; -import binnie.botany.Botany; import binnie.botany.api.IFlowerColor; import binnie.botany.core.BotanyCore; +import binnie.core.util.I18N; import forestry.api.genetics.IAlleleInteger; import java.util.Locale; @@ -2948,6 +2948,6 @@ public enum EnumFlowerColor implements IFlowerColor { @Override public String getName() { - return Botany.proxy.localise("colour." + name.toLowerCase(Locale.ENGLISH)); + return I18N.localise("botany.colour." + name.toLowerCase(Locale.ENGLISH)); } } diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/src/main/java/binnie/botany/genetics/Flower.java index 274d6dfd..fd43d90e 100644 --- a/src/main/java/binnie/botany/genetics/Flower.java +++ b/src/main/java/binnie/botany/genetics/Flower.java @@ -1,6 +1,5 @@ package binnie.botany.genetics; -import binnie.botany.Botany; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IColourMix; @@ -58,14 +57,14 @@ public class Flower extends Individual implements IFlower { IAlleleFlowerSpecies primary = genome.getPrimary(); IAlleleFlowerSpecies secondary = genome.getSecondary(); if (!isPureBred(EnumFlowerChromosome.SPECIES)) { - list.add(EnumChatFormatting.BLUE + I18N.localise(Botany.instance, "item.tooltip.hybrid", primary.getName(), secondary.getName())); + list.add(EnumChatFormatting.BLUE + I18N.localise("botany.item.tooltip.hybrid", primary.getName(), secondary.getName())); } - list.add(EnumChatFormatting.GRAY + I18N.localise(Botany.instance, "item.tooltip.age", getAge())); - list.add(EnumChatFormatting.GREEN + I18N.localise(Botany.instance, "item.tooltip.temperature", AlleleHelper.toDisplay(primary.getTemperature()), AlleleHelper.toDisplay(genome.getToleranceTemperature()))); - list.add(EnumChatFormatting.GREEN + I18N.localise(Botany.instance, "item.tooltip.moisture", AlleleHelper.toDisplay(primary.getMoisture()), AlleleHelper.toDisplay(genome.getToleranceMoisture()))); - list.add(EnumChatFormatting.GREEN + I18N.localise(Botany.instance, "item.tooltip.pH", AlleleHelper.toDisplay(primary.getHumidity()), AlleleHelper.toDisplay(genome.getTolerancePH()))); - list.add(EnumChatFormatting.GRAY + I18N.localise(Botany.instance, "item.tooltip.fertility", genome.getFertility())); + list.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.age", getAge())); + list.add(EnumChatFormatting.GREEN + I18N.localise("botany.item.tooltip.temperature", AlleleHelper.toDisplay(primary.getTemperature()), AlleleHelper.toDisplay(genome.getToleranceTemperature()))); + list.add(EnumChatFormatting.GREEN + I18N.localise("botany.item.tooltip.moisture", AlleleHelper.toDisplay(primary.getMoisture()), AlleleHelper.toDisplay(genome.getToleranceMoisture()))); + list.add(EnumChatFormatting.GREEN + I18N.localise("botany.item.tooltip.pH", AlleleHelper.toDisplay(primary.getHumidity()), AlleleHelper.toDisplay(genome.getTolerancePH()))); + list.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.fertility", genome.getFertility())); } @Override diff --git a/src/main/java/binnie/botany/genetics/FlowerSpecies.java b/src/main/java/binnie/botany/genetics/FlowerSpecies.java index 99d791cf..8c9cc9f2 100644 --- a/src/main/java/binnie/botany/genetics/FlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/FlowerSpecies.java @@ -1,6 +1,5 @@ package binnie.botany.genetics; -import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumMoisture; @@ -521,7 +520,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { @Override public String getName() { - return I18N.localise(Botany.instance, "flower." + name); + return I18N.localise("botany.tube.flower." + name); } @Override diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 77e7f4a0..d36c73ad 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -61,7 +61,7 @@ public class ItemDictionary extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { return (stack.getItemDamage() == 0) - ? I18N.localise(Botany.instance, "item.botanistDatabase.0.name") - : I18N.localise(Botany.instance, "item.botanistDatabase.1.name"); + ? I18N.localise("botany.tube.item.botanistDatabase.0.name") + : I18N.localise("botany.tube.item.botanistDatabase.1.name"); } } diff --git a/src/main/java/binnie/botany/items/BotanyItems.java b/src/main/java/binnie/botany/items/BotanyItems.java index 13e3a319..94e3fab9 100644 --- a/src/main/java/binnie/botany/items/BotanyItems.java +++ b/src/main/java/binnie/botany/items/BotanyItems.java @@ -45,7 +45,7 @@ public enum BotanyItems implements IItemMisc { @Override public String getName(ItemStack itemStack) { - return I18N.localise(Botany.instance, "item." + name + ".name"); + return I18N.localise("botany.tube.item." + name + ".name"); } @Override diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/src/main/java/binnie/botany/items/ItemClay.java index 364d65ca..8905084c 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/src/main/java/binnie/botany/items/ItemClay.java @@ -37,7 +37,7 @@ public class ItemClay extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return I18N.localise(Botany.instance, "item.clay.name"); + return I18N.localise("botany.tube.item.clay.name"); } @Override diff --git a/src/main/java/binnie/botany/items/ItemFieldKit.java b/src/main/java/binnie/botany/items/ItemFieldKit.java index 2249641c..2a345871 100644 --- a/src/main/java/binnie/botany/items/ItemFieldKit.java +++ b/src/main/java/binnie/botany/items/ItemFieldKit.java @@ -67,12 +67,12 @@ public class ItemFieldKit extends Item { public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { int i = getMaxDamage() - itemStack.getItemDamage(); if (i == 0) { - tooltip.add(I18N.localise(Botany.instance, "item.fieldKit.tooltip.noPaper")); + tooltip.add(I18N.localise("botany.item.fieldKit.tooltip.noPaper")); } else { if (i > 1) { - tooltip.add(I18N.localise(Botany.instance, "item.fieldKit.tooltip.sheetsOfPaper", i)); + tooltip.add(I18N.localise("botany.item.fieldKit.tooltip.sheetsOfPaper", i)); } else { - tooltip.add(I18N.localise(Botany.instance, "item.fieldKit.tooltip.sheetOfPaper", i)); + tooltip.add(I18N.localise("botany.item.fieldKit.tooltip.sheetOfPaper", i)); } } super.addInformation(itemStack, player, tooltip, advanced); @@ -80,6 +80,6 @@ public class ItemFieldKit extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return I18N.localise(Botany.instance, "item.fieldKit.name"); + return I18N.localise("botany.item.fieldKit.name"); } } diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index 65fa51f1..02166ef1 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -37,7 +37,7 @@ public class ItemPigment extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return I18N.localise(Botany.instance, "item.pigment.name"); + return I18N.localise("botany.tube.item.pigment.name"); } @Override diff --git a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java index ef07f2f4..73bc6d35 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java @@ -24,12 +24,12 @@ public class BinnieCircuitLayout implements ICircuitLayout { @Override public String getName() { - return I18N.localise(mod, "circuit.layout." + uid.toLowerCase()); + return I18N.localise(mod.getModID() + ".circuit.layout." + uid.toLowerCase()); } @Override public String getUsage() { - return I18N.localise(mod, "circuit.layout." + uid.toLowerCase() + ".usage"); + return I18N.localise(mod.getModID() + ".circuit.layout." + uid.toLowerCase() + ".usage"); } @Override diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index e7141583..9a927530 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -76,7 +76,7 @@ public class WindowFieldKit extends Window { @Override protected String getName() { - return I18N.localise(BinnieCore.instance, "gui.fieldKit"); + return I18N.localise("binniecore.gui.fieldKit"); } private void setupValidators() { @@ -89,7 +89,7 @@ public class WindowFieldKit extends Window { @Override public String getTooltip() { - return I18N.localise(BinnieCore.instance, "gui.tooltip.individual"); + return I18N.localise("binniecore.gui.tooltip.individual"); } }); @@ -101,7 +101,7 @@ public class WindowFieldKit extends Window { @Override public String getTooltip() { - return I18N.localise(BinnieCore.instance, "gui.tooltip.paper"); + return I18N.localise("binniecore.gui.tooltip.paper"); } }); getWindowInventory().disableAutoDispense(1); @@ -119,8 +119,8 @@ public class WindowFieldKit extends Window { GlassControl = new ControlImage(this, handGlass.x(), handGlass.y(), new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett)); new ControlSlot(this, handGlass.x() + 54.0f, handGlass.y() + 26.0f).assign(InventoryType.Window, 0); new ControlSlot(this, 208.0f, 8.0f).assign(InventoryType.Window, 1); - (text = new ControlText(this, new IPoint(232.0f, 13.0f), I18N.localise(BinnieCore.instance, "gui.tooltip.paper"))).setColor(0x222222); - (text = new ControlText(this, new IArea(0.0f, 120.0f, w(), 24.0f), "", TextJustification.MiddleCenter)).setColor(0x222222); + (text = new ControlText(this, new IPoint(232.0f, 13.0f), I18N.localise("binniecore.gui.tooltip.paper"))).setColor(0x222222); + (text = new ControlText(this, new IArea(0.0f, 120.0f, w(), 24.0f), "", TextJustification.MIDDLE_CENTER)).setColor(0x222222); chromo = new ControlChromosome(this, 150.0f, 24.0f); addEventHandler(new EventValueChanged.Handler() { @@ -230,7 +230,7 @@ public class WindowFieldKit extends Window { if (item != null && !Analyser.isAnalysed(item)) { if (getWindowInventory().getStackInSlot(1) == null) { - text.setValue(I18N.localise(BinnieCore.instance, "gui.tooltip.noPaper")); + text.setValue(I18N.localise("binniecore.gui.tooltip.noPaper")); isAnalysing = false; analyseProgress = 1.0f; } else { @@ -264,7 +264,7 @@ public class WindowFieldKit extends Window { @Override public String showInfoButton() { - return I18N.localise(BinnieCore.instance, "gui.fieldKit.info"); + return I18N.localise("binniecore.gui.fieldKit.info"); } @Override diff --git a/src/main/java/binnie/core/craftgui/WindowGenesis.java b/src/main/java/binnie/core/craftgui/WindowGenesis.java index 6c018c10..6de17dc3 100644 --- a/src/main/java/binnie/core/craftgui/WindowGenesis.java +++ b/src/main/java/binnie/core/craftgui/WindowGenesis.java @@ -56,7 +56,7 @@ public class WindowGenesis extends Window { @Override protected String getName() { - return I18N.localise(BinnieCore.instance, "gui.genesis"); + return I18N.localise("binniecore.gui.genesis"); } @Override diff --git a/src/main/java/binnie/core/craftgui/controls/ControlButton.java b/src/main/java/binnie/core/craftgui/controls/ControlButton.java index 61e26dbf..ffd2f735 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlButton.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlButton.java @@ -24,7 +24,7 @@ public class ControlButton extends Control { public ControlButton(IWidget parent, float x, float y, float width, float height, String text) { this(parent, x, y, width, height); this.text = text; - textWidget = new ControlText(this, getArea(), text, TextJustification.MiddleCenter); + textWidget = new ControlText(this, getArea(), text, TextJustification.MIDDLE_CENTER); } private EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() { diff --git a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java index 8aaf8e6e..1cba7234 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java @@ -26,7 +26,7 @@ public class ControlCheckbox extends Control implements IControlValue { this.text = text; value = bool; if (w > 16.0f) { - new ControlText(this, new IArea(16.0f, 1.0f, w - 16.0f, 16.0f), text, TextJustification.MiddleCenter).setColor(4473924); + new ControlText(this, new IArea(16.0f, 1.0f, w - 16.0f, 16.0f), text, TextJustification.MIDDLE_CENTER).setColor(4473924); } addAttribute(WidgetAttribute.MOUSE_OVER); diff --git a/src/main/java/binnie/core/craftgui/controls/ControlText.java b/src/main/java/binnie/core/craftgui/controls/ControlText.java index 4d650d38..56f86943 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlText.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlText.java @@ -13,7 +13,7 @@ public class ControlText extends Control implements IControlValue { private TextJustification align; public ControlText(IWidget parent, IPoint pos, String text) { - this(parent, new IArea(pos, new IPoint(500.0f, 0.0f)), text, TextJustification.TopLeft); + this(parent, new IArea(pos, new IPoint(500.0f, 0.0f)), text, TextJustification.TOP_LEFT); } public ControlText(IWidget parent, String text, TextJustification align) { diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java b/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java index 1c11ed05..79441894 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java @@ -7,6 +7,6 @@ import binnie.core.craftgui.geometry.TextJustification; public class ControlTextCentered extends ControlText { public ControlTextCentered(IWidget parent, float y, String text) { - super(parent, new IArea(new IPoint(0.0f, y), new IPoint(parent.size().x(), 0.0f)), text, TextJustification.TopCenter); + super(parent, new IArea(new IPoint(0.0f, y), new IPoint(parent.size().x(), 0.0f)), text, TextJustification.TOP_CENTER); } } diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java index 9f289eb5..83e488ef 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java @@ -11,7 +11,7 @@ public class ControlTextOption extends ControlOption { public ControlTextOption(ControlList controlList, T option, String optionName, int y) { super(controlList, option, y); textWidget = null; - textWidget = new ControlText(this, getArea(), optionName, TextJustification.MiddleCenter); + textWidget = new ControlText(this, getArea(), optionName, TextJustification.MIDDLE_CENTER); mouseHandler.setOrigin(EventHandler.Origin.Self, this); addEventHandler(mouseHandler); diff --git a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java index 82d6c096..3c79e33d 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java @@ -1,7 +1,6 @@ package binnie.core.craftgui.database; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -34,11 +33,14 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme BreedingSystem system = Binnie.Genetics.getSystem(speciesRoot.getUID()); IIndividual ind = system.getSpeciesRoot().templateAsIndividual(system.getSpeciesRoot().getTemplate(species.getUID())); super.setItemStack(system.getSpeciesRoot().getMemberStack(ind, system.getDefaultType())); - GameProfile username = Window.get(this).getUsername(); + Window window = Window.get(this); + GameProfile username = window.getUsername(); if (state == EnumDiscoveryState.UNDETERMINED) { - state = (system.isSpeciesDiscovered(species, Window.get(this).getWorld(), username) ? EnumDiscoveryState.DISCOVERED : EnumDiscoveryState.UNDISCOVERED); - } else if (Window.get(this) instanceof WindowAbstractDatabase && ((WindowAbstractDatabase) Window.get(this)).isNEI) { + state = system.isSpeciesDiscovered(species, window.getWorld(), username) + ? EnumDiscoveryState.DISCOVERED + : EnumDiscoveryState.UNDISCOVERED; + } else if (window instanceof WindowAbstractDatabase && ((WindowAbstractDatabase) window).isNEI) { state = EnumDiscoveryState.SHOW; } @@ -95,11 +97,11 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme break; case DISCOVERED: - tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.discovered.discovered")); + tooltip.add(I18N.localise("binniecore.gui.database.discovered.discovered")); break; case UNDISCOVERED: - tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.discovered.undiscovered")); + tooltip.add(I18N.localise("binniecore.gui.database.discovered.undiscovered")); break; } } diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java b/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java index 1eaf72e3..cffd728c 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java @@ -8,39 +8,43 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; class ControlMutationItem extends ControlOption { - private ControlDatabaseIndividualDisplay itemWidget1; - private ControlDatabaseIndividualDisplay itemWidget2; - private ControlDatabaseIndividualDisplay itemWidget3; - private ControlMutationSymbol addSymbol; - private ControlMutationSymbol arrowSymbol; - public ControlMutationItem(ControlList controlList, IMutation option, IAlleleSpecies species, int y) { super(controlList, option, y); - itemWidget1 = new ControlDatabaseIndividualDisplay(this, 4.0f, 4.0f); - itemWidget2 = new ControlDatabaseIndividualDisplay(this, 44.0f, 4.0f); - itemWidget3 = new ControlDatabaseIndividualDisplay(this, 104.0f, 4.0f); - addSymbol = new ControlMutationSymbol(this, 24, 4, 0); - arrowSymbol = new ControlMutationSymbol(this, 64, 4, 1); + ControlDatabaseIndividualDisplay itemWidget1 = new ControlDatabaseIndividualDisplay(this, 4.0f, 4.0f); + ControlDatabaseIndividualDisplay itemWidget2 = new ControlDatabaseIndividualDisplay(this, 44.0f, 4.0f); + ControlDatabaseIndividualDisplay itemWidget3 = new ControlDatabaseIndividualDisplay(this, 104.0f, 4.0f); + ControlMutationSymbol addSymbol = new ControlMutationSymbol(this, 24, 4, 0); + ControlMutationSymbol arrowSymbol = new ControlMutationSymbol(this, 64, 4, 1); boolean isNEI = ((WindowAbstractDatabase) getSuperParent()).isNEI(); BreedingSystem system = ((WindowAbstractDatabase) getSuperParent()).getBreedingSystem(); + Window window = Window.get(this); if (getValue() == null) { return; } - boolean isMutationDiscovered = system.isMutationDiscovered(getValue(), Window.get(this).getWorld(), Window.get(this).getUsername()); + boolean isMutationDiscovered = system.isMutationDiscovered(getValue(), window.getWorld(), window.getUsername()); IAlleleSpecies allele; EnumDiscoveryState state; allele = getValue().getAllele0(); - state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species == allele) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); + state = getState(isNEI, isMutationDiscovered, species, allele); itemWidget1.setSpecies(allele, state); + allele = getValue().getAllele1(); - state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species == allele) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); + state = getState(isNEI, isMutationDiscovered, species, allele); itemWidget2.setSpecies(allele, state); + allele = (IAlleleSpecies) getValue().getTemplate()[0]; - state = ((isNEI || isMutationDiscovered) ? EnumDiscoveryState.SHOW : ((species == allele) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED)); + state = getState(isNEI, isMutationDiscovered, species, allele); itemWidget3.setSpecies(allele, state); + addSymbol.setValue(getValue()); arrowSymbol.setValue(getValue()); } + + private EnumDiscoveryState getState(boolean isNEI, boolean isMutationDiscovered, IAlleleSpecies species, IAlleleSpecies allele) { + return (isNEI || isMutationDiscovered || species == allele) + ? EnumDiscoveryState.SHOW + : EnumDiscoveryState.UNDETERMINED; + } } diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java index 3efe9b8a..d3751a49 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.database; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.listbox.ControlList; @@ -25,7 +24,7 @@ class ControlSpeciesBoxOption extends ControlTextOption { textWidget.setValue(option.getName()); addAttribute(WidgetAttribute.MOUSE_OVER); } else { - textWidget.setValue(I18N.localise(BinnieCore.instance, "gui.database.discovered.undiscovered")); + textWidget.setValue(I18N.localise("binniecore.gui.database.discovered.undiscovered")); } CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f)); diff --git a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java index 299048c7..faa3a760 100644 --- a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java +++ b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java @@ -16,11 +16,11 @@ public class DatabaseTab implements ITooltipHelp { @Override public String toString() { - return I18N.localise(mod, "gui.database.tab." + unloc); + return I18N.localise(mod.getModID() + ".gui.database.tab." + unloc); } @Override public void getHelpTooltip(Tooltip tooltip) { - tooltip.add(I18N.localiseOrBlank(mod, "gui.database.tab." + unloc + ".help")); + tooltip.add(I18N.localiseOrBlank(mod.getModID() + ".gui.database.tab." + unloc + ".help")); } } diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java index 2f14e9e3..34ba446f 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.database; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -28,19 +27,20 @@ public class PageBranchOverview extends PageBranch { @Override public void onValueChanged(IClassification branch) { + String name = I18N.localise(branch.getName()); branchName.setValue( EnumChatFormatting.BOLD - + I18N.localise(BinnieCore.instance, "gui.database.branch.name", branch.getName()) + + I18N.localise("binniecore.gui.database.branch.name", name) + EnumChatFormatting.RESET ); branchScientific.setValue( EnumChatFormatting.ITALIC - + I18N.localise(BinnieCore.instance, "gui.database.branch.apidae", branch.getScientific()) + + I18N.localise("binniecore.gui.database.branch.apidae", branch.getScientific()) + EnumChatFormatting.RESET ); branchAuthority.setValue( EnumChatFormatting.BOLD - + I18N.localise(BinnieCore.instance, "gui.database.branch.discoveredBy", branch.getMemberSpecies()[0].getAuthority()) + + I18N.localise("binniecore.gui.database.branch.discoveredBy", branch.getMemberSpecies()[0].getAuthority()) + EnumChatFormatting.RESET); for (IWidget widget : branchDescription) { @@ -49,8 +49,8 @@ public class PageBranchOverview extends PageBranch { branchDescription.clear(); String desc = branch.getDescription(); - if (desc == null || desc.isEmpty()) { - desc = I18N.localise(BinnieCore.instance, "gui.database.branch.noDesc"); + if (desc.contains("for.genus.bees.")) { // unlocalized + desc = I18N.localise("binniecore.gui.database.branch.noDesc"); } StringBuilder line = new StringBuilder(); diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java index d2be65d5..e6a9c3dd 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java @@ -1,8 +1,6 @@ package binnie.core.craftgui.database; -import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.events.EventValueChanged; import binnie.core.util.I18N; @@ -11,7 +9,6 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; public class PageBranchSpecies extends PageBranch { - private ControlText title; private ControlSpeciesBox speciesList; @Mod.EventHandler @@ -21,7 +18,7 @@ public class PageBranchSpecies extends PageBranch { public PageBranchSpecies(IWidget parent, DatabaseTab tab) { super(parent, tab); - title = new ControlTextCentered(this, 8.0f, I18N.localise(BinnieCore.instance, "gui.database.species")); + new ControlTextCentered(this, 8.0f, I18N.localise("binniecore.gui.database.species")); addEventHandler(new ValueHandler()); speciesList = new ControlSpeciesBox(this, 4.0f, 20.0f, 136.0f, 152.0f); } diff --git a/src/main/java/binnie/core/craftgui/database/PageBreeder.java b/src/main/java/binnie/core/craftgui/database/PageBreeder.java index 5b293b97..6298db23 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreeder.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreeder.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.database; -import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.page.ControlPage; @@ -27,16 +26,16 @@ public class PageBreeder extends ControlPage { BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem(); new ControlTextCentered(this, 8.0f, EnumChatFormatting.BOLD - + I18N.localise(BinnieCore.instance, "gui.database.descriptor", system.getDescriptor()) + + I18N.localise("binniecore.gui.database.descriptor", system.getDescriptor()) + EnumChatFormatting.RESET ); - new ControlTextCentered(this, 75.0f, I18N.localise(BinnieCore.instance, "gui.database.species.count", system.discoveredSpeciesCount, system.totalSpeciesCount)); + new ControlTextCentered(this, 75.0f, I18N.localise("binniecore.gui.database.species.count", system.discoveredSpeciesCount, system.totalSpeciesCount)); new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage); - new ControlTextCentered(this, 75.0f, I18N.localise(BinnieCore.instance, "gui.database.branches.count", system.discoveredBranchCount, system.totalBranchCount)); + new ControlTextCentered(this, 75.0f, I18N.localise("binniecore.gui.database.branch.count", system.discoveredBranchCount, system.totalBranchCount)); new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage); if (system.discoveredSecretCount > 0) { - new ControlTextCentered(this, 75.0f, I18N.localise(BinnieCore.instance, "gui.database.species.secretCount", system.discoveredSecretCount, system.totalSecretCount)); + new ControlTextCentered(this, 75.0f, I18N.localise("binniecore.gui.database.species.secretCount", system.discoveredSecretCount, system.totalSecretCount)); } new ControlTextCentered(this, 32.0f, player.getName()); diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java index cde0ad1a..b52cd8b0 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java @@ -1,24 +1,21 @@ package binnie.core.craftgui.database; -import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesMutations extends PageSpecies { - private ControlText furtherTitle; - private ControlMutationBox furtherList; + private ControlMutationBox list; public PageSpeciesMutations(IWidget parent, DatabaseTab tab) { super(parent, tab); - furtherTitle = new ControlTextCentered(this, 8.0f, I18N.localise(BinnieCore.instance, "gui.database.furtherMutations")); - furtherList = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.FURTHER); + new ControlTextCentered(this, 8.0f, I18N.localise("binniecore.gui.database.furtherMutations")); + list = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.FURTHER); } @Override public void onValueChanged(IAlleleSpecies species) { - furtherList.setSpecies(species); + list.setSpecies(species); } } diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java index 8e051e01..4b62e9a4 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.database; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -30,15 +29,18 @@ public class PageSpeciesOverview extends PageSpecies { controlScientific = new ControlTextCentered(this, 32.0f, ""); controlAuthority = new ControlTextCentered(this, 44.0f, ""); controlComplexity = new ControlTextCentered(this, 56.0f, ""); - controlDescription = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.MiddleCenter); - controlSignature = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.BottomRight); + controlDescription = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.MIDDLE_CENTER); + controlSignature = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.BOTTOM_RIGHT); } @Override public void onValueChanged(IAlleleSpecies species) { controlInd1.setSpecies(species, EnumDiscoveryState.SHOW); controlInd2.setSpecies(species, EnumDiscoveryState.SHOW); - String branchBinomial = (species.getBranch() != null) ? species.getBranch().getScientific() : ""; + String branchBinomial = (species.getBranch() != null) + ? species.getBranch().getScientific() + : ""; + controlName.setValue(EnumChatFormatting.BOLD + species.getName() + EnumChatFormatting.RESET); controlScientific.setValue(EnumChatFormatting.ITALIC + branchBinomial + " " + species.getBinomial() + EnumChatFormatting.RESET); controlAuthority.setValue(EnumChatFormatting.BOLD + "Discovered by " + species.getAuthority() + EnumChatFormatting.RESET); @@ -48,7 +50,7 @@ public class PageSpeciesOverview extends PageSpecies { String descSig = ""; if (desc == null || desc.isEmpty()) { - descBody += I18N.localise(BinnieCore.instance, "gui.database.species.noDesc"); + descBody += I18N.localise("binniecore.gui.database.species.noDesc"); } else { String[] descStrings = desc.split("\\|"); descBody += descStrings[0]; diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java index a332e898..3bfd45cb 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java @@ -1,19 +1,16 @@ package binnie.core.craftgui.database; -import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesResultant extends PageSpecies { - private ControlText title; private ControlMutationBox list; public PageSpeciesResultant(IWidget parent, DatabaseTab tab) { super(parent, tab); - title = new ControlTextCentered(this, 8.0f, I18N.localise(BinnieCore.instance, "gui.database.resultantMutations")); + new ControlTextCentered(this, 8.0f, I18N.localise("binniecore.gui.database.resultantMutations")); list = new ControlMutationBox(this, 4, 20, 136, 152, ControlMutationBox.Type.RESULTANT); } diff --git a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java index f1c3596b..87d08477 100644 --- a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.database; -import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextEdit; import binnie.core.craftgui.controls.listbox.ControlListBox; @@ -21,6 +20,7 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlHelp; import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; +import binnie.core.util.I18N; import binnie.core.util.IValidator; import com.mojang.authlib.GameProfile; import cpw.mods.fml.relauncher.Side; @@ -228,7 +228,7 @@ public abstract class WindowAbstractDatabase extends Window { @Override public String getName() { - return BinnieCore.proxy.localise("gui.database.mode." + name().toLowerCase()); + return I18N.localise("binniecore.gui.database.mode." + name().toLowerCase()); } } @@ -250,6 +250,6 @@ public abstract class WindowAbstractDatabase extends Window { CraftGUIUtil.alignToWidget(infoPages = new ControlPages<>(modePage, 0.0f, 0.0f, 144.0f, 176.0f), database.panelInformation); } - public abstract void createListBox(IArea p0); + public abstract void createListBox(IArea area); } } diff --git a/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java b/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java index aa0c9e8a..6aa10170 100644 --- a/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java +++ b/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java @@ -16,7 +16,7 @@ public class CraftGUIUtil { } public static void horizontalGrid(float px, float py, IWidget... widgets) { - horizontalGrid(px, py, TextJustification.MiddleCenter, 0.0f, widgets); + horizontalGrid(px, py, TextJustification.MIDDLE_CENTER, 0.0f, widgets); } public static void horizontalGrid(float px, float py, TextJustification just, float spacing, IWidget... widgets) { @@ -32,7 +32,7 @@ public class CraftGUIUtil { } public static void verticalGrid(float px, float py, IWidget... widgets) { - horizontalGrid(px, py, TextJustification.MiddleCenter, 0.0f, widgets); + horizontalGrid(px, py, TextJustification.MIDDLE_CENTER, 0.0f, widgets); } public static void verticalGrid(float px, float py, TextJustification just, float spacing, IWidget... widgets) { diff --git a/src/main/java/binnie/core/craftgui/geometry/TextJustification.java b/src/main/java/binnie/core/craftgui/geometry/TextJustification.java index aa1f762e..e9890db9 100644 --- a/src/main/java/binnie/core/craftgui/geometry/TextJustification.java +++ b/src/main/java/binnie/core/craftgui/geometry/TextJustification.java @@ -1,15 +1,15 @@ package binnie.core.craftgui.geometry; public enum TextJustification { - TopLeft(0.0f, 0.0f), - TopCenter(0.5f, 0.0f), - TopRight(1.0f, 0.0f), - MiddleLeft(0.0f, 0.5f), - MiddleCenter(0.5f, 0.5f), - MiddleRight(1.0f, 0.5f), - BottomLeft(0.0f, 1.0f), - BottomCenter(0.5f, 1.0f), - BottomRight(1.0f, 1.0f); + TOP_LEFT(0.0f, 0.0f), + TOP_CENTER(0.5f, 0.0f), + TOP_RIGHT(1.0f, 0.0f), + MIDDLE_LEFT(0.0f, 0.5f), + MIDDLE_CENTER(0.5f, 0.5f), + MIDDLE_RIGHT(1.0f, 0.5f), + BOTTOM_LEFT(0.0f, 1.0f), + BOTTOM_CENTER(0.5f, 1.0f), + BOTTOM_RIGHT(1.0f, 1.0f); protected float xOffset; protected float yOffset; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java index 623a56e9..aa1c4e2c 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -32,6 +31,7 @@ public class ControlEnergyBar extends Control implements ITooltip { addAttribute(WidgetAttribute.MOUSE_OVER); } + // TODO unused method? public IPoweredMachine getClientPower() { IInventory inventory = Window.get(this).getInventory(); TileEntityMachine machine = (inventory instanceof TileEntityMachine) ? (TileEntityMachine) inventory : null; @@ -67,19 +67,19 @@ public class ControlEnergyBar extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.chargedPower", (int) getPercentage())); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.powerInfo", getStoredEnergy(), getMaxEnergy())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.chargedPower", (int) getPercentage())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.powerInfo", getStoredEnergy(), getMaxEnergy())); } @Override public void getHelpTooltip(Tooltip tooltip) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.powerBar")); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.currentPower", getStoredEnergy(), (int) getPercentage())); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.capacityPower", getMaxEnergy())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.powerBar")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.currentPower", getStoredEnergy(), (int) getPercentage())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.capacityPower", getMaxEnergy())); IProcess process = Machine.getInterface(IProcess.class, Window.get(this).getInventory()); if (process != null) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.usagePower", (int) process.getEnergyPerTick())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.usagePower", (int) process.getEnergyPerTick())); } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java index 915441e4..307bd7b5 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -24,10 +23,10 @@ public class ControlHelp extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip) { tooltip.setType(Tooltip.Type.HELP); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help")); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help.0")); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help.1")); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.help.2")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.help")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.help.0")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.help.1")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.help.2")); } @Override diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java index 01d9ba8b..0861c561 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -27,7 +26,7 @@ public class ControlInfo extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip) { tooltip.setType(Tooltip.Type.INFORMATION); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.info")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.info")); tooltip.add(info); tooltip.setMaxWidth(200); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java index aef56726..ca295500 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java @@ -144,32 +144,32 @@ public class ControlLiquidTank extends Control implements ITooltip { TankSlot slot = getTankSlot(); tooltip.add(slot.getName()); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.capacity", getTankCapacity())); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.insertSide", MachineSide.asString(slot.getInputSides()))); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.extractSide", MachineSide.asString(slot.getOutputSides()))); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.capacity", getTankCapacity())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.insertSide", MachineSide.asString(slot.getInputSides()))); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.extractSide", MachineSide.asString(slot.getOutputSides()))); if (slot.isReadOnly()) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.outputOnlyTank")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.outputOnlyTank")); } if (slot.getValidator() == null) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.acceptsAny")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.acceptsAny")); } else { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.accepts", slot.getValidator().getTooltip())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.accepts", slot.getValidator().getTooltip())); } } @Override public void getTooltip(Tooltip tooltip) { if (!isTankValid()) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.empty")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.empty")); return; } int percentage = (int) (100.0 * getTank().getAmount() / getTankCapacity()); tooltip.add(getTank().getName()); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.full", percentage)); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.tank.amount", (int) getTank().getAmount())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.full", percentage)); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.amount", (int) getTank().getAmount())); } private TankSlot getTankSlot() { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java index 55956946..14eacd1d 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -28,8 +27,8 @@ public class ControlPowerSystem extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip) { tooltip.setType(Tooltip.Type.POWER); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.powerSupply")); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.poweredBy", system.getUnitName())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.powerSupply")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.poweredBy", system.getUnitName())); tooltip.setMaxWidth(200); } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java index 1bc4c3c7..24edff48 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.WidgetAttribute; @@ -31,9 +30,9 @@ public class ControlProgressBase extends Control { String ts = ""; if (minutes > 0) { if (minutes == 1) { - ts += I18N.localise(BinnieCore.instance, "gui.database.time.minute"); + ts += I18N.localise("binniecore.gui.database.time.minute"); } else { - ts += I18N.localise(BinnieCore.instance, "gui.database.time.minutes", minutes); + ts += I18N.localise("binniecore.gui.database.time.minutes", minutes); } } @@ -42,9 +41,9 @@ public class ControlProgressBase extends Control { ts += " "; } if (seconds == 1) { - ts += I18N.localise(BinnieCore.instance, "gui.database.time.second"); + ts += I18N.localise("binniecore.gui.database.time.second"); } else { - ts += I18N.localise(BinnieCore.instance, "gui.database.time.seconds", seconds); + ts += I18N.localise("binniecore.gui.database.time.seconds", seconds); } } return ts; @@ -79,22 +78,22 @@ public class ControlProgressBase extends Control { return; } - tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.progress")); + tooltip.add(I18N.localise("binniecore.gui.database.time.progress")); if (progress == 0.0f) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.notInProgress")); + tooltip.add(I18N.localise("binniecore.gui.database.time.notInProgress")); } else if (process.getProcessTime() > 0) { tooltip.add(machineProcess.getTooltip() + " (" + (int) process.getCurrentProgress() + "%)"); } else { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.inProgress")); + tooltip.add(I18N.localise("binniecore.gui.database.time.inProgress")); } if (process.getProcessTime() > 0) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.left", convertTime((int) ((1.0f - progress) * process.getProcessTime())))); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.time.total", convertTime(process.getProcessTime()))); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.energyCost.0", process.getProcessEnergy() * 10)); + tooltip.add(I18N.localise("binniecore.gui.database.time.left", convertTime((int) ((1.0f - progress) * process.getProcessTime())))); + tooltip.add(I18N.localise("binniecore.gui.database.time.total", convertTime(process.getProcessTime()))); + tooltip.add(I18N.localise("binniecore.gui.database.energyCost.0", process.getProcessEnergy() * 10)); } else { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.database.energyCost.1", process.getEnergyPerTick() * 10.0f)); + tooltip.add(I18N.localise("binniecore.gui.database.energyCost.1", process.getEnergyPerTick() * 10.0f)); } } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java index 02dae281..d7af791c 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java @@ -57,7 +57,7 @@ public class ControlSlide extends Control { if (anchor.y() > 0) { GL11.glTranslatef(0.0f, -lh, 0.0f); } - CraftGUI.Render.text(labelArea, TextJustification.MiddleCenter, label, 16777215); + CraftGUI.Render.text(labelArea, TextJustification.MIDDLE_CENTER, label, 16777215); GL11.glPopMatrix(); } CraftGUI.Render.texture(CraftGUITexture.Window, getArea()); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java index 65c7f967..f0a3700d 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; @@ -190,27 +189,27 @@ public class ControlSlot extends ControlSlotBase { InventorySlot slot = getInventorySlot(); if (getInventorySlot() != null) { tooltip.add(slot.getName()); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.side.insertSide", MachineSide.asString(slot.getInputSides()))); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.side.extractSide", MachineSide.asString(slot.getOutputSides()))); + tooltip.add(I18N.localise("binniecore.gui.side.insertSide", MachineSide.asString(slot.getInputSides()))); + tooltip.add(I18N.localise("binniecore.gui.side.extractSide", MachineSide.asString(slot.getOutputSides()))); if (slot.isReadOnly()) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.pickupOnly")); + tooltip.add(I18N.localise("binniecore.gui.slot.pickupOnly")); } if (slot.getValidator() == null) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", I18N.localise(BinnieCore.instance, "gui.slot.anyItem"))); + tooltip.add(I18N.localise("binniecore.gui.slot.accepts", I18N.localise("binniecore.gui.slot.anyItem"))); } else { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", slot.getValidator().getTooltip())); + tooltip.add(I18N.localise("binniecore.gui.slot.accepts", slot.getValidator().getTooltip())); } } else if (this.slot.inventory instanceof WindowInventory) { SlotValidator s = ((WindowInventory) this.slot.inventory).getValidator(this.slot.getSlotIndex()); if (s == null) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", I18N.localise(BinnieCore.instance, "gui.slot.anyItem"))); + tooltip.add(I18N.localise("binniecore.gui.slot.accepts", I18N.localise("binniecore.gui.slot.anyItem"))); } else { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.accepts", s.getTooltip())); + tooltip.add(I18N.localise("binniecore.gui.slot.accepts", s.getTooltip())); } } else if (this.slot.inventory instanceof InventoryPlayer) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.slot.playerInventory")); + tooltip.add(I18N.localise("binniecore.gui.slot.playerInventory")); } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java index e38e358b..949acbd7 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java @@ -1,6 +1,5 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -30,7 +29,7 @@ public class ControlUser extends Control implements ITooltip { @Override public void getTooltip(Tooltip tooltip) { tooltip.setType(Tooltip.Type.USER); - tooltip.add(I18N.localise(BinnieCore.instance, "gui.tooltip.owner")); + tooltip.add(I18N.localise("binniecore.gui.tooltip.owner")); if (!username.isEmpty()) { tooltip.add(username); diff --git a/src/main/java/binnie/core/craftgui/renderer/Renderer.java b/src/main/java/binnie/core/craftgui/renderer/Renderer.java index 6c6a8c77..27510223 100644 --- a/src/main/java/binnie/core/craftgui/renderer/Renderer.java +++ b/src/main/java/binnie/core/craftgui/renderer/Renderer.java @@ -126,7 +126,7 @@ public class Renderer { } public void text(IPoint pos, String text, int colour) { - text(new IArea(pos, new IPoint(500.0f, 500.0f)), TextJustification.TopLeft, text, colour); + text(new IArea(pos, new IPoint(500.0f, 500.0f)), TextJustification.TOP_LEFT, text, colour); } public void text(IArea area, TextJustification justification, String text, int colour) { diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index b4d57388..fe9e89d2 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -1,7 +1,6 @@ package binnie.core.genetics; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.genetics.genetics.AlleleHelper; @@ -60,16 +59,16 @@ class BeeBreedingSystem extends BreedingSystem { public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (chromosome == EnumBeeChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { - return I18N.localise(BinnieCore.instance, "allele.fertility.low"); + return I18N.localise("binniecore.allele.fertility.low"); } if (allele.getUID().contains("Normal")) { - return I18N.localise(BinnieCore.instance, "allele.fertility.normal"); + return I18N.localise("binniecore.allele.fertility.normal"); } if (allele.getUID().contains("High")) { - return I18N.localise(BinnieCore.instance, "allele.fertility.high"); + return I18N.localise("binniecore.allele.fertility.high"); } if (allele.getUID().contains("Maximum")) { - return I18N.localise(BinnieCore.instance, "allele.fertility.maximum"); + return I18N.localise("binniecore.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 da00affe..3d937330 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -1,7 +1,6 @@ package binnie.core.genetics; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.resource.BinnieIcon; import binnie.core.util.I18N; import binnie.extrabees.genetics.ExtraBeeMutation; @@ -59,11 +58,11 @@ public abstract class BreedingSystem implements IItemStackRepresentative { } public String getChromosomeName(IChromosomeType chromo) { - return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".chromosome." + chromo.getName()); + return I18N.localise("binniecore." + getSpeciesRoot().getUID() + ".chromosome." + chromo.getName()); } public String getChromosomeShortName(IChromosomeType chromo) { - return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short"); + return I18N.localise("binniecore." + getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short"); } public String getEpitome(float discoveredPercentage) { @@ -83,7 +82,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative { } else if (discoveredPercentage < 1.0f) { i = 5; } - return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".epitome." + i); + return I18N.localise("binniecore." + getSpeciesRoot().getUID() + ".epitome." + i); } public abstract ISpeciesRoot getSpeciesRoot(); @@ -352,7 +351,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative { } public String getDescriptor() { - return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".descriptor"); + return I18N.localise("binniecore." + getSpeciesRoot().getUID() + ".descriptor"); } public String getIdent() { @@ -373,17 +372,17 @@ public abstract class BreedingSystem implements IItemStackRepresentative { public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (allele instanceof IAlleleBoolean) { return ((IAlleleBoolean) allele).getValue() ? - I18N.localise(BinnieCore.instance, "allele.true") : - I18N.localise(BinnieCore.instance, "allele.false"); + I18N.localise("binniecore.allele.true") : + I18N.localise("binniecore.allele.false"); } if (allele.getName().equals("for.gui.maximum")) { - return I18N.localise(BinnieCore.instance, "allele.fertility.maximum"); + return I18N.localise("binniecore.allele.fertility.maximum"); } return allele.getName(); } public String getName() { - return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".shortName"); + return I18N.localise("binniecore." + getSpeciesRoot().getUID() + ".shortName"); } @Override diff --git a/src/main/java/binnie/core/genetics/EnumBeeModifier.java b/src/main/java/binnie/core/genetics/EnumBeeModifier.java index 39bd8e1f..94153196 100644 --- a/src/main/java/binnie/core/genetics/EnumBeeModifier.java +++ b/src/main/java/binnie/core/genetics/EnumBeeModifier.java @@ -1,6 +1,5 @@ package binnie.core.genetics; -import binnie.core.BinnieCore; import binnie.core.util.I18N; public enum EnumBeeModifier { @@ -12,6 +11,6 @@ public enum EnumBeeModifier { GENETIC_DECAY; public String getName() { - return I18N.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase()); + return I18N.localise("binniecore.beemodifier." + name().toLowerCase()); } } diff --git a/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java index f35fa11f..4b265e7f 100644 --- a/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java @@ -7,7 +7,6 @@ import binnie.botany.api.IBotanistTracker; import binnie.botany.api.IFlowerRoot; import binnie.botany.core.BotanyCore; import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.genetics.genetics.AlleleHelper; @@ -55,16 +54,16 @@ class FlowerBreedingSystem extends BreedingSystem { public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (chromosome == EnumFlowerChromosome.FERTILITY) { if (allele.getUID().contains("Low")) { - return I18N.localise(BinnieCore.instance, "allele.fertility.low"); + return I18N.localise("binniecore.allele.fertility.low"); } if (allele.getUID().contains("Normal")) { - return I18N.localise(BinnieCore.instance, "allele.fertility.normal"); + return I18N.localise("binniecore.allele.fertility.normal"); } if (allele.getUID().contains("High")) { - return I18N.localise(BinnieCore.instance, "allele.fertility.high"); + return I18N.localise("binniecore.allele.fertility.high"); } if (allele.getUID().contains("Maximum")) { - return I18N.localise(BinnieCore.instance, "allele.fertility.maximum"); + return I18N.localise("binniecore.allele.fertility.maximum"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index b3a1b3af..3ed54654 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -1,7 +1,6 @@ package binnie.core.genetics; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import forestry.api.genetics.IAllele; @@ -50,24 +49,24 @@ class MothBreedingSystem extends BreedingSystem { if (chromosome == EnumButterflyChromosome.METABOLISM) { int metabolism = ((IAlleleInteger) allele).getValue(); if (metabolism >= 19) { - return I18N.localise(BinnieCore.instance, "allele.metabolism.highest"); + return I18N.localise("binniecore.allele.metabolism.highest"); } if (metabolism >= 16) { - return I18N.localise(BinnieCore.instance, "allele.metabolism.higher"); + return I18N.localise("binniecore.allele.metabolism.higher"); } if (metabolism >= 13) { - return I18N.localise(BinnieCore.instance, "allele.metabolism.high"); + return I18N.localise("binniecore.allele.metabolism.high"); } if (metabolism >= 10) { - return I18N.localise(BinnieCore.instance, "allele.metabolism.normal"); + return I18N.localise("binniecore.allele.metabolism.normal"); } if (metabolism >= 7) { - return I18N.localise(BinnieCore.instance, "allele.metabolism.slow"); + return I18N.localise("binniecore.allele.metabolism.slow"); } if (metabolism >= 4) { - return I18N.localise(BinnieCore.instance, "allele.metabolism.slower"); + return I18N.localise("binniecore.allele.metabolism.slower"); } - return I18N.localise(BinnieCore.instance, "allele.metabolism.slowest"); + return I18N.localise("binniecore.allele.metabolism.slowest"); } if (chromosome == EnumButterflyChromosome.FERTILITY) { return ((IAlleleInteger) allele).getValue() + "x"; diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 30610f00..909694e1 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -1,7 +1,6 @@ package binnie.core.genetics; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.ExtraTrees; @@ -90,23 +89,23 @@ public class TreeBreedingSystem extends BreedingSystem { if (chromosome == EnumTreeChromosome.PLANT) { EnumSet types = ((IAllelePlantType) allele).getPlantTypes(); return types.isEmpty() - ? I18N.localise(BinnieCore.instance, "allele.none") + ? I18N.localise("binniecore.allele.none") : types.iterator().next().toString(); } if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) { IFruitProvider provider = ((IAlleleFruit) allele).getProvider(); return (provider.getProducts().length == 0) - ? I18N.localise(BinnieCore.instance, "allele.none") + ? I18N.localise("binniecore.allele.none") : provider.getProducts()[0].getDisplayName(); } if (chromosome == EnumTreeChromosome.GROWTH) { if (allele.getUID().contains("Tropical")) { - return I18N.localise(BinnieCore.instance, "allele.growth.tropical"); + return I18N.localise("binniecore.allele.growth.tropical"); } if (allele.getUID().contains("Lightlevel")) { - return I18N.localise(BinnieCore.instance, "allele.growth.lightlevel"); + return I18N.localise("binniecore.allele.growth.lightlevel"); } } return super.getAlleleName(chromosome, allele); diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index eda7dcaf..d64d38b6 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -33,6 +33,6 @@ public class ItemGenesis extends Item { @Override public String getItemStackDisplayName(ItemStack itemStack) { - return I18N.localise(BinnieCore.instance, "item.genesis.name"); + return I18N.localise("binniecore.item.genesis.name"); } } diff --git a/src/main/java/binnie/core/liquid/FluidContainer.java b/src/main/java/binnie/core/liquid/FluidContainer.java index 10b946a2..eb55d6b2 100644 --- a/src/main/java/binnie/core/liquid/FluidContainer.java +++ b/src/main/java/binnie/core/liquid/FluidContainer.java @@ -2,6 +2,7 @@ package binnie.core.liquid; import binnie.core.BinnieCore; import binnie.core.Mods; +import binnie.core.util.I18N; import binnie.genetics.item.GeneticsItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -50,7 +51,7 @@ public enum FluidContainer { } public String getName() { - return BinnieCore.proxy.localise("item.container." + name().toLowerCase()); + return I18N.localise("binniecore.item.container." + name().toLowerCase()); } public boolean isActive() { diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index 1070de9c..ca4d8e3e 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -1,7 +1,6 @@ package binnie.core.liquid; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import binnie.extratrees.alcohol.AlcoholEffect; import binnie.extratrees.alcohol.drink.DrinkManager; @@ -70,7 +69,7 @@ public class ItemFluidContainer extends ItemFood { FluidStack fluid = getLiquid(stack); if (fluid == null) { - return I18N.localise(BinnieCore.instance, "item.fluidContainer.missed"); + return I18N.localise("binniecore.item.fluidContainer.missed"); } return fluid.getFluid().getLocalizedName(fluid) + " " + container.getName(); } diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index a6ad518a..c7aa39e0 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -8,12 +8,11 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; public class ManagerLiquid extends ManagerBase { - Map fluids; + public Map fluids; public ManagerLiquid() { fluids = new LinkedHashMap<>(); diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index 7a86b716..4fa95904 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -27,7 +27,7 @@ public abstract class MachinePackage { public abstract TileEntity createTileEntity(); public String getDisplayName() { - return I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID()); + return I18N.localise(group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID()); } public Integer getMetadata() { @@ -57,6 +57,6 @@ public abstract class MachinePackage { } public String getInformation() { - return I18N.localise(group.getMod(), "machine." + group.getShortUID() + "." + getUID() + ".info"); + return I18N.localise(group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID() + ".info"); } } diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 085d3f1b..f3af2eb3 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -1,6 +1,5 @@ package binnie.core.machines.inventory; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -93,7 +92,7 @@ public class InventorySlot extends BaseSlot { @Override public String getName() { - return I18N.localise(BinnieCore.instance, "gui.slot." + unlocName); + return I18N.localise("binniecore.gui.slot." + unlocName); } public enum Type { diff --git a/src/main/java/binnie/core/machines/inventory/MachineSide.java b/src/main/java/binnie/core/machines/inventory/MachineSide.java index 2613236b..e330b029 100644 --- a/src/main/java/binnie/core/machines/inventory/MachineSide.java +++ b/src/main/java/binnie/core/machines/inventory/MachineSide.java @@ -1,6 +1,5 @@ package binnie.core.machines.inventory; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import net.minecraftforge.common.util.ForgeDirection; @@ -31,10 +30,10 @@ public class MachineSide { public static String asString(Collection sides) { if (sides.containsAll(MachineSide.ALL)) { - return I18N.localise(BinnieCore.instance, "gui.side.any"); + return I18N.localise("binniecore.gui.side.any"); } if (sides.isEmpty()) { - return I18N.localise(BinnieCore.instance, "gui.side.none"); + return I18N.localise("binniecore.gui.side.none"); } String text = ""; @@ -42,48 +41,48 @@ public class MachineSide { if (sides.size() > 0) { text += ", "; } - text += I18N.localise(BinnieCore.instance, "gui.side.up"); + text += I18N.localise("binniecore.gui.side.up"); } if (sides.contains(ForgeDirection.DOWN)) { if (sides.size() > 0) { text += ", "; } - text += I18N.localise(BinnieCore.instance, "gui.side.down"); + text += I18N.localise("binniecore.gui.side.down"); } if (sides.containsAll(MachineSide.SIDES)) { if (sides.size() > 0) { text += ", "; } - text += I18N.localise(BinnieCore.instance, "gui.side.sides"); + text += I18N.localise("binniecore.gui.side.sides"); } else { if (sides.contains(ForgeDirection.NORTH)) { if (sides.size() > 0) { text += ", "; } - text += I18N.localise(BinnieCore.instance, "gui.side.north"); + text += I18N.localise("binniecore.gui.side.north"); } if (sides.contains(ForgeDirection.EAST)) { if (sides.size() > 0) { text += ", "; } - text += I18N.localise(BinnieCore.instance, "gui.side.east"); + text += I18N.localise("binniecore.gui.side.east"); } if (sides.contains(ForgeDirection.SOUTH)) { if (sides.size() > 0) { text += ", "; } - text += I18N.localise(BinnieCore.instance, "gui.side.south"); + text += I18N.localise("binniecore.gui.side.south"); } if (sides.contains(ForgeDirection.WEST)) { if (sides.size() > 0) { text += ", "; } - text += I18N.localise(BinnieCore.instance, "gui.side.west"); + text += I18N.localise("binniecore.gui.side.west"); } } return text; diff --git a/src/main/java/binnie/core/machines/inventory/SlotValidator.java b/src/main/java/binnie/core/machines/inventory/SlotValidator.java index 431960db..17c572b6 100644 --- a/src/main/java/binnie/core/machines/inventory/SlotValidator.java +++ b/src/main/java/binnie/core/machines/inventory/SlotValidator.java @@ -1,6 +1,5 @@ package binnie.core.machines.inventory; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import forestry.api.genetics.AlleleManager; import net.minecraft.item.ItemStack; @@ -55,7 +54,7 @@ public abstract class SlotValidator extends Validator { @Override public String getTooltip() { - return I18N.localise(BinnieCore.instance, "gui.slot.breedableIndividual"); + return I18N.localise("binniecore.gui.slot.breedableIndividual"); } } } diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index d2ad110b..23b3ec80 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -1,6 +1,5 @@ package binnie.core.machines.inventory; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; @@ -49,6 +48,6 @@ public class TankSlot extends BaseSlot { @Override public String getName() { - return I18N.localise(BinnieCore.instance, "gui.slot." + unlocName); + return I18N.localise("binniecore.gui.slot." + unlocName); } } diff --git a/src/main/java/binnie/core/machines/power/ErrorState.java b/src/main/java/binnie/core/machines/power/ErrorState.java index 82253d88..09605422 100644 --- a/src/main/java/binnie/core/machines/power/ErrorState.java +++ b/src/main/java/binnie/core/machines/power/ErrorState.java @@ -1,6 +1,5 @@ package binnie.core.machines.power; -import binnie.core.BinnieCore; import binnie.core.util.I18N; import forestry.api.core.INBTTagable; import net.minecraft.nbt.NBTTagCompound; @@ -107,13 +106,13 @@ public class ErrorState implements INBTTagable { } public NoItem(String desc, int[] slots) { - super(I18N.localise(BinnieCore.instance, "machine.error.noItem"), desc, slots); + super(I18N.localise("binniecore.machine.error.noItem"), desc, slots); } } public static class InvalidItem extends Item { public InvalidItem(String desc, int slot) { - this(I18N.localise(BinnieCore.instance, "machine.error.invalidItem"), desc, slot); + this(I18N.localise("binniecore.machine.error.invalidItem"), desc, slot); } public InvalidItem(String name, String desc, int slot) { @@ -123,32 +122,32 @@ public class ErrorState implements INBTTagable { public static class NoSpace extends Item { public NoSpace(String desc, int slot) { - super(I18N.localise(BinnieCore.instance, "machine.error.noSpace"), desc, new int[]{slot}); + super(I18N.localise("binniecore.machine.error.noSpace"), desc, new int[]{slot}); } public NoSpace(String desc, int[] slots) { - super(I18N.localise(BinnieCore.instance, "machine.error.noSpace"), desc, slots); + super(I18N.localise("binniecore.machine.error.noSpace"), desc, slots); } } public static class InsufficientPower extends ErrorState { public InsufficientPower() { super( - I18N.localise(BinnieCore.instance, "machine.error.insufficientPower.title"), - I18N.localise(BinnieCore.instance, "machine.error.insufficientPower.desc") + I18N.localise("binniecore.machine.error.insufficientPower.title"), + I18N.localise("binniecore.machine.error.insufficientPower.desc") ); } } public static class TankSpace extends Tank { public TankSpace(String desc, int tank) { - super(I18N.localise(BinnieCore.instance, "machine.error.tankFull"), desc, new int[]{tank}); + super(I18N.localise("binniecore.machine.error.tankFull"), desc, new int[]{tank}); } } public static class InsufficientLiquid extends Tank { public InsufficientLiquid(String desc, int tank) { - super(I18N.localise(BinnieCore.instance, "machine.error.insufficientLiquid"), desc, new int[]{tank}); + super(I18N.localise("binniecore.machine.error.insufficientLiquid"), desc, new int[]{tank}); } } } diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 1f53d274..0372f60e 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -5,10 +5,10 @@ import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.WidgetAttribute; +import binnie.core.craftgui.controls.ControlButton; import binnie.core.craftgui.controls.ControlCheckbox; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextEdit; -import binnie.core.craftgui.controls.ControlButton; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.page.ControlPage; import binnie.core.craftgui.controls.page.ControlPages; diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index 201569bd..b173180d 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -4,7 +4,6 @@ import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; import binnie.core.network.packet.MessageBase; -import binnie.core.util.I18N; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -58,12 +57,4 @@ public class BinnieModProxy implements IBinnieModProxy { public void postInit() { // ignored } - - public String localise(String string) { - return I18N.localise(mod, string); - } - - public String localiseOrBlank(String string) { - return I18N.localiseOrBlank(mod, string); - } } diff --git a/src/main/java/binnie/core/util/I18N.java b/src/main/java/binnie/core/util/I18N.java index 9a5af526..e9b2f745 100644 --- a/src/main/java/binnie/core/util/I18N.java +++ b/src/main/java/binnie/core/util/I18N.java @@ -1,27 +1,14 @@ package binnie.core.util; -import binnie.core.AbstractMod; import net.minecraft.util.StatCollector; public class I18N { - public static String unlocalised(AbstractMod mod, String id) { - return mod.getModID() + "." + id; - } - public static String localise(String key) { - return StatCollector.translateToLocal(key.toString()); + return StatCollector.translateToLocal(key); } - public static String localise(AbstractMod mod, String id) { - return localise(unlocalised(mod, id)); - } - - public static String localiseOrBlank(AbstractMod mod, String id) { - return localiseOrBlank(unlocalised(mod, id)); - } - - public static String localise(AbstractMod mod, String id, Object... objs) { - return String.format(localise(mod, id), objs); + public static String localise(String key, Object... objs) { + return String.format(StatCollector.translateToLocal(key), objs); } public static String localiseOrBlank(String key) { diff --git a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java index dea13a65..ae9c25cc 100644 --- a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java @@ -4,7 +4,7 @@ import binnie.core.Mods; import binnie.core.genetics.BeeModifierLogic; import binnie.core.genetics.EnumBeeBooleanModifier; import binnie.core.genetics.EnumBeeModifier; -import binnie.extrabees.ExtraBees; +import binnie.core.util.I18N; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; @@ -135,7 +135,7 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { } public String getName() { - return ExtraBees.proxy.localise("item.frame." + toString().toLowerCase()); + return I18N.localise("extrabees.item.frame." + toString().toLowerCase()); } @Override diff --git a/src/main/java/binnie/extrabees/apiary/IndustrialFrame.java b/src/main/java/binnie/extrabees/apiary/IndustrialFrame.java deleted file mode 100644 index deb17e2c..00000000 --- a/src/main/java/binnie/extrabees/apiary/IndustrialFrame.java +++ /dev/null @@ -1,143 +0,0 @@ -package binnie.extrabees.apiary; - -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeModifier; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -public enum IndustrialFrame implements IBeeModifier { - Empty("Empty", 5, 0), - Light("Glowstone Lighting", 2, 4), - Rain("Rain Shielding", 2, 4), - Sunlight("Sunlight Simulator", 4, 8), - Soul("Low Grade Mutagen", 5, 15), - Uranium("High Grade Mutagen", 10, 50), - Cage("Meshed Restrainer", 3, 12), - Freedom("Territory Extension", 3, 16), - Honey("Honey Amplifier", 4, 12), - Jelly("Gelatin Amplifier", 8, 36), - Leaf("Pollinator MK I", 3, 15), - Pollen("Pollinator MK II", 7, 25), - Clay("Lifespan Extensor", 2, 10), - Emerald("Eon Simulator", 7, 20), - NetherStar("Immortality Gate", 12, 50), - Poison("Mortality Inhibitor", 8, 18); - - static { - IndustrialFrame.Light.lighted = true; - IndustrialFrame.Rain.rain = true; - IndustrialFrame.Sunlight.lighted = true; - IndustrialFrame.Sunlight.sunlight = true; - IndustrialFrame.Soul.mutationMod = 1.3f; - IndustrialFrame.Uranium.mutationMod = 2.0f; - IndustrialFrame.Cage.territoryMod = 0.4f; - IndustrialFrame.Freedom.territoryMod = 1.4f; - IndustrialFrame.Honey.productionMod = 1.4f; - IndustrialFrame.Jelly.productionMod = 1.8f; - IndustrialFrame.Leaf.floweringMod = 1.4f; - IndustrialFrame.Pollen.floweringMod = 2.0f; - IndustrialFrame.Clay.lifespanMod = 1.4f; - IndustrialFrame.Emerald.lifespanMod = 2.0f; - IndustrialFrame.NetherStar.lifespanMod = 20.0f; - IndustrialFrame.Poison.lifespanMod = 0.5f; - } - - protected String name; - protected float territoryMod; - protected float mutationMod; - protected float lifespanMod; - protected float productionMod; - protected float floweringMod; - protected boolean lighted; - protected boolean sunlight; - protected boolean rain; - protected int wearMod; - protected int power; - - IndustrialFrame(String name, int wear, int power) { - this.name = name; - this.power = power; - territoryMod = 1.0f; - mutationMod = 1.0f; - lifespanMod = 1.0f; - productionMod = 1.0f; - floweringMod = 1.0f; - lighted = false; - sunlight = false; - rain = false; - wearMod = wear; - } - - public static ItemStack getItemStack(Item item, IndustrialFrame frame) { - ItemStack stack = new ItemStack(item); - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setInteger("frame", frame.ordinal()); - stack.setTagCompound(nbt); - return stack; - } - - @Override - public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return territoryMod; - } - - @Override - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return mutationMod; - } - - @Override - public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return lifespanMod; - } - - @Override - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return productionMod; - } - - @Override - public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return floweringMod; - } - - @Override - public boolean isSealed() { - return rain; - } - - @Override - public boolean isSelfLighted() { - return lighted; - } - - @Override - public boolean isSunlightSimulated() { - return sunlight; - } - - @Override - public boolean isHellish() { - return false; - } - - public Object getName() { - return name; - } - - // TODO unused method? - public int getWearModifier() { - return wearMod; - } - - // TODO unused method? - public int getPowerUsage() { - return power; - } - - @Override - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return 1.0f; - } -} diff --git a/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java b/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java deleted file mode 100644 index 25b4bb2a..00000000 --- a/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java +++ /dev/null @@ -1,63 +0,0 @@ -package binnie.extrabees.apiary; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import java.util.List; - -// TODO unused class? -public class ItemIndustrialFrame extends Item { - public ItemIndustrialFrame() { - setCreativeTab(CreativeTabs.tabMisc); - setMaxDamage(400); - setMaxStackSize(1); - setUnlocalizedName("industrialFrame"); - } - - public static IndustrialFrame getFrame(ItemStack stack) { - if (stack == null || !stack.hasTagCompound() || !stack.getTagCompound().hasKey("frame")) { - return null; - } - return IndustrialFrame.values()[stack.getTagCompound().getInteger("frame")]; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (IndustrialFrame frame : IndustrialFrame.values()) { - ItemStack stack = new ItemStack(this); - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setInteger("frame", frame.ordinal()); - stack.setTagCompound(nbt); - par3List.add(stack); - } - } - - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4); - IndustrialFrame frame = getFrame(par1ItemStack); - if (frame == null) { - par3List.add("Invalid Contents"); - } else { - par3List.add(frame.getName()); - } - } - - @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { - return "Industrial Frame"; - } -} diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java index a6c4f668..659f5dcb 100644 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java @@ -7,8 +7,8 @@ import binnie.core.circuits.BinnieCircuitLayout; import binnie.core.machines.MachineGroup; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.AlvearyMachine; -import binnie.extrabees.apiary.machine.AlvearyMutator; -import binnie.extrabees.apiary.machine.AlvearyStimulator; +import binnie.extrabees.apiary.machine.mutator.AlvearyMutator; +import binnie.extrabees.apiary.machine.stimulator.CircuitType; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.core.Tabs; import net.minecraft.block.Block; @@ -106,7 +106,7 @@ public class ModuleApiary implements IInitializable { } )); - for (AlvearyStimulator.CircuitType type : AlvearyStimulator.CircuitType.values()) { + for (CircuitType type : CircuitType.values()) { type.createCircuit(stimulatorLayout); } } diff --git a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java index 713e541e..391f66c6 100644 --- a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java +++ b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java @@ -19,7 +19,12 @@ import net.minecraft.util.ChunkCoordinates; import java.util.LinkedList; import java.util.List; -public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyComponent.Active, IAlvearyComponent.BeeModifier, IAlvearyComponent.BeeListener, IBeeListener, IBeeModifier { +public class TileExtraBeeAlveary extends TileEntityMachine implements + IAlvearyComponent.Active, + IAlvearyComponent.BeeModifier, + IAlvearyComponent.BeeListener, + IBeeListener, + IBeeModifier { protected IMultiblockLogicAlveary structureLogic; protected ChunkCoordinates min; protected ChunkCoordinates max; @@ -44,15 +49,17 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo } public List getAlvearyBlocks() { - LinkedList tiles = new LinkedList(); - if (min != null && max != null) { - for (int x = min.posX; x <= max.posX; ++x) { - for (int z = min.posZ; z <= max.posZ; ++z) { - for (int y = min.posY; y <= max.posY; ++y) { - TileEntity tile = getWorldObj().getTileEntity(x, y, z); - if (tile instanceof IMultiblockComponent) { - tiles.add(tile); - } + LinkedList tiles = new LinkedList<>(); + if (min == null || max == null) { + return tiles; + } + + for (int x = min.posX; x <= max.posX; ++x) { + for (int z = min.posZ; z <= max.posZ; ++z) { + for (int y = min.posY; y <= max.posY; ++y) { + TileEntity tile = getWorldObj().getTileEntity(x, y, z); + if (tile instanceof IMultiblockComponent) { + tiles.add(tile); } } } @@ -544,5 +551,4 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo // return this.getMachine().getInterface(ISidedInventory.class); // } // - } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java deleted file mode 100644 index b5159eb5..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java +++ /dev/null @@ -1,123 +0,0 @@ -package binnie.extrabees.apiary.machine; - -import binnie.Binnie; -import binnie.core.craftgui.minecraft.IMachineInformation; -import binnie.core.machines.Machine; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.SlotValidator; -import binnie.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.apiary.ComponentExtraBeeGUI; -import binnie.extrabees.apiary.TileExtraBeeAlveary; -import binnie.extrabees.core.ExtraBeeGUID; -import binnie.extrabees.core.ExtraBeeTexture; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IHiveFrame; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class AlvearyFrame { - public static int slotFrame = 0; - - public static class PackageAlvearyFrame extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyFrame() { - super("frame", ExtraBeeTexture.AlvearyFrame.getTexture(), false); - } - - @Override - public void createMachine(Machine machine) { - new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyFrame); - ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(AlvearyFrame.slotFrame, "frame"); - inventory.getSlot(AlvearyFrame.slotFrame).setValidator(new SlotValidatorFrame()); - new ComponentFrameModifier(machine); - } - } - - public static class SlotValidatorFrame extends SlotValidator { - public SlotValidatorFrame() { - super(SlotValidator.IconFrame); - } - - @Override - public boolean isValid(ItemStack itemStack) { - return itemStack != null - && itemStack.getItem() instanceof IHiveFrame; - } - - @Override - public String getTooltip() { - return "Hive Frames"; - } - } - - public static class ComponentFrameModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentFrameModifier(Machine machine) { - super(machine); - } - - @Override - public void wearOutEquipment(int amount) { - if (getHiveFrame() == null) { - return; - } - - World world = getMachine().getTileEntity().getWorldObj(); - int wear = Math.round(amount * 5 * Binnie.Genetics.getBeeRoot().getBeekeepingMode(world).getWearModifier()); - getInventory().setInventorySlotContents(AlvearyFrame.slotFrame, getHiveFrame().frameUsed(((TileExtraBeeAlveary) getMachine().getTileEntity()).getMultiblockLogic().getController(), getInventory().getStackInSlot(AlvearyFrame.slotFrame), null, wear)); - } - - public IHiveFrame getHiveFrame() { - if (getInventory().getStackInSlot(AlvearyFrame.slotFrame) != null) { - return (IHiveFrame) getInventory().getStackInSlot(AlvearyFrame.slotFrame).getItem(); - } - return null; - } - - @Override - public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - IHiveFrame frame = getHiveFrame(); - if (frame == null) { - return 1.0f; - } - return frame.getBeeModifier().getTerritoryModifier(genome, currentModifier); - } - - @Override - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - IHiveFrame frame = getHiveFrame(); - if (frame == null) { - return 1.0f; - } - return frame.getBeeModifier().getMutationModifier(genome, mate, currentModifier); - } - - @Override - public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - IHiveFrame frame = getHiveFrame(); - if (getHiveFrame() == null) { - return 1.0f; - } - return frame.getBeeModifier().getLifespanModifier(genome, mate, currentModifier); - } - - @Override - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - IHiveFrame frame = getHiveFrame(); - if (frame == null) { - return 1.0f; - } - return frame.getBeeModifier().getProductionModifier(genome, currentModifier); - } - - @Override - public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - IHiveFrame frame = getHiveFrame(); - if (frame == null) { - return 1.0f; - } - return frame.getBeeModifier().getFloweringModifier(genome, currentModifier); - } - } -} diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java deleted file mode 100644 index d1fb8058..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java +++ /dev/null @@ -1,93 +0,0 @@ -package binnie.extrabees.apiary.machine; - -import binnie.Binnie; -import binnie.core.craftgui.minecraft.IMachineInformation; -import binnie.core.machines.Machine; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.transfer.TransferRequest; -import binnie.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.apiary.ComponentExtraBeeGUI; -import binnie.extrabees.apiary.TileExtraBeeAlveary; -import binnie.extrabees.core.ExtraBeeGUID; -import binnie.extrabees.core.ExtraBeeTexture; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.apiculture.IBeeRoot; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import java.util.Random; - -public class AlvearyHatchery { - public static int[] slotLarvae = new int[]{0, 1, 2, 3, 4}; - - public static class PackageAlvearyHatchery extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyHatchery() { - super("hatchery", ExtraBeeTexture.AlvearyHatchery.getTexture(), false); - } - - @Override - public void createMachine(Machine machine) { - new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyHatchery); - ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - for (InventorySlot slot : inventory.addSlotArray(AlvearyHatchery.slotLarvae, "hatchery")) { - slot.setValidator(new SlotValidatorLarvae()); - } - new ComponentFrameModifier(machine); - } - } - - public static class SlotValidatorLarvae extends SlotValidator { - public SlotValidatorLarvae() { - super(SlotValidator.IconBee); - } - - @Override - public boolean isValid(ItemStack itemStack) { - return Binnie.Genetics.getBeeRoot().isMember(itemStack) && Binnie.Genetics.getBeeRoot().getType(itemStack) == EnumBeeType.LARVAE; - } - - @Override - public String getTooltip() { - return "Larvae"; - } - } - - public static class ComponentFrameModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentFrameModifier(Machine machine) { - super(machine); - } - - @Override - public void onUpdate() { - if (new Random().nextInt(2400) != 0) { - return; - } - - TileEntity tile = getMachine().getTileEntity(); - if (!(tile instanceof TileExtraBeeAlveary)) { - return; - } - - IBeeHousing house = ((TileExtraBeeAlveary) tile).getMultiblockLogic().getController(); - if (house == null || house.getErrorLogic().hasErrors()) { - return; - } - - ItemStack queenStack = house.getBeeInventory().getQueen(); - IBee queen = (queenStack == null) ? null : Binnie.Genetics.getBeeRoot().getMember(queenStack); - if (queen == null) { - return; - } - - IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot(); - ItemStack larvae = beeRoot.getMemberStack(beeRoot.getBee(getMachine().getWorld(), queen.getGenome()), EnumBeeType.LARVAE.ordinal()); - new TransferRequest(larvae, getInventory()).transfer(true); - } - } -} diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java deleted file mode 100644 index 55ca12fa..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyLighting.java +++ /dev/null @@ -1,32 +0,0 @@ -package binnie.extrabees.apiary.machine; - -import binnie.core.craftgui.minecraft.IMachineInformation; -import binnie.core.machines.Machine; -import binnie.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.core.ExtraBeeTexture; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; - -public class AlvearyLighting { - public static class PackageAlvearyLighting extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyLighting() { - super("lighting", ExtraBeeTexture.AlvearyLighting.getTexture(), false); - } - - @Override - public void createMachine(Machine machine) { - new ComponentLighting(machine); - } - } - - public static class ComponentLighting extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentLighting(Machine machine) { - super(machine); - } - - @Override - public boolean isSelfLighted() { - return true; - } - } -} diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java index d78ee655..e39b5aa7 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java @@ -7,18 +7,25 @@ import binnie.core.machines.MachineRendererBlock; import binnie.core.resource.BinnieResource; import binnie.extrabees.apiary.ModuleApiary; import binnie.extrabees.apiary.TileExtraBeeAlveary; +import binnie.extrabees.apiary.machine.frame.FrameAlvearyPackage; +import binnie.extrabees.apiary.machine.hatchery.HatcheryAlvearyPackage; +import binnie.extrabees.apiary.machine.lighting.LightingAlvearyPackage; +import binnie.extrabees.apiary.machine.mutator.MutatorAlvearyPackage; +import binnie.extrabees.apiary.machine.rainShield.RainShieldAlvearyPackage; +import binnie.extrabees.apiary.machine.stimulator.StimulatorAlvearyPackage; +import binnie.extrabees.apiary.machine.transmission.TransmissionAlvearyPackage; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; public enum AlvearyMachine implements IMachineType { - Mutator(AlvearyMutator.PackageAlvearyMutator.class), - Frame(AlvearyFrame.PackageAlvearyFrame.class), - RainShield(AlvearyRainShield.PackageAlvearyRainShield.class), - Lighting(AlvearyLighting.PackageAlvearyLighting.class), - Stimulator(AlvearyStimulator.PackageAlvearyStimulator.class), - Hatchery(AlvearyHatchery.PackageAlvearyHatchery.class), - Transmission(AlvearyTransmission.PackageAlvearyTransmission.class); + Mutator(MutatorAlvearyPackage.class), + Frame(FrameAlvearyPackage.class), + RainShield(RainShieldAlvearyPackage.class), + Lighting(LightingAlvearyPackage.class), + Stimulator(StimulatorAlvearyPackage.class), + Hatchery(HatcheryAlvearyPackage.class), + Transmission(TransmissionAlvearyPackage.class); protected Class cls; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java deleted file mode 100644 index f9cad193..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java +++ /dev/null @@ -1,107 +0,0 @@ -package binnie.extrabees.apiary.machine; - -import binnie.core.craftgui.minecraft.IMachineInformation; -import binnie.core.machines.Machine; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.ValidatorIcon; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.apiary.ComponentExtraBeeGUI; -import binnie.extrabees.core.ExtraBeeGUID; -import binnie.extrabees.core.ExtraBeeTexture; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import net.minecraft.item.ItemStack; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -public class AlvearyMutator { - public static int slotMutator = 0; - - protected static Map mutations = new HashMap<>(); - - public static boolean isMutationItem(ItemStack item) { - return getMutationMult(item) > 1.0f; - } - - public static float getMutationMult(ItemStack item) { - if (item == null) { - return 1.0f; - } - - for (ItemStack comp : AlvearyMutator.mutations.keySet()) { - if (ItemStack.areItemStackTagsEqual(item, comp) && item.isItemEqual(comp)) { - return AlvearyMutator.mutations.get(comp); - } - } - return 1.0f; - } - - public static void addMutationItem(ItemStack item, float chance) { - if (item == null) { - return; - } - AlvearyMutator.mutations.put(item, chance); - } - - public static Collection getMutagens() { - return AlvearyMutator.mutations.keySet(); - } - - public static class PackageAlvearyMutator extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyMutator() { - super("mutator", ExtraBeeTexture.AlvearyMutator.getTexture(), false); - } - - @Override - public void createMachine(Machine machine) { - new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyMutator); - ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(AlvearyMutator.slotMutator, "mutator"); - inventory.getSlot(AlvearyMutator.slotMutator).setValidator(new SlotValidatorMutator()); - new ComponentMutatorModifier(machine); - } - } - - public static class SlotValidatorMutator extends SlotValidator { - public SlotValidatorMutator() { - super(new ValidatorIcon(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1")); - } - - @Override - public boolean isValid(ItemStack itemStack) { - return AlvearyMutator.isMutationItem(itemStack); - } - - @Override - public String getTooltip() { - return "Mutagenic Agents"; - } - } - - public static class ComponentMutatorModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentMutatorModifier(Machine machine) { - super(machine); - } - - @Override - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - if (getUtil().isSlotEmpty(AlvearyMutator.slotMutator)) { - return 1.0f; - } - - float mult = AlvearyMutator.getMutationMult(getUtil().getStack(AlvearyMutator.slotMutator)); - return Math.min(mult, 15.0f / currentModifier); - } - - @Override - public void onPostQueenDeath(IBee queen) { - getUtil().decreaseStack(AlvearyMutator.slotMutator, 1); - } - } -} diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java deleted file mode 100644 index a5da56bf..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyRainShield.java +++ /dev/null @@ -1,32 +0,0 @@ -package binnie.extrabees.apiary.machine; - -import binnie.core.craftgui.minecraft.IMachineInformation; -import binnie.core.machines.Machine; -import binnie.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.core.ExtraBeeTexture; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; - -public class AlvearyRainShield { - public static class PackageAlvearyRainShield extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyRainShield() { - super("rainShield", ExtraBeeTexture.AlvearyRainShield.getTexture(), false); - } - - @Override - public void createMachine(Machine machine) { - new ComponentRainShield(machine); - } - } - - public static class ComponentRainShield extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentRainShield(Machine machine) { - super(machine); - } - - @Override - public boolean isSealed() { - return true; - } - } -} diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java deleted file mode 100644 index 0a31b806..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java +++ /dev/null @@ -1,419 +0,0 @@ -package binnie.extrabees.apiary.machine; - -import binnie.core.Mods; -import binnie.core.circuits.BinnieCircuit; -import binnie.core.craftgui.minecraft.IMachineInformation; -import binnie.core.genetics.BeeModifierLogic; -import binnie.core.genetics.EnumBeeBooleanModifier; -import binnie.core.genetics.EnumBeeModifier; -import binnie.core.machines.Machine; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.apiary.ComponentExtraBeeGUI; -import binnie.extrabees.core.ExtraBeeGUID; -import binnie.extrabees.core.ExtraBeeTexture; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.circuits.ChipsetManager; -import forestry.api.circuits.ICircuit; -import forestry.api.circuits.ICircuitBoard; -import forestry.api.circuits.ICircuitLayout; -import net.minecraft.item.ItemStack; - -import java.util.ArrayList; -import java.util.List; - -public class AlvearyStimulator { - public static int slotCircuit = 0; - - public enum CircuitType implements IBeeModifier { - LowVoltage(3, 10), - HighVoltage(5, 20), - Plant(10, 10), - Death(6, 10), - Life(11, 10), - Nether(7, 15), - Mutation(4, 15), - Inhibitor(1, 10), - Territory(2, 10); - - static { - CircuitType.LowVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f); - CircuitType.HighVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 2.5f, 10.0f); - CircuitType.Plant.logic.setModifier(EnumBeeModifier.FLOWERING, 1.5f, 5.0f); - CircuitType.Death.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.8f, 0.2f); - CircuitType.Life.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f); - CircuitType.Nether.logic.setModifier(EnumBeeBooleanModifier.HELLISH); - CircuitType.Mutation.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f); - CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.TERRITORY, 0.4f, 0.1f); - CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.9f, 0.5f); - CircuitType.Territory.logic.setModifier(EnumBeeModifier.TERRITORY, 1.5f, 5.0f); - for (CircuitType type : values()) { - type.logic.setModifier(EnumBeeModifier.GENETIC_DECAY, 1.5f, 10.0f); - } - } - - public int recipe; - public int power; - - protected BeeModifierLogic logic; - - CircuitType(int recipe, int power) { - logic = new BeeModifierLogic(); - this.recipe = recipe; - this.power = power; - } - - public void createCircuit(ICircuitLayout layout) { - StimulatorCircuit circuit = new StimulatorCircuit(this, layout); - for (EnumBeeModifier modifier : EnumBeeModifier.values()) { - float mod = logic.getModifier(modifier, 1.0f); - if (mod == 1.0f) { - continue; - } - - if (mod > 1.0f) { - int increase = (int) ((mod - 1.0f) * 100.0f); - circuit.addTooltipString("Increases " + modifier.getName() + " by " + increase + "%"); - } else { - int decrease = (int) ((1.0f - mod) * 100.0f); - circuit.addTooltipString("Decreases " + modifier.getName() + " by " + decrease + "%"); - } - } - } - - @Override - public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return logic.getModifier(EnumBeeModifier.TERRITORY, currentModifier); - } - - @Override - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return logic.getModifier(EnumBeeModifier.MUTATION, currentModifier); - } - - @Override - public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return logic.getModifier(EnumBeeModifier.LIFESPAN, currentModifier); - } - - @Override - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return logic.getModifier(EnumBeeModifier.PRODUCTION, currentModifier); - } - - @Override - public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return logic.getModifier(EnumBeeModifier.FLOWERING, currentModifier); - } - - @Override - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return logic.getModifier(EnumBeeModifier.GENETIC_DECAY, currentModifier); - } - - @Override - public boolean isSealed() { - return logic.getModifier(EnumBeeBooleanModifier.SEALED); - } - - @Override - public boolean isSelfLighted() { - return logic.getModifier(EnumBeeBooleanModifier.SELF_LIGHTED); - } - - @Override - public boolean isSunlightSimulated() { - return logic.getModifier(EnumBeeBooleanModifier.SUNLIGHT_STIMULATED); - } - - @Override - public boolean isHellish() { - return logic.getModifier(EnumBeeBooleanModifier.HELLISH); - } - } - - public static class PackageAlvearyStimulator extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyStimulator() { - super("stimulator", ExtraBeeTexture.AlvearyStimulator.getTexture(), true); - } - - @Override - public void createMachine(Machine machine) { - new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyStimulator); - ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(AlvearyStimulator.slotCircuit, "circuit"); - inventory.getSlot(AlvearyStimulator.slotCircuit).setValidator(new SlotValidatorCircuit()); - ComponentPowerReceptor power = new ComponentPowerReceptor(machine); - new ComponentStimulatorModifier(machine); - } - } - - public static class SlotValidatorCircuit extends SlotValidator { - public SlotValidatorCircuit() { - super(SlotValidator.IconCircuit); - } - - @Override - public boolean isValid(ItemStack itemStack) { - return itemStack != null && ChipsetManager.circuitRegistry.isChipset(itemStack); - } - - @Override - public String getTooltip() { - return "Forestry Circuits"; - } - } - - public static class ComponentStimulatorModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - protected float powerUsage; - protected boolean powered; - protected StimulatorCircuit[] modifiers; - - public ComponentStimulatorModifier(Machine machine) { - super(machine); - powerUsage = 0.0f; - powered = false; - modifiers = new StimulatorCircuit[0]; - } - - @Override - public void onUpdate() { - super.onUpdate(); - modifiers = getCircuits(); - powerUsage = 0.0f; - for (StimulatorCircuit beeMod : modifiers) { - powerUsage += beeMod.getPowerUsage(); - } - powered = getUtil().hasEnergyMJ(powerUsage); - } - - public ICircuitBoard getHiveFrame() { - if (!getUtil().isSlotEmpty(AlvearyStimulator.slotCircuit)) { - return ChipsetManager.circuitRegistry.getCircuitboard(getUtil().getStack(AlvearyStimulator.slotCircuit)); - } - return null; - } - - public StimulatorCircuit[] getCircuits() { - ICircuitBoard board = getHiveFrame(); - if (board == null) { - return new StimulatorCircuit[0]; - } - - ICircuit[] circuits = board.getCircuits(); - List mod = new ArrayList<>(); - for (ICircuit circuit : circuits) { - if (circuit instanceof StimulatorCircuit) { - mod.add((IBeeModifier) circuit); - } - } - return mod.toArray(new StimulatorCircuit[0]); - } - - @Override - public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - float mod = 1.0f; - if (!powered) { - return mod; - } - - for (IBeeModifier beeMod : modifiers) { - mod *= beeMod.getTerritoryModifier(genome, mod); - } - return mod; - } - - @Override - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - float mod = 1.0f; - if (!powered) { - return mod; - } - - for (IBeeModifier beeMod : modifiers) { - mod *= beeMod.getMutationModifier(genome, mate, mod); - } - return mod; - } - - @Override - public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - float mod = 1.0f; - if (!powered) { - return mod; - } - - for (IBeeModifier beeMod : modifiers) { - mod *= beeMod.getLifespanModifier(genome, mate, mod); - } - return mod; - } - - @Override - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - float mod = 1.0f; - if (!powered) { - return mod; - } - - for (IBeeModifier beeMod : modifiers) { - mod *= beeMod.getProductionModifier(genome, mod); - } - return mod; - } - - @Override - public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - float mod = 1.0f; - if (!powered) { - return mod; - } - - for (IBeeModifier beeMod : modifiers) { - mod *= beeMod.getFloweringModifier(genome, mod); - } - return mod; - } - - @Override - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - float mod = 1.0f; - if (!powered) { - return mod; - } - - for (IBeeModifier beeMod : modifiers) { - mod *= beeMod.getGeneticDecay(genome, mod); - } - return mod; - } - - @Override - public boolean isSealed() { - if (!powered) { - return false; - } - - for (IBeeModifier beeMod : modifiers) { - if (beeMod.isSealed()) { - return true; - } - } - return false; - } - - @Override - public boolean isSelfLighted() { - if (!powered) { - return false; - } - - for (IBeeModifier beeMod : modifiers) { - if (beeMod.isSelfLighted()) { - return true; - } - } - return false; - } - - @Override - public boolean isSunlightSimulated() { - if (!powered) { - return false; - } - - for (IBeeModifier beeMod : modifiers) { - if (beeMod.isSunlightSimulated()) { - return true; - } - } - return false; - } - - @Override - public boolean isHellish() { - if (!powered) { - return false; - } - - for (IBeeModifier beeMod : modifiers) { - if (beeMod.isHellish()) { - return true; - } - } - return false; - } - - @Override - public void wearOutEquipment(int amount) { - getUtil().useEnergyMJ(powerUsage); - } - } - - public static class StimulatorCircuit extends BinnieCircuit implements IBeeModifier { - protected CircuitType type; - - public StimulatorCircuit(CircuitType type, ICircuitLayout layout) { - super("stimulator." + type.toString().toLowerCase(), 4, layout, Mods.forestry.item("thermionicTubes"), type.recipe); - this.type = type; - } - - public int getPowerUsage() { - return type.power; - } - - @Override - public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return type.getTerritoryModifier(genome, currentModifier); - } - - @Override - public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return type.getMutationModifier(genome, mate, currentModifier); - } - - @Override - public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return type.getLifespanModifier(genome, mate, currentModifier); - } - - @Override - public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return type.getProductionModifier(genome, currentModifier); - } - - @Override - public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return type.getFloweringModifier(genome, currentModifier); - } - - @Override - public boolean isSealed() { - return type.isSealed(); - } - - @Override - public boolean isSelfLighted() { - return type.isSelfLighted(); - } - - @Override - public boolean isSunlightSimulated() { - return type.isSunlightSimulated(); - } - - @Override - public boolean isHellish() { - return type.isHellish(); - } - - @Override - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return type.getGeneticDecay(genome, currentModifier); - } - } -} diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java deleted file mode 100644 index 0c7e6577..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyTransmission.java +++ /dev/null @@ -1,74 +0,0 @@ -package binnie.extrabees.apiary.machine; - -import binnie.core.craftgui.minecraft.IMachineInformation; -import binnie.core.machines.Machine; -import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.apiary.TileExtraBeeAlveary; -import binnie.extrabees.core.ExtraBeeTexture; -import cofh.api.energy.IEnergyHandler; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import java.util.ArrayList; -import java.util.List; - -public class AlvearyTransmission { - public static class PackageAlvearyTransmission extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyTransmission() { - super("transmission", ExtraBeeTexture.AlvearyTransmission.getTexture(), false); - } - - @Override - public void createMachine(Machine machine) { - new ComponentPowerReceptor(machine, 1000); - new ComponentTransmission(machine); - } - } - - public static class ComponentTransmission extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentTransmission(Machine machine) { - super(machine); - } - - @Override - public void onUpdate() { - super.onUpdate(); - int energy = getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH); - if (energy == 0) { - return; - } - - TileExtraBeeAlveary tile = (TileExtraBeeAlveary) getMachine().getTileEntity(); - List handlers = new ArrayList(); - for (TileEntity alvearyTile : tile.getAlvearyBlocks()) { - if (alvearyTile instanceof IEnergyHandler && alvearyTile != tile) { - handlers.add((IEnergyHandler) alvearyTile); - } - } - - if (handlers.isEmpty()) { - return; - } - - int maxOutput = 500; - int output = energy / handlers.size(); - if (output > maxOutput) { - output = maxOutput; - } else if (output < 1) { - output = 1; - } - - for (IEnergyHandler handler : handlers) { - int recieved = handler.receiveEnergy(ForgeDirection.NORTH, output, false); - getUtil().getPoweredMachine().receiveEnergy(ForgeDirection.NORTH, -recieved, false); - energy = getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH); - if (energy <= 0) { - return; - } - } - } - } -} diff --git a/src/main/java/binnie/extrabees/apiary/machine/frame/AlvearyFrame.java b/src/main/java/binnie/extrabees/apiary/machine/frame/AlvearyFrame.java new file mode 100644 index 00000000..b9ea498a --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/frame/AlvearyFrame.java @@ -0,0 +1,5 @@ +package binnie.extrabees.apiary.machine.frame; + +public class AlvearyFrame { + public static final int SLOT_FRAME = 0; +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameAlvearyPackage.java new file mode 100644 index 00000000..734ec647 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameAlvearyPackage.java @@ -0,0 +1,24 @@ +package binnie.extrabees.apiary.machine.frame; + +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.extrabees.apiary.ComponentExtraBeeGUI; +import binnie.extrabees.apiary.machine.AlvearyMachine; +import binnie.extrabees.core.ExtraBeeGUID; +import binnie.extrabees.core.ExtraBeeTexture; + +public class FrameAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public FrameAlvearyPackage() { + super("frame", ExtraBeeTexture.AlvearyFrame.getTexture(), false); + } + + @Override + public void createMachine(Machine machine) { + new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyFrame); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + inventory.addSlot(AlvearyFrame.SLOT_FRAME, "frame"); + inventory.getSlot(AlvearyFrame.SLOT_FRAME).setValidator(new FrameSlotValidator()); + new FrameComponentModifier(machine); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java new file mode 100644 index 00000000..f315c41c --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java @@ -0,0 +1,80 @@ +package binnie.extrabees.apiary.machine.frame; + +import binnie.Binnie; +import binnie.core.machines.Machine; +import binnie.extrabees.apiary.ComponentBeeModifier; +import binnie.extrabees.apiary.TileExtraBeeAlveary; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IHiveFrame; +import net.minecraft.world.World; + +public class FrameComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public FrameComponentModifier(Machine machine) { + super(machine); + } + + @Override + public void wearOutEquipment(int amount) { + if (getHiveFrame() == null) { + return; + } + + World world = getMachine().getTileEntity().getWorldObj(); + int wear = Math.round(amount * 5 * Binnie.Genetics.getBeeRoot().getBeekeepingMode(world).getWearModifier()); + getInventory().setInventorySlotContents(AlvearyFrame.SLOT_FRAME, getHiveFrame().frameUsed(((TileExtraBeeAlveary) getMachine().getTileEntity()).getMultiblockLogic().getController(), getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME), null, wear)); + } + + public IHiveFrame getHiveFrame() { + if (getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME) == null) { + return null; + } + return (IHiveFrame) getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME).getItem(); + } + + @Override + public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { + IHiveFrame frame = getHiveFrame(); + if (frame == null) { + return 1.0f; + } + return frame.getBeeModifier().getTerritoryModifier(genome, currentModifier); + } + + @Override + public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + IHiveFrame frame = getHiveFrame(); + if (frame == null) { + return 1.0f; + } + return frame.getBeeModifier().getMutationModifier(genome, mate, currentModifier); + } + + @Override + public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + IHiveFrame frame = getHiveFrame(); + if (getHiveFrame() == null) { + return 1.0f; + } + return frame.getBeeModifier().getLifespanModifier(genome, mate, currentModifier); + } + + @Override + public float getProductionModifier(IBeeGenome genome, float currentModifier) { + IHiveFrame frame = getHiveFrame(); + if (frame == null) { + return 1.0f; + } + return frame.getBeeModifier().getProductionModifier(genome, currentModifier); + } + + @Override + public float getFloweringModifier(IBeeGenome genome, float currentModifier) { + IHiveFrame frame = getHiveFrame(); + if (frame == null) { + return 1.0f; + } + return frame.getBeeModifier().getFloweringModifier(genome, currentModifier); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameSlotValidator.java b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameSlotValidator.java new file mode 100644 index 00000000..98d82c13 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameSlotValidator.java @@ -0,0 +1,23 @@ +package binnie.extrabees.apiary.machine.frame; + +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; +import forestry.api.apiculture.IHiveFrame; +import net.minecraft.item.ItemStack; + +public class FrameSlotValidator extends SlotValidator { + public FrameSlotValidator() { + super(SlotValidator.IconFrame); + } + + @Override + public boolean isValid(ItemStack itemStack) { + return itemStack != null + && itemStack.getItem() instanceof IHiveFrame; + } + + @Override + public String getTooltip() { + return I18N.localise("extrabees.achine.alveay.frame.tooltip"); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/hatchery/AlvearyHatchery.java b/src/main/java/binnie/extrabees/apiary/machine/hatchery/AlvearyHatchery.java new file mode 100644 index 00000000..dcd56e8e --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/hatchery/AlvearyHatchery.java @@ -0,0 +1,5 @@ +package binnie.extrabees.apiary.machine.hatchery; + +public class AlvearyHatchery { + public static final int[] SLOT_LARVAE = new int[]{0, 1, 2, 3, 4}; +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryAlvearyPackage.java new file mode 100644 index 00000000..672a081d --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryAlvearyPackage.java @@ -0,0 +1,26 @@ +package binnie.extrabees.apiary.machine.hatchery; + +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.InventorySlot; +import binnie.extrabees.apiary.ComponentExtraBeeGUI; +import binnie.extrabees.apiary.machine.AlvearyMachine; +import binnie.extrabees.core.ExtraBeeGUID; +import binnie.extrabees.core.ExtraBeeTexture; + +public class HatcheryAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public HatcheryAlvearyPackage() { + super("hatchery", ExtraBeeTexture.AlvearyHatchery.getTexture(), false); + } + + @Override + public void createMachine(Machine machine) { + new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyHatchery); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + for (InventorySlot slot : inventory.addSlotArray(AlvearyHatchery.SLOT_LARVAE, "hatchery")) { + slot.setValidator(new LarvaeSlotValidator()); + } + new HatcheryComponentModifier(machine); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryComponentModifier.java b/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryComponentModifier.java new file mode 100644 index 00000000..b4a3a37f --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryComponentModifier.java @@ -0,0 +1,50 @@ +package binnie.extrabees.apiary.machine.hatchery; + +import binnie.Binnie; +import binnie.core.machines.Machine; +import binnie.core.machines.transfer.TransferRequest; +import binnie.extrabees.apiary.ComponentBeeModifier; +import binnie.extrabees.apiary.TileExtraBeeAlveary; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.apiculture.IBeeRoot; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import java.util.Random; + +public class HatcheryComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public HatcheryComponentModifier(Machine machine) { + super(machine); + } + + @Override + public void onUpdate() { + if (new Random().nextInt(2400) != 0) { + return; + } + + TileEntity tile = getMachine().getTileEntity(); + if (!(tile instanceof TileExtraBeeAlveary)) { + return; + } + + IBeeHousing house = ((TileExtraBeeAlveary) tile).getMultiblockLogic().getController(); + if (house == null || house.getErrorLogic().hasErrors()) { + return; + } + + ItemStack queenStack = house.getBeeInventory().getQueen(); + IBee queen = (queenStack == null) ? null : Binnie.Genetics.getBeeRoot().getMember(queenStack); + if (queen == null) { + return; + } + + IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot(); + ItemStack larvae = beeRoot.getMemberStack(beeRoot.getBee(getMachine().getWorld(), queen.getGenome()), EnumBeeType.LARVAE.ordinal()); + new TransferRequest(larvae, getInventory()).transfer(true); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/hatchery/LarvaeSlotValidator.java b/src/main/java/binnie/extrabees/apiary/machine/hatchery/LarvaeSlotValidator.java new file mode 100644 index 00000000..2f3e7bf2 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/hatchery/LarvaeSlotValidator.java @@ -0,0 +1,23 @@ +package binnie.extrabees.apiary.machine.hatchery; + +import binnie.Binnie; +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; +import forestry.api.apiculture.EnumBeeType; +import net.minecraft.item.ItemStack; + +public class LarvaeSlotValidator extends SlotValidator { + public LarvaeSlotValidator() { + super(SlotValidator.IconBee); + } + + @Override + public boolean isValid(ItemStack itemStack) { + return Binnie.Genetics.getBeeRoot().isMember(itemStack) && Binnie.Genetics.getBeeRoot().getType(itemStack) == EnumBeeType.LARVAE; + } + + @Override + public String getTooltip() { + return I18N.localise("extrabees.machine.alveay.hatchery.tooltip"); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingAlvearyPackage.java new file mode 100644 index 00000000..58846b91 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingAlvearyPackage.java @@ -0,0 +1,17 @@ +package binnie.extrabees.apiary.machine.lighting; + +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.extrabees.apiary.machine.AlvearyMachine; +import binnie.extrabees.core.ExtraBeeTexture; + +public class LightingAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public LightingAlvearyPackage() { + super("lighting", ExtraBeeTexture.AlvearyLighting.getTexture(), false); + } + + @Override + public void createMachine(Machine machine) { + new LightingComponentModifier(machine); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingComponentModifier.java b/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingComponentModifier.java new file mode 100644 index 00000000..416fd2ed --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingComponentModifier.java @@ -0,0 +1,17 @@ +package binnie.extrabees.apiary.machine.lighting; + +import binnie.core.machines.Machine; +import binnie.extrabees.apiary.ComponentBeeModifier; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; + +public class LightingComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public LightingComponentModifier(Machine machine) { + super(machine); + } + + @Override + public boolean isSelfLighted() { + return true; + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/mutator/AlvearyMutator.java b/src/main/java/binnie/extrabees/apiary/machine/mutator/AlvearyMutator.java new file mode 100644 index 00000000..c4012d38 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/mutator/AlvearyMutator.java @@ -0,0 +1,41 @@ +package binnie.extrabees.apiary.machine.mutator; + +import net.minecraft.item.ItemStack; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +public class AlvearyMutator { + public static final int SLOT_MUTATOR = 0; + + protected static Map mutations = new HashMap<>(); + + public static boolean isMutationItem(ItemStack item) { + return getMutationMult(item) > 1.0f; + } + + public static float getMutationMult(ItemStack item) { + if (item == null) { + return 1.0f; + } + + for (ItemStack comp : AlvearyMutator.mutations.keySet()) { + if (ItemStack.areItemStackTagsEqual(item, comp) && item.isItemEqual(comp)) { + return AlvearyMutator.mutations.get(comp); + } + } + return 1.0f; + } + + public static void addMutationItem(ItemStack item, float chance) { + if (item == null) { + return; + } + AlvearyMutator.mutations.put(item, chance); + } + + public static Collection getMutagens() { + return AlvearyMutator.mutations.keySet(); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorAlvearyPackage.java new file mode 100644 index 00000000..36d92de9 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorAlvearyPackage.java @@ -0,0 +1,24 @@ +package binnie.extrabees.apiary.machine.mutator; + +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.extrabees.apiary.ComponentExtraBeeGUI; +import binnie.extrabees.apiary.machine.AlvearyMachine; +import binnie.extrabees.core.ExtraBeeGUID; +import binnie.extrabees.core.ExtraBeeTexture; + +public class MutatorAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public MutatorAlvearyPackage() { + super("mutator", ExtraBeeTexture.AlvearyMutator.getTexture(), false); + } + + @Override + public void createMachine(Machine machine) { + new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyMutator); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + inventory.addSlot(AlvearyMutator.SLOT_MUTATOR, "mutator"); + inventory.getSlot(AlvearyMutator.SLOT_MUTATOR).setValidator(new MutatorSlotValidator()); + new MutatorModifierComponent(machine); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java new file mode 100644 index 00000000..b1b4552f --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java @@ -0,0 +1,29 @@ +package binnie.extrabees.apiary.machine.mutator; + +import binnie.core.machines.Machine; +import binnie.extrabees.apiary.ComponentBeeModifier; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; + +public class MutatorModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public MutatorModifierComponent(Machine machine) { + super(machine); + } + + @Override + public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + if (getUtil().isSlotEmpty(AlvearyMutator.SLOT_MUTATOR)) { + return 1.0f; + } + + float mult = AlvearyMutator.getMutationMult(getUtil().getStack(AlvearyMutator.SLOT_MUTATOR)); + return Math.min(mult, 15.0f / currentModifier); + } + + @Override + public void onPostQueenDeath(IBee queen) { + getUtil().decreaseStack(AlvearyMutator.SLOT_MUTATOR, 1); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorSlotValidator.java b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorSlotValidator.java new file mode 100644 index 00000000..423e975d --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorSlotValidator.java @@ -0,0 +1,23 @@ +package binnie.extrabees.apiary.machine.mutator; + +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.ValidatorIcon; +import binnie.core.util.I18N; +import binnie.extrabees.ExtraBees; +import net.minecraft.item.ItemStack; + +public class MutatorSlotValidator extends SlotValidator { + public MutatorSlotValidator() { + super(new ValidatorIcon(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1")); + } + + @Override + public boolean isValid(ItemStack itemStack) { + return AlvearyMutator.isMutationItem(itemStack); + } + + @Override + public String getTooltip() { + return I18N.localise("extrabees.machine.alveay.mutator.tooltip"); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldAlvearyPackage.java new file mode 100644 index 00000000..abfaf238 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldAlvearyPackage.java @@ -0,0 +1,17 @@ +package binnie.extrabees.apiary.machine.rainShield; + +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.extrabees.apiary.machine.AlvearyMachine; +import binnie.extrabees.core.ExtraBeeTexture; + +public class RainShieldAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public RainShieldAlvearyPackage() { + super("rainShield", ExtraBeeTexture.AlvearyRainShield.getTexture(), false); + } + + @Override + public void createMachine(Machine machine) { + new RainShieldModifierComponent(machine); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldModifierComponent.java new file mode 100644 index 00000000..e1071f95 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldModifierComponent.java @@ -0,0 +1,17 @@ +package binnie.extrabees.apiary.machine.rainShield; + +import binnie.core.machines.Machine; +import binnie.extrabees.apiary.ComponentBeeModifier; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; + +public class RainShieldModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public RainShieldModifierComponent(Machine machine) { + super(machine); + } + + @Override + public boolean isSealed() { + return true; + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/AlvearyStimulator.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/AlvearyStimulator.java new file mode 100644 index 00000000..e6d74949 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/AlvearyStimulator.java @@ -0,0 +1,5 @@ +package binnie.extrabees.apiary.machine.stimulator; + +public class AlvearyStimulator { + public static final int SLOT_CIRCUIT = 0; +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitSlotValidator.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitSlotValidator.java new file mode 100644 index 00000000..296d6490 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitSlotValidator.java @@ -0,0 +1,22 @@ +package binnie.extrabees.apiary.machine.stimulator; + +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; +import forestry.api.circuits.ChipsetManager; +import net.minecraft.item.ItemStack; + +public class CircuitSlotValidator extends SlotValidator { + public CircuitSlotValidator() { + super(SlotValidator.IconCircuit); + } + + @Override + public boolean isValid(ItemStack itemStack) { + return itemStack != null && ChipsetManager.circuitRegistry.isChipset(itemStack); + } + + @Override + public String getTooltip() { + return I18N.localise("extrabees.machine.alveay.stimulator.tooltip"); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java new file mode 100644 index 00000000..662cda40 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java @@ -0,0 +1,115 @@ +package binnie.extrabees.apiary.machine.stimulator; + +import binnie.core.genetics.BeeModifierLogic; +import binnie.core.genetics.EnumBeeBooleanModifier; +import binnie.core.genetics.EnumBeeModifier; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.circuits.ICircuitLayout; + +public enum CircuitType implements IBeeModifier { + LowVoltage(3, 10), + HighVoltage(5, 20), + Plant(10, 10), + Death(6, 10), + Life(11, 10), + Nether(7, 15), + Mutation(4, 15), + Inhibitor(1, 10), + Territory(2, 10); + + static { + CircuitType.LowVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f); + CircuitType.HighVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 2.5f, 10.0f); + CircuitType.Plant.logic.setModifier(EnumBeeModifier.FLOWERING, 1.5f, 5.0f); + CircuitType.Death.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.8f, 0.2f); + CircuitType.Life.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f); + CircuitType.Nether.logic.setModifier(EnumBeeBooleanModifier.HELLISH); + CircuitType.Mutation.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f); + CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.TERRITORY, 0.4f, 0.1f); + CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.9f, 0.5f); + CircuitType.Territory.logic.setModifier(EnumBeeModifier.TERRITORY, 1.5f, 5.0f); + for (CircuitType type : values()) { + type.logic.setModifier(EnumBeeModifier.GENETIC_DECAY, 1.5f, 10.0f); + } + } + + public int recipe; + public int power; + + protected BeeModifierLogic logic; + + CircuitType(int recipe, int power) { + logic = new BeeModifierLogic(); + this.recipe = recipe; + this.power = power; + } + + public void createCircuit(ICircuitLayout layout) { + StimulatorCircuit circuit = new StimulatorCircuit(this, layout); + for (EnumBeeModifier modifier : EnumBeeModifier.values()) { + float mod = logic.getModifier(modifier, 1.0f); + if (mod == 1.0f) { + continue; + } + + if (mod > 1.0f) { + int increase = (int) ((mod - 1.0f) * 100.0f); + circuit.addTooltipString("Increases " + modifier.getName() + " by " + increase + "%"); + } else { + int decrease = (int) ((1.0f - mod) * 100.0f); + circuit.addTooltipString("Decreases " + modifier.getName() + " by " + decrease + "%"); + } + } + } + + @Override + public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { + return logic.getModifier(EnumBeeModifier.TERRITORY, currentModifier); + } + + @Override + public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + return logic.getModifier(EnumBeeModifier.MUTATION, currentModifier); + } + + @Override + public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + return logic.getModifier(EnumBeeModifier.LIFESPAN, currentModifier); + } + + @Override + public float getProductionModifier(IBeeGenome genome, float currentModifier) { + return logic.getModifier(EnumBeeModifier.PRODUCTION, currentModifier); + } + + @Override + public float getFloweringModifier(IBeeGenome genome, float currentModifier) { + return logic.getModifier(EnumBeeModifier.FLOWERING, currentModifier); + } + + @Override + public float getGeneticDecay(IBeeGenome genome, float currentModifier) { + return logic.getModifier(EnumBeeModifier.GENETIC_DECAY, currentModifier); + } + + @Override + public boolean isSealed() { + return logic.getModifier(EnumBeeBooleanModifier.SEALED); + } + + @Override + public boolean isSelfLighted() { + return logic.getModifier(EnumBeeBooleanModifier.SELF_LIGHTED); + } + + @Override + public boolean isSunlightSimulated() { + return logic.getModifier(EnumBeeBooleanModifier.SUNLIGHT_STIMULATED); + } + + @Override + public boolean isHellish() { + return logic.getModifier(EnumBeeBooleanModifier.HELLISH); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorAlvearyPackage.java new file mode 100644 index 00000000..d5ec10c2 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorAlvearyPackage.java @@ -0,0 +1,26 @@ +package binnie.extrabees.apiary.machine.stimulator; + +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.power.ComponentPowerReceptor; +import binnie.extrabees.apiary.ComponentExtraBeeGUI; +import binnie.extrabees.apiary.machine.AlvearyMachine; +import binnie.extrabees.core.ExtraBeeGUID; +import binnie.extrabees.core.ExtraBeeTexture; + +public class StimulatorAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public StimulatorAlvearyPackage() { + super("stimulator", ExtraBeeTexture.AlvearyStimulator.getTexture(), true); + } + + @Override + public void createMachine(Machine machine) { + new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyStimulator); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + inventory.addSlot(AlvearyStimulator.SLOT_CIRCUIT, "circuit"); + inventory.getSlot(AlvearyStimulator.SLOT_CIRCUIT).setValidator(new CircuitSlotValidator()); + new ComponentPowerReceptor(machine); + new StimulatorModifierComponent(machine); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorCircuit.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorCircuit.java new file mode 100644 index 00000000..09472c1b --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorCircuit.java @@ -0,0 +1,70 @@ +package binnie.extrabees.apiary.machine.stimulator; + +import binnie.core.Mods; +import binnie.core.circuits.BinnieCircuit; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.circuits.ICircuitLayout; + +public class StimulatorCircuit extends BinnieCircuit implements IBeeModifier { + protected CircuitType type; + + public StimulatorCircuit(CircuitType type, ICircuitLayout layout) { + super("stimulator." + type.toString().toLowerCase(), 4, layout, Mods.forestry.item("thermionicTubes"), type.recipe); + this.type = type; + } + + public int getPowerUsage() { + return type.power; + } + + @Override + public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { + return type.getTerritoryModifier(genome, currentModifier); + } + + @Override + public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + return type.getMutationModifier(genome, mate, currentModifier); + } + + @Override + public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + return type.getLifespanModifier(genome, mate, currentModifier); + } + + @Override + public float getProductionModifier(IBeeGenome genome, float currentModifier) { + return type.getProductionModifier(genome, currentModifier); + } + + @Override + public float getFloweringModifier(IBeeGenome genome, float currentModifier) { + return type.getFloweringModifier(genome, currentModifier); + } + + @Override + public boolean isSealed() { + return type.isSealed(); + } + + @Override + public boolean isSelfLighted() { + return type.isSelfLighted(); + } + + @Override + public boolean isSunlightSimulated() { + return type.isSunlightSimulated(); + } + + @Override + public boolean isHellish() { + return type.isHellish(); + } + + @Override + public float getGeneticDecay(IBeeGenome genome, float currentModifier) { + return type.getGeneticDecay(genome, currentModifier); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java new file mode 100644 index 00000000..a74371a2 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java @@ -0,0 +1,199 @@ +package binnie.extrabees.apiary.machine.stimulator; + +import binnie.core.machines.Machine; +import binnie.extrabees.apiary.ComponentBeeModifier; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import forestry.api.circuits.ChipsetManager; +import forestry.api.circuits.ICircuit; +import forestry.api.circuits.ICircuitBoard; + +import java.util.ArrayList; +import java.util.List; + +public class StimulatorModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + protected float powerUsage; + protected boolean powered; + protected StimulatorCircuit[] modifiers; + + public StimulatorModifierComponent(Machine machine) { + super(machine); + powerUsage = 0.0f; + powered = false; + modifiers = new StimulatorCircuit[0]; + } + + @Override + public void onUpdate() { + super.onUpdate(); + modifiers = getCircuits(); + powerUsage = 0.0f; + for (StimulatorCircuit beeMod : modifiers) { + powerUsage += beeMod.getPowerUsage(); + } + powered = getUtil().hasEnergyMJ(powerUsage); + } + + public ICircuitBoard getHiveFrame() { + if (!getUtil().isSlotEmpty(AlvearyStimulator.SLOT_CIRCUIT)) { + return ChipsetManager.circuitRegistry.getCircuitboard(getUtil().getStack(AlvearyStimulator.SLOT_CIRCUIT)); + } + return null; + } + + public StimulatorCircuit[] getCircuits() { + ICircuitBoard board = getHiveFrame(); + if (board == null) { + return new StimulatorCircuit[0]; + } + + ICircuit[] circuits = board.getCircuits(); + List mod = new ArrayList<>(); + for (ICircuit circuit : circuits) { + if (circuit instanceof StimulatorCircuit) { + mod.add((IBeeModifier) circuit); + } + } + return mod.toArray(new StimulatorCircuit[0]); + } + + @Override + public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { + float mod = 1.0f; + if (!powered) { + return mod; + } + + for (IBeeModifier beeMod : modifiers) { + mod *= beeMod.getTerritoryModifier(genome, mod); + } + return mod; + } + + @Override + public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + float mod = 1.0f; + if (!powered) { + return mod; + } + + for (IBeeModifier beeMod : modifiers) { + mod *= beeMod.getMutationModifier(genome, mate, mod); + } + return mod; + } + + @Override + public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + float mod = 1.0f; + if (!powered) { + return mod; + } + + for (IBeeModifier beeMod : modifiers) { + mod *= beeMod.getLifespanModifier(genome, mate, mod); + } + return mod; + } + + @Override + public float getProductionModifier(IBeeGenome genome, float currentModifier) { + float mod = 1.0f; + if (!powered) { + return mod; + } + + for (IBeeModifier beeMod : modifiers) { + mod *= beeMod.getProductionModifier(genome, mod); + } + return mod; + } + + @Override + public float getFloweringModifier(IBeeGenome genome, float currentModifier) { + float mod = 1.0f; + if (!powered) { + return mod; + } + + for (IBeeModifier beeMod : modifiers) { + mod *= beeMod.getFloweringModifier(genome, mod); + } + return mod; + } + + @Override + public float getGeneticDecay(IBeeGenome genome, float currentModifier) { + float mod = 1.0f; + if (!powered) { + return mod; + } + + for (IBeeModifier beeMod : modifiers) { + mod *= beeMod.getGeneticDecay(genome, mod); + } + return mod; + } + + @Override + public boolean isSealed() { + if (!powered) { + return false; + } + + for (IBeeModifier beeMod : modifiers) { + if (beeMod.isSealed()) { + return true; + } + } + return false; + } + + @Override + public boolean isSelfLighted() { + if (!powered) { + return false; + } + + for (IBeeModifier beeMod : modifiers) { + if (beeMod.isSelfLighted()) { + return true; + } + } + return false; + } + + @Override + public boolean isSunlightSimulated() { + if (!powered) { + return false; + } + + for (IBeeModifier beeMod : modifiers) { + if (beeMod.isSunlightSimulated()) { + return true; + } + } + return false; + } + + @Override + public boolean isHellish() { + if (!powered) { + return false; + } + + for (IBeeModifier beeMod : modifiers) { + if (beeMod.isHellish()) { + return true; + } + } + return false; + } + + @Override + public void wearOutEquipment(int amount) { + getUtil().useEnergyMJ(powerUsage); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionAlvearyPackage.java new file mode 100644 index 00000000..cf044f66 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionAlvearyPackage.java @@ -0,0 +1,19 @@ +package binnie.extrabees.apiary.machine.transmission; + +import binnie.core.craftgui.minecraft.IMachineInformation; +import binnie.core.machines.Machine; +import binnie.core.machines.power.ComponentPowerReceptor; +import binnie.extrabees.apiary.machine.AlvearyMachine; +import binnie.extrabees.core.ExtraBeeTexture; + +public class TransmissionAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public TransmissionAlvearyPackage() { + super("transmission", ExtraBeeTexture.AlvearyTransmission.getTexture(), false); + } + + @Override + public void createMachine(Machine machine) { + new ComponentPowerReceptor(machine, 1000); + new TransmissionModifierComponent(machine); + } +} diff --git a/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java new file mode 100644 index 00000000..18b903b9 --- /dev/null +++ b/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java @@ -0,0 +1,57 @@ +package binnie.extrabees.apiary.machine.transmission; + +import binnie.core.machines.Machine; +import binnie.extrabees.apiary.ComponentBeeModifier; +import binnie.extrabees.apiary.TileExtraBeeAlveary; +import cofh.api.energy.IEnergyHandler; +import forestry.api.apiculture.IBeeListener; +import forestry.api.apiculture.IBeeModifier; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + +import java.util.ArrayList; +import java.util.List; + +public class TransmissionModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public TransmissionModifierComponent(Machine machine) { + super(machine); + } + + @Override + public void onUpdate() { + super.onUpdate(); + int energy = getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH); + if (energy == 0) { + return; + } + + TileExtraBeeAlveary tile = (TileExtraBeeAlveary) getMachine().getTileEntity(); + List handlers = new ArrayList(); + for (TileEntity alvearyTile : tile.getAlvearyBlocks()) { + if (alvearyTile instanceof IEnergyHandler && alvearyTile != tile) { + handlers.add((IEnergyHandler) alvearyTile); + } + } + + if (handlers.isEmpty()) { + return; + } + + int maxOutput = 500; + int output = energy / handlers.size(); + if (output > maxOutput) { + output = maxOutput; + } else if (output < 1) { + output = 1; + } + + for (IEnergyHandler handler : handlers) { + int recieved = handler.receiveEnergy(ForgeDirection.NORTH, output, false); + getUtil().getPoweredMachine().receiveEnergy(ForgeDirection.NORTH, -recieved, false); + energy = getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH); + if (energy <= 0) { + return; + } + } + } +} diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java index 8d2f349b..32fd9a98 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java @@ -193,7 +193,7 @@ public enum ExtraBeeItems implements IItemMisc { @Override public String getName(ItemStack itemStack) { - return I18N.localise(ExtraBees.instance, "item." + name); + return I18N.localise("extrabees.item." + name); } @Override diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java index 9df027ca..b83e33d9 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java @@ -271,6 +271,8 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }; + private static IAllele[] defaultTemplate; + private final IClassification branch; ExtraBeeBranchDefinition(String scientific) { @@ -297,8 +299,6 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { return branch; } - private static IAllele[] defaultTemplate; - private static IAllele[] getDefaultTemplate() { if (defaultTemplate == null) { defaultTemplate = new IAllele[EnumBeeChromosome.values().length]; diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index af861bd9..4f5073f5 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -1,7 +1,7 @@ package binnie.extrabees.genetics; import binnie.core.Mods; -import binnie.extrabees.ExtraBees; +import binnie.core.util.I18N; import forestry.api.apiculture.FlowerManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -71,7 +71,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo @Override public String getDescription() { - return ExtraBees.proxy.localise("flowers." + name().toString().toLowerCase() + ".name"); + return I18N.localise("extrabees.flowers." + name().toString().toLowerCase() + ".name"); } public void register() { @@ -124,7 +124,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo return types.size() > 1 || !types.contains(EnumPlantType.Nether); } - public boolean isAcceptedFlower(World world, IIndividual individual, int x, int y, int z) { + public boolean isAcceptedFlower(World world, int x, int y, int z) { Block block = world.getBlock(x, y, z); if (block == null) { return false; diff --git a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java index b66b9781..4669ed2b 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java +++ b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java @@ -13,8 +13,8 @@ public class EntityBeeLightning extends EntityLightningBolt { int lightningState; int boltLivingTime; - public EntityBeeLightning(World par1World, double par2, double par4, double par6) { - super(par1World, par2, par4, par6); + public EntityBeeLightning(World world, double x, double y, double z) { + super(world, x, y, z); lightningState = 2; boltLivingTime = rand.nextInt(3) + 1; } diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index 5f0de4f4..fc34d180 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -1,6 +1,7 @@ package binnie.extrabees.genetics.effect; import binnie.Binnie; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.extrabees.genetics.ExtraBeesFlowers; import cofh.api.energy.IEnergyReceiver; @@ -67,7 +68,8 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { protected static List birthdays; static { - (ExtraBeesEffect.birthdays = new ArrayList<>()).add(new Birthday(3, 10, "Binnie")); + birthdays = new ArrayList<>(); + birthdays.add(new Birthday(3, 10, "Binnie")); } public boolean combinable; @@ -152,7 +154,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { @Override public String getName() { - return ExtraBees.proxy.localise("effect." + name().toString().toLowerCase() + ".name"); + return I18N.localise("extrabees.effect." + name().toLowerCase() + ".name"); } @Override @@ -161,33 +163,35 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } public void spawnMob(World world, int x, int y, int z, String name) { - if (anyPlayerInRange(world, x, y, z, 16)) { - double xOffset = x + world.rand.nextFloat(); - double yOffset = y + world.rand.nextFloat(); - double zOffset = z + world.rand.nextFloat(); - world.spawnParticle("smoke", xOffset, yOffset, zOffset, 0.0, 0.0, 0.0); - world.spawnParticle("flame", xOffset, yOffset, zOffset, 0.0, 0.0, 0.0); - EntityLiving entity = (EntityLiving) EntityList.createEntityByName(name, world); + if (!anyPlayerInRange(world, x, y, z, 16)) { + return; + } - if (entity == null) { - return; - } + double xOffset = x + world.rand.nextFloat(); + double yOffset = y + world.rand.nextFloat(); + double zOffset = z + world.rand.nextFloat(); + world.spawnParticle("smoke", xOffset, yOffset, zOffset, 0.0, 0.0, 0.0); + world.spawnParticle("flame", xOffset, yOffset, zOffset, 0.0, 0.0, 0.0); + EntityLiving entity = (EntityLiving) EntityList.createEntityByName(name, world); - int entityCount = world.getEntitiesWithinAABB(entity.getClass(), AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(8.0, 4.0, 8.0)).size(); - if (entityCount >= 6) { - return; - } + if (entity == null) { + return; + } - xOffset = x + (world.rand.nextDouble() - world.rand.nextDouble()) * 4.0; - yOffset = y + world.rand.nextInt(3) - 1; - zOffset = z + (world.rand.nextDouble() - world.rand.nextDouble()) * 4.0; - entity.setLocationAndAngles(xOffset, yOffset, zOffset, world.rand.nextFloat() * 360.0f, 0.0f); + int entityCount = world.getEntitiesWithinAABB(entity.getClass(), AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(8.0, 4.0, 8.0)).size(); + if (entityCount >= 6) { + return; + } - if (entity.getCanSpawnHere()) { - world.spawnEntityInWorld(entity); - world.playAuxSFX(2004, x, y, z, 0); - entity.spawnExplosionParticle(); - } + xOffset = x + (world.rand.nextDouble() - world.rand.nextDouble()) * 4.0; + yOffset = y + world.rand.nextInt(3) - 1; + zOffset = z + (world.rand.nextDouble() - world.rand.nextDouble()) * 4.0; + entity.setLocationAndAngles(xOffset, yOffset, zOffset, world.rand.nextFloat() * 360.0f, 0.0f); + + if (entity.getCanSpawnHere()) { + world.spawnEntityInWorld(entity); + world.playAuxSFX(2004, x, y, z, 0); + entity.spawnExplosionParticle(); } } @@ -521,7 +525,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return; } - if (ExtraBeesFlowers.SAPLING.isAcceptedFlower(world, null, x, y, z)) { + if (ExtraBeesFlowers.SAPLING.isAcceptedFlower(world, x, y, z)) { ItemDye.applyBonemeal(new ItemStack(Blocks.dirt, 1), world, x, y, z, null); } } @@ -531,7 +535,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return; } - if (ExtraBeesFlowers.FRUIT.isAcceptedFlower(world, null, x, y, z)) { + if (ExtraBeesFlowers.FRUIT.isAcceptedFlower(world, x, y, z)) { ItemDye.applyBonemeal(new ItemStack(Blocks.dirt, 1), world, x, y, z, null); } } diff --git a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java index ea2fe39e..fcca6ba2 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java +++ b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java @@ -29,10 +29,6 @@ public class FireworkCreator { shape = 0; } - public void setFlicker() { - flicker = true; - } - public void setTrail() { trail = true; } @@ -45,7 +41,7 @@ public class FireworkCreator { colors.add(color); } - NBTTagCompound getNBT() { + public NBTTagCompound getNBT() { NBTTagCompound nbt = new NBTTagCompound(); if (flicker) { nbt.setBoolean("Flicker", true); diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index 2659e195..6d41a588 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -1,5 +1,6 @@ package binnie.extrabees.genetics.items; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.extrabees.core.ExtraBeeGUID; import cpw.mods.fml.relauncher.Side; @@ -42,7 +43,7 @@ public class ItemDictionary extends Item { public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); if (stack.getItemDamage() > 0) { - tooltip.add("Flora-in-a-box"); + tooltip.add(I18N.localise("extrabees.item.database.tooltip")); } } @@ -65,8 +66,8 @@ public class ItemDictionary extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return (stack.getItemDamage() == 0) ? - "Apiarist Database" : - "Master Apiarist Database"; + return (stack.getItemDamage() == 0) + ? I18N.localise("extrabees.item.database") + : I18N.localise("extrabees.item.masterDatabase"); } } diff --git a/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationCondition.java b/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationCondition.java index e4bfdf11..4c701c45 100644 --- a/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationCondition.java +++ b/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationCondition.java @@ -1,6 +1,5 @@ package binnie.extrabees.genetics.requirements; - import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; @@ -14,7 +13,7 @@ public class DummyMutationCondition implements IMutationCondition { } @Override - public float getChance(World world, int i, int i1, int i2, IAllele iAllele, IAllele iAllele1, IGenome iGenome, IGenome iGenome1) { + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { return 1.0F; } diff --git a/src/main/java/binnie/extrabees/genetics/requirements/RequirementPerson.java b/src/main/java/binnie/extrabees/genetics/requirements/RequirementPerson.java index 871a3f8c..68b4a9d0 100644 --- a/src/main/java/binnie/extrabees/genetics/requirements/RequirementPerson.java +++ b/src/main/java/binnie/extrabees/genetics/requirements/RequirementPerson.java @@ -1,5 +1,6 @@ package binnie.extrabees.genetics.requirements; +import binnie.core.util.I18N; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; @@ -13,7 +14,7 @@ public class RequirementPerson implements IMutationRequirement { @Override public String getDescription() { - return "Can only be bred by " + name; + return I18N.localise("extrabees.genetics.requirements.user", name); } @Override diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java index 24dfa8e9..5370d463 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java @@ -7,7 +7,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.extrabees.ExtraBees; -import binnie.extrabees.apiary.machine.AlvearyHatchery; +import binnie.extrabees.apiary.machine.hatchery.AlvearyHatchery; import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -33,7 +33,7 @@ public class WindowAlvearyHatchery extends Window { setTitle("Hatchery"); playerInventory = new ControlPlayerInventory(this); ControlSlotArray slot = new ControlSlotArray(this, 43, 30, 5, 1); - slot.create(AlvearyHatchery.slotLarvae); + slot.create(AlvearyHatchery.SLOT_LARVAE); } @Override diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java index 00facfff..5c5fed97 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java @@ -11,7 +11,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.extrabees.ExtraBees; -import binnie.extrabees.apiary.machine.AlvearyMutator; +import binnie.extrabees.apiary.machine.mutator.AlvearyMutator; import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -39,7 +39,7 @@ public class WindowAlvearyMutator extends Window { playerInventory = new ControlPlayerInventory(this); ControlSlot slot = new ControlSlot(this, 79.0f, 30.0f); slot.assign(0); - new ControlText(this, new IArea(0.0f, 52.0f, w(), 16.0f), "Possible Mutagens:", TextJustification.MiddleCenter).setColor(5592405); + new ControlText(this, new IArea(0.0f, 52.0f, w(), 16.0f), "Possible Mutagens:", TextJustification.MIDDLE_CENTER).setColor(5592405); int size = AlvearyMutator.getMutagens().size(); int w = size * 18; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java index 40cea5e4..09f2fbb7 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java @@ -9,7 +9,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.extrabees.ExtraBees; -import binnie.extrabees.apiary.machine.AlvearyStimulator; +import binnie.extrabees.apiary.machine.stimulator.AlvearyStimulator; import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -35,7 +35,7 @@ public class WindowAlvearyStimulator extends Window { setTitle("Stimulator"); new ControlEnergyBar(this, 75, 29, 60, 16, Position.LEFT); ControlSlot slot = new ControlSlot(this, 41.0f, 28.0f); - slot.assign(AlvearyStimulator.slotCircuit); + slot.assign(AlvearyStimulator.SLOT_CIRCUIT); playerInventory = new ControlPlayerInventory(this); } diff --git a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java index e72f6b2f..084966fd 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java @@ -1,7 +1,5 @@ package binnie.extrabees.gui.database; -import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -11,8 +9,6 @@ import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; import net.minecraft.world.biome.BiomeGenBase; import java.util.ArrayList; @@ -55,12 +51,5 @@ public class ControlBiomes extends Control implements ITooltip { public void setSpecies(IAlleleBeeSpecies species) { tolerated.clear(); - if (species == null) { - return; - } - - // TODO unused code? - IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(species.getUID())); - IBee bee = Binnie.Genetics.getBeeRoot().getBee(BinnieCore.proxy.getWorld(), genome); } } diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java index d15680a8..25016c85 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java @@ -15,31 +15,36 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; +import java.awt.Color; import java.util.ArrayList; import java.util.List; public class ControlClimateBar extends Control implements ITooltip { protected boolean isHumidity; protected List tolerated; - protected int[] tempColours; - protected int[] humidColours; + protected Color[] tempColours = new Color[]{ + new Color(0x00fffb), + new Color(0x78bbff), + new Color(0x4fff30), + new Color(0xffff00), + new Color(0xffa200), + new Color(0xff0000) + }; + protected Color[] humidColours = new Color[]{ + new Color(0xffe7a3), + new Color(0x1aff00), + new Color(0x307cff) + }; public ControlClimateBar(IWidget parent, int x, int y, int width, int height) { - super(parent, x, y, width, height); - isHumidity = false; - tolerated = new ArrayList<>(); - tempColours = new int[]{0x00fffb, 0x78bbff, 0x4fff30, 0xffff00, 0xffa200, 0xff0000}; - humidColours = new int[]{0xffe7a3, 0x1aff00, 0x307cff}; - addAttribute(WidgetAttribute.MOUSE_OVER); + this(parent, x, y, width, height, false); } public ControlClimateBar(IWidget parent, int x, int y, int width, int height, boolean humidity) { super(parent, x, y, width, height); tolerated = new ArrayList<>(); - tempColours = new int[]{0x00fffb, 0x78bbff, 0x4fff30, 0xffff00, 0xffa200, 0xff0000}; - humidColours = new int[]{0xffe7a3, 0x1aff00, 0x307cff}; addAttribute(WidgetAttribute.MOUSE_OVER); - isHumidity = true; + isHumidity = humidity; } @Override @@ -69,13 +74,13 @@ public class ControlClimateBar extends Control implements ITooltip { for (int i = 0; i < types; ++i) { int x = i * w; if (tolerated.contains(i)) { - int colour; + Color color; if (isHumidity) { - colour = humidColours[i]; + color = humidColours[i]; } else { - colour = tempColours[i]; + color = tempColours[i]; } - CraftGUI.Render.solid(new IArea(x + 1, 1.0f, w, getSize().y() - 2.0f), colour); + CraftGUI.Render.solid(new IArea(x + 1, 1.0f, w, getSize().y() - 2.0f), color.getRGB()); } } CraftGUI.Render.texture(CraftGUITexture.EnergyBarGlass, getArea()); diff --git a/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java b/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java index f241c11c..fd9caa59 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java @@ -7,6 +7,7 @@ import binnie.core.craftgui.controls.listbox.ControlOption; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.util.I18N; import java.text.DecimalFormat; @@ -31,11 +32,11 @@ public class ControlProductsItem extends ControlOption 1.0f) { - textWidget.setValue("Every " + df.format(hours) + " hours"); + textWidget.setValue(I18N.localise("extrabees.gui.database.tab.species.products.everyHours", df.format(hours))); } else if (minutes > 1.0f) { - textWidget.setValue("Every " + df.format(minutes) + " min."); + textWidget.setValue(I18N.localise("extrabees.gui.database.tab.species.products.everyMins", df.format(minutes))); } else { - textWidget.setValue("Every " + df.format(seconds) + " sec."); + textWidget.setValue(I18N.localise("extrabees.gui.database.tab.species.products.everySecs", df.format(seconds))); } } } diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java b/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java index b1de370b..b8865fc6 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java +++ b/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java @@ -1,7 +1,6 @@ package binnie.extrabees.gui.database; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; @@ -9,7 +8,6 @@ import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageSpecies; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.TextJustification; -import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; @@ -30,28 +28,28 @@ public class PageSpeciesGenome extends PageSpecies { public PageSpeciesGenome(IWidget parent, DatabaseTab tab) { super(parent, tab); title = new ControlTextCentered(this, 8.0f, "Genome"); - new ControlText(this, new IArea(0.0f, 32.0f, 68.0f, 30.0f), "Speed:", TextJustification.TopRight); - new ControlText(this, new IArea(0.0f, 44.0f, 68.0f, 30.0f), "Lifespan:", TextJustification.TopRight); - new ControlText(this, new IArea(0.0f, 56.0f, 68.0f, 30.0f), "Fertility:", TextJustification.TopRight); - new ControlText(this, new IArea(0.0f, 68.0f, 68.0f, 30.0f), "Flowering:", TextJustification.TopRight); - new ControlText(this, new IArea(0.0f, 80.0f, 68.0f, 30.0f), "Territory:", TextJustification.TopRight); - new ControlText(this, new IArea(0.0f, 97.0f, 68.0f, 30.0f), "Behavior:", TextJustification.TopRight); - new ControlText(this, new IArea(0.0f, 109.0f, 68.0f, 30.0f), "Sunlight:", TextJustification.TopRight); - new ControlText(this, new IArea(0.0f, 121.0f, 68.0f, 30.0f), "Rain:", TextJustification.TopRight); - new ControlText(this, new IArea(0.0f, 138.0f, 68.0f, 30.0f), "Flower:", TextJustification.TopRight); - new ControlText(this, new IArea(0.0f, 155.0f, 68.0f, 30.0f), "Effect:", TextJustification.TopRight); + new ControlText(this, new IArea(0.0f, 32.0f, 68.0f, 30.0f), "Speed:", TextJustification.TOP_RIGHT); + new ControlText(this, new IArea(0.0f, 44.0f, 68.0f, 30.0f), "Lifespan:", TextJustification.TOP_RIGHT); + new ControlText(this, new IArea(0.0f, 56.0f, 68.0f, 30.0f), "Fertility:", TextJustification.TOP_RIGHT); + new ControlText(this, new IArea(0.0f, 68.0f, 68.0f, 30.0f), "Flowering:", TextJustification.TOP_RIGHT); + new ControlText(this, new IArea(0.0f, 80.0f, 68.0f, 30.0f), "Territory:", TextJustification.TOP_RIGHT); + new ControlText(this, new IArea(0.0f, 97.0f, 68.0f, 30.0f), "Behavior:", TextJustification.TOP_RIGHT); + new ControlText(this, new IArea(0.0f, 109.0f, 68.0f, 30.0f), "Sunlight:", TextJustification.TOP_RIGHT); + new ControlText(this, new IArea(0.0f, 121.0f, 68.0f, 30.0f), "Rain:", TextJustification.TOP_RIGHT); + new ControlText(this, new IArea(0.0f, 138.0f, 68.0f, 30.0f), "Flower:", TextJustification.TOP_RIGHT); + new ControlText(this, new IArea(0.0f, 155.0f, 68.0f, 30.0f), "Effect:", TextJustification.TOP_RIGHT); int x = 72; - speedText = new ControlText(this, new IArea(x, 32.0f, 72.0f, 30.0f), "", TextJustification.TopLeft); - lifespanText = new ControlText(this, new IArea(x, 44.0f, 72.0f, 30.0f), "", TextJustification.TopLeft); - fertilityText = new ControlText(this, new IArea(x, 56.0f, 72.0f, 30.0f), "", TextJustification.TopLeft); - floweringText = new ControlText(this, new IArea(x, 68.0f, 72.0f, 30.0f), "", TextJustification.TopLeft); - territoryText = new ControlText(this, new IArea(x, 80.0f, 72.0f, 30.0f), "", TextJustification.TopLeft); - nocturnalText = new ControlText(this, new IArea(x, 97.0f, 72.0f, 30.0f), "", TextJustification.TopLeft); - caveDwellingText = new ControlText(this, new IArea(x, 109.0f, 72.0f, 30.0f), "", TextJustification.TopLeft); - tolerantFlyerText = new ControlText(this, new IArea(x, 121.0f, 72.0f, 30.0f), "", TextJustification.TopLeft); - flowerText = new ControlText(this, new IArea(x, 138.0f, 72.0f, 30.0f), "", TextJustification.TopLeft); - effectText = new ControlText(this, new IArea(x, 155.0f, 72.0f, 30.0f), "", TextJustification.TopLeft); + speedText = new ControlText(this, new IArea(x, 32.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT); + lifespanText = new ControlText(this, new IArea(x, 44.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT); + fertilityText = new ControlText(this, new IArea(x, 56.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT); + floweringText = new ControlText(this, new IArea(x, 68.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT); + territoryText = new ControlText(this, new IArea(x, 80.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT); + nocturnalText = new ControlText(this, new IArea(x, 97.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT); + caveDwellingText = new ControlText(this, new IArea(x, 109.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT); + tolerantFlyerText = new ControlText(this, new IArea(x, 121.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT); + flowerText = new ControlText(this, new IArea(x, 138.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT); + effectText = new ControlText(this, new IArea(x, 155.0f, 72.0f, 30.0f), "", TextJustification.TOP_LEFT); } public static String rateFlowering(int flowering) { @@ -144,7 +142,6 @@ public class PageSpeciesGenome extends PageSpecies { } IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template); - IBee bee = Binnie.Genetics.getBeeRoot().getBee(BinnieCore.proxy.getWorld(), genome); speedText.setValue(rateSpeed(genome.getSpeed())); lifespanText.setValue(rateLifespan(genome.getLifespan())); fertilityText.setValue(genome.getFertility() + " children"); diff --git a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java index 27d8bf77..622545f8 100644 --- a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java +++ b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java @@ -3,6 +3,7 @@ package binnie.extrabees.liquids; import binnie.Binnie; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.ILiquidType; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -39,7 +40,7 @@ public enum ExtraBeeLiquid implements ILiquidType { @Override public String getName() { - return ExtraBees.proxy.localise(toString().toLowerCase()); + return I18N.localise("extrabees." + toString().toLowerCase()); } @Override diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java index fbc79885..e5e3edfb 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java @@ -1,6 +1,7 @@ package binnie.extrabees.products; import binnie.core.item.IItemEnum; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import forestry.api.recipes.RecipeManagers; import net.minecraft.item.ItemStack; @@ -136,7 +137,7 @@ public enum EnumHoneyComb implements IItemEnum { @Override public String getName(ItemStack stack) { - return ExtraBees.proxy.localise("item.comb." + name); + return I18N.localise("extrabees.item.comb." + name); } public boolean addProduct(ItemStack item, Float chance) { diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java index cbe93336..a49728a5 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java @@ -2,6 +2,7 @@ package binnie.extrabees.products; import binnie.Binnie; import binnie.core.item.IItemEnum; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import forestry.api.recipes.RecipeManagers; import net.minecraft.item.ItemStack; @@ -85,6 +86,6 @@ public enum EnumHoneyDrop implements IItemEnum { @Override public String getName(ItemStack itemStack) { - return ExtraBees.proxy.localise("item.honeydrop." + name().toLowerCase()); + return I18N.localise("extrabees.item.honeydrop." + name().toLowerCase()); } } diff --git a/src/main/java/binnie/extrabees/products/EnumPropolis.java b/src/main/java/binnie/extrabees/products/EnumPropolis.java index fcf6f785..ce716dc5 100644 --- a/src/main/java/binnie/extrabees/products/EnumPropolis.java +++ b/src/main/java/binnie/extrabees/products/EnumPropolis.java @@ -2,6 +2,7 @@ package binnie.extrabees.products; import binnie.Binnie; import binnie.core.item.IItemEnum; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import forestry.api.recipes.RecipeManagers; import net.minecraft.item.ItemStack; @@ -58,6 +59,6 @@ public enum EnumPropolis implements IItemEnum { @Override public String getName(ItemStack itemStack) { - return ExtraBees.proxy.localise("item.propolis." + name().toLowerCase()); + return I18N.localise("extrabees.item.propolis." + name().toLowerCase()); } } diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java b/src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java index e7b15efe..4f8e7697 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java @@ -1,5 +1,6 @@ package binnie.extrabees.products; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -41,6 +42,6 @@ public class ItemHoneyCrystal extends Item { @Override public String getItemStackDisplayName(ItemStack i) { - return ExtraBees.proxy.localise("item.honeycrystal"); + return I18N.localise("extrabees.item.honeycrystal"); } } diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java b/src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java index bf3bfd75..8570e7f8 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java @@ -1,5 +1,6 @@ package binnie.extrabees.products; +import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -21,6 +22,6 @@ public class ItemHoneyCrystalEmpty extends ItemHoneyCrystal { @Override public String getItemStackDisplayName(ItemStack i) { - return ExtraBees.proxy.localise("item.honeycrystal.empty"); + return I18N.localise("extrabees.item.honeycrystal.empty"); } } diff --git a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java index 77118bf4..ac09d71d 100644 --- a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java +++ b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java @@ -1,7 +1,6 @@ package binnie.extrabees.worldgen; import binnie.core.util.I18N; -import binnie.extrabees.ExtraBees; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -32,6 +31,6 @@ public class ItemBeehive extends ItemBlock { @Override public String getItemStackDisplayName(ItemStack itemStack) { - return I18N.localise(ExtraBees.instance, "block.hive." + itemStack.getItemDamage()); + return I18N.localise("extrabees.block.hive." + itemStack.getItemDamage()); } } diff --git a/src/main/java/binnie/extratrees/alcohol/Alcohol.java b/src/main/java/binnie/extratrees/alcohol/Alcohol.java index 7b6f5f5c..02df56b6 100644 --- a/src/main/java/binnie/extratrees/alcohol/Alcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/Alcohol.java @@ -3,6 +3,7 @@ package binnie.extratrees.alcohol; import binnie.Binnie; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.IFluidType; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; @@ -106,7 +107,7 @@ public enum Alcohol implements IFluidType, ICocktailLiquid { @Override public String getName() { - return ExtraTrees.proxy.localise("fluid.alcohol." + name().toLowerCase()); + return I18N.localise("extrabees.fluid.alcohol." + name().toLowerCase()); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/Glassware.java b/src/main/java/binnie/extratrees/alcohol/Glassware.java index 10b9f2d5..2c4baf5b 100644 --- a/src/main/java/binnie/extratrees/alcohol/Glassware.java +++ b/src/main/java/binnie/extratrees/alcohol/Glassware.java @@ -39,9 +39,9 @@ public enum Glassware { public String getName(String liquid) { if (liquid == null) { - return ExtraTrees.proxy.localise("item.glassware." + name().toLowerCase()); + return I18N.localise("extratrees.item.glassware." + name().toLowerCase()); } - return I18N.localise(ExtraTrees.instance, "item.glassware." + name().toLowerCase() + ".usage", liquid); + return I18N.localise("extratrees.item.glassware." + name().toLowerCase() + ".usage", liquid); } public int getCapacity() { diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 0879606c..45da3670 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -40,7 +40,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { if (type >= 0 && type < DoorType.values().length) { return DoorType.values()[type]; } - return DoorType.Standard; + return DoorType.STANDARD; } private IIcon getFlippedIcon(boolean upper, boolean flip, int tileMeta) { @@ -53,7 +53,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { @Override public IIcon getIcon(int side, int meta) { - return DoorType.Standard.iconDoorLower; + return DoorType.STANDARD.iconDoorLower; } @Override @@ -89,7 +89,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { } return getFlippedIcon(flag3, flag2, tileMeta); } - return DoorType.Standard.iconDoorLower; + return DoorType.STANDARD.iconDoorLower; } @Override @@ -193,9 +193,9 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { String typeName = getDoorType(meta).getName(); String woodName = WoodManager.getPlankType(meta & 0xFF).getName(); if (typeName.equals("")) { - return I18N.localise(ExtraTrees.instance, "block.door.name", woodName); + return I18N.localise("extratrees.block.door.name", woodName); } - return I18N.localise(ExtraTrees.instance, "block.door.name.adv", woodName, typeName); + return I18N.localise("extratrees.block.door.name.adv", woodName, typeName); } @Override @@ -211,18 +211,18 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { @Override public void getSubBlocks(Item item, CreativeTabs tab, List itemList) { for (IPlankType type : PlankType.ExtraTreePlanks.values()) { - itemList.add(WoodManager.getDoor(type, DoorType.Standard)); + itemList.add(WoodManager.getDoor(type, DoorType.STANDARD)); } for (IPlankType type : PlankType.ForestryPlanks.values()) { - itemList.add(WoodManager.getDoor(type, DoorType.Standard)); + itemList.add(WoodManager.getDoor(type, DoorType.STANDARD)); } for (IPlankType type : PlankType.ExtraBiomesPlank.values()) { if (type.getStack() != null) { - itemList.add(WoodManager.getDoor(type, DoorType.Standard)); + itemList.add(WoodManager.getDoor(type, DoorType.STANDARD)); } } for (IPlankType type : PlankType.VanillaPlanks.values()) { - itemList.add(WoodManager.getDoor(type, DoorType.Standard)); + itemList.add(WoodManager.getDoor(type, DoorType.STANDARD)); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETLog.java b/src/main/java/binnie/extratrees/block/BlockETLog.java index 30be8f94..d8ea8167 100644 --- a/src/main/java/binnie/extratrees/block/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/BlockETLog.java @@ -4,7 +4,6 @@ import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; @@ -129,11 +128,12 @@ public class BlockETLog extends BlockLog implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return I18N.localise(ExtraTrees.instance, "block.log.name", ILogType.ExtraTreeLog.values()[meta].getName()); + return I18N.localise("extratrees.block.log.name", ILogType.ExtraTreeLog.values()[meta].getName()); } @Override public void addBlockTooltip(ItemStack itemStack, List tooltip) { + // ignored } @Override @@ -195,7 +195,7 @@ public class BlockETLog extends BlockLog implements IBlockMetadata { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { return BlockMetadata.getPickBlock(world, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETPlanks.java b/src/main/java/binnie/extratrees/block/BlockETPlanks.java index b04e22df..a9a91df4 100644 --- a/src/main/java/binnie/extratrees/block/BlockETPlanks.java +++ b/src/main/java/binnie/extratrees/block/BlockETPlanks.java @@ -4,7 +4,6 @@ import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; @@ -74,7 +73,7 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return I18N.localise(ExtraTrees.instance, "block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName()); + return I18N.localise("extratrees.block.plank.name", PlankType.ExtraTreePlanks.values()[meta].getName()); } @Override @@ -144,7 +143,7 @@ public class BlockETPlanks extends BlockWood implements IBlockMetadata { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { return BlockMetadata.getPickBlock(world, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETSlab.java b/src/main/java/binnie/extratrees/block/BlockETSlab.java index febcf0f2..ac301ccd 100644 --- a/src/main/java/binnie/extratrees/block/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/BlockETSlab.java @@ -28,7 +28,10 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { public BlockETSlab(boolean isDouble) { super(isDouble); setCreativeTab(Tabs.tabArboriculture); - setHardness(2.0f).setResistance(5.0f).setStepSound(Block.soundTypeWood); + setHardness(2.0f); + setResistance(5.0f); + setStepSound(Block.soundTypeWood); + if (!field_150004_a) { useNeighborBrightness = true; } @@ -39,7 +42,7 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { @Override public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) { - ArrayList drops = new ArrayList(); + ArrayList drops = new ArrayList<>(); drops.addAll(BlockMetadata.getBlockDropped((IBlockMetadata) ExtraTrees.blockSlab, world, x, y, z, blockMeta)); if (field_150004_a) { drops.addAll(BlockMetadata.getBlockDropped((IBlockMetadata) ExtraTrees.blockSlab, world, x, y, z, blockMeta)); @@ -48,7 +51,7 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @@ -82,11 +85,12 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return I18N.localise(ExtraTrees.instance, "block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName()); + return I18N.localise("extratrees.block.woodslab.name", PlankType.ExtraTreePlanks.values()[meta].getName()); } @Override public void addBlockTooltip(ItemStack itemStack, List tooltip) { + // ignored } @Override @@ -151,7 +155,7 @@ public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { return BlockMetadata.getPickBlock(world, x, y, z); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETStairs.java b/src/main/java/binnie/extratrees/block/BlockETStairs.java index ef5946ee..33e272cd 100644 --- a/src/main/java/binnie/extratrees/block/BlockETStairs.java +++ b/src/main/java/binnie/extratrees/block/BlockETStairs.java @@ -72,7 +72,7 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { return BlockMetadata.breakBlock(this, player, world, x, y, z); } @@ -106,11 +106,12 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return I18N.localise(ExtraTrees.instance, "block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName()); + return I18N.localise("extratrees.block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName()); } @Override public void addBlockTooltip(ItemStack itemStack, List tooltip) { + // ignored } @Override diff --git a/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java b/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java index 657d5c5e..4ebd3546 100644 --- a/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java +++ b/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java @@ -9,6 +9,7 @@ import net.minecraft.world.IBlockAccess; public class BranchBlockRenderer implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + // ignored } @Override diff --git a/src/main/java/binnie/extratrees/block/DoorType.java b/src/main/java/binnie/extratrees/block/DoorType.java index 7ac64226..b76fcdce 100644 --- a/src/main/java/binnie/extratrees/block/DoorType.java +++ b/src/main/java/binnie/extratrees/block/DoorType.java @@ -1,13 +1,13 @@ package binnie.extratrees.block; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; import net.minecraft.util.IIcon; public enum DoorType { - Standard("standard"), - Solid("solid"), - Double("double"), - Full("full"); + STANDARD("standard"), + SOLID("solid"), + DOUBLE("double"), + FULL("full"); protected String id; protected IIcon iconDoorLower; @@ -16,11 +16,11 @@ public enum DoorType { protected IIcon iconDoorUpperFlip; protected IIcon iconItem; - DoorType(String iconName) { - id = iconName; + DoorType(String id) { + this.id = id; } public String getName() { - return ExtraTrees.proxy.localise("block.door.type." + id); + return I18N.localise("extratrees.block.door.type." + id); } } diff --git a/src/main/java/binnie/extratrees/block/ILogType.java b/src/main/java/binnie/extratrees/block/ILogType.java index e3db8388..8a0ba726 100644 --- a/src/main/java/binnie/extratrees/block/ILogType.java +++ b/src/main/java/binnie/extratrees/block/ILogType.java @@ -92,7 +92,7 @@ public interface ILogType { } public String getName() { - return I18N.localise(ExtraTrees.instance, "block.planks." + name.toLowerCase(Locale.ENGLISH)); + return I18N.localise("extratrees.block.planks." + name.toLowerCase(Locale.ENGLISH)); } public void addRecipe() { diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index c49164ef..181693dd 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -110,10 +110,10 @@ public class ModuleBlocks implements IInitializable { ItemStack planks2 = plank2.getStack(); ItemStack fenceNormal = WoodManager.getFence(plank2, new FenceType(0), 1); ItemStack gate = WoodManager.getGate(plank2); - ItemStack doorStandard = WoodManager.getDoor(plank2, DoorType.Standard); - ItemStack doorSolid = WoodManager.getDoor(plank2, DoorType.Solid); - ItemStack doorSplit = WoodManager.getDoor(plank2, DoorType.Double); - ItemStack doorFull = WoodManager.getDoor(plank2, DoorType.Full); + ItemStack doorStandard = WoodManager.getDoor(plank2, DoorType.STANDARD); + ItemStack doorSolid = WoodManager.getDoor(plank2, DoorType.SOLID); + ItemStack doorSplit = WoodManager.getDoor(plank2, DoorType.DOUBLE); + ItemStack doorFull = WoodManager.getDoor(plank2, DoorType.FULL); if (planks2 != null) { if (gate == null) { continue; diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 1a8c4ecc..a6836712 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -2,6 +2,7 @@ package binnie.extratrees.block; import binnie.core.Mods; import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; import com.google.common.base.Optional; @@ -75,12 +76,12 @@ public class PlankType { @Override public String getName() { - return ExtraTrees.proxy.localise("block.planks." + toString().toLowerCase()); + return I18N.localise("extratrees.block.planks." + toString().toLowerCase()); } @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks." + toString().toLowerCase() + ".desc"); + return I18N.localise("extratrees.block.planks." + toString().toLowerCase() + ".desc"); } @Override @@ -124,12 +125,12 @@ public class PlankType { @Override public String getName() { - return ExtraTrees.proxy.localise("block.planks.vanilla." + toString().toLowerCase()); + return I18N.localise("extratrees.block.planks.vanilla." + toString().toLowerCase()); } @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks.vanilla." + toString().toLowerCase() + ".desc"); + return I18N.localise("extratrees.block.planks.vanilla." + toString().toLowerCase() + ".desc"); } @Override @@ -189,12 +190,12 @@ public class PlankType { @Override public String getName() { - return ExtraTrees.proxy.localise("block.planks.forestry." + toString().toLowerCase()); + return I18N.localise("extratrees.block.planks.forestry." + toString().toLowerCase()); } @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks.forestry." + toString().toLowerCase() + ".desc"); + return I18N.localise("extratrees.block.planks.forestry." + toString().toLowerCase() + ".desc"); } @Override @@ -239,12 +240,12 @@ public class PlankType { @Override public String getName() { - return ExtraTrees.proxy.localise("block.planks.ebxl." + toString().toLowerCase()); + return I18N.localise("extratrees.block.planks.ebxl." + toString().toLowerCase()); } @Override public String getDescription() { - return ExtraTrees.proxy.localise("block.planks.ebxl." + toString().toLowerCase() + ".desc"); + return I18N.localise("extratrees.block.planks.ebxl." + toString().toLowerCase() + ".desc"); } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index e957e8cd..8662117d 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -121,7 +121,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return I18N.localise(ExtraTrees.instance, "block.woodfence.name", getDescription(meta).getPlankType().getName()); + return I18N.localise("extratrees.block.woodfence.name", getDescription(meta).getPlankType().getName()); } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockGate.java b/src/main/java/binnie/extratrees/block/decor/BlockGate.java index 7fc1a57f..5f46e148 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockGate.java @@ -4,7 +4,6 @@ import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import cpw.mods.fml.relauncher.Side; @@ -104,7 +103,7 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return I18N.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName()); + return I18N.localise("extratrees.block.woodgate.name", WoodManager.getPlankType(meta).getName()); } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 4154bf6d..4e3287d3 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -3,7 +3,6 @@ package binnie.extratrees.block.decor; import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.PlankType; import binnie.extratrees.block.WoodManager; @@ -40,6 +39,6 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata { IPlankType type2 = getDescription(meta).getSecondaryPlankType(); boolean twoTypes = type1 != type2; FenceType type3 = getDescription(meta).getFenceType(); - return I18N.localise(ExtraTrees.instance, "block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName()); + return I18N.localise("extratrees.block.woodslab.name" + (twoTypes ? "2" : ""), type3.getPrefix(), type1.getName(), type2.getName()); } } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java index c1b44ee9..69fa6c24 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java @@ -1,7 +1,6 @@ package binnie.extratrees.carpentry; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesign; import binnie.extratrees.block.PlankType; import forestry.api.core.Tabs; @@ -26,7 +25,7 @@ public class BlockCarpentry extends BlockDesign { @Override public String getBlockName(DesignBlock design) { - return I18N.localise(ExtraTrees.instance, "block.woodentile.name", design.getDesign().getName()); + return I18N.localise("extratrees.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 a86fefcc..e948dfc1 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -3,7 +3,6 @@ package binnie.extratrees.carpentry; import binnie.core.block.BlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -85,7 +84,7 @@ public class BlockCarpentryPanel extends BlockCarpentry { @Override public String getBlockName(ItemStack stack) { DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); - return I18N.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName()); + return I18N.localise("extratrees.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 933f9829..77d2c233 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -6,7 +6,6 @@ import binnie.core.block.IMultipassBlock; import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignSystem; @@ -135,7 +134,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo public void addBlockTooltip(ItemStack stack, List tooltip) { DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { - tooltip.add(I18N.localise(ExtraTrees.instance, "block.tooltip.twoColors", block.getPrimaryMaterial().getName(), block.getSecondaryMaterial().getName())); + tooltip.add(I18N.localise("extratrees.block.tooltip.twoColors", block.getPrimaryMaterial().getName(), block.getSecondaryMaterial().getName())); } else { tooltip.add(block.getPrimaryMaterial().getName()); } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index b7531e15..8e1fc335 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -2,7 +2,6 @@ package binnie.extratrees.carpentry; import binnie.botany.Botany; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesign; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -59,6 +58,6 @@ public class BlockStainedDesign extends BlockDesign { @Override public String getBlockName(DesignBlock design) { - return I18N.localise(ExtraTrees.instance, "block.stainedglass.name", design.getDesign().getName()); + return I18N.localise("extratrees.block.stainedglass.name", design.getDesign().getName()); } } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java index 65d0c6b3..1bbf1d5d 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java @@ -1,7 +1,6 @@ package binnie.extratrees.carpentry; import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.IDesignSystem; @@ -137,7 +136,7 @@ public class DesignBlock { Label_1107: { switch (getFacing()) { - case UP: { + case UP: if (dir == ForgeDirection.DOWN || dir == ForgeDirection.UP) { for (int j = 0; j < rotation; ++j) { layout = layout.rotateRight(); @@ -145,8 +144,8 @@ public class DesignBlock { break; } break; - } - case DOWN: { + + case DOWN: switch (dir) { case UP: case DOWN: { @@ -168,8 +167,8 @@ public class DesignBlock { break; } break; - } - case EAST: { + + case EAST: switch (dir) { case SOUTH: case UP: { @@ -201,108 +200,102 @@ public class DesignBlock { break; } break; - } - case WEST: { + + case WEST: switch (dir) { - case NORTH: { + case NORTH: layout = layout.rotateRight(); break; - } + case SOUTH: - case UP: { + case UP: layout = layout.rotateLeft(); break; - } - case DOWN: { + + case DOWN: layout = layout.rotateLeft().flipVertical(); break; - } - case EAST: { + + case EAST: layout = layout.flipHorizontal(); for (int j = 0; j < rotation; ++j) { layout = layout.rotateLeft(); } break; - } - case WEST: { + + case WEST: for (int j = 0; j < rotation; ++j) { layout = layout.rotateRight(); } break; - } } break; - } - case NORTH: { + + case NORTH: switch (dir) { - case WEST: { + case WEST: layout = layout.rotateLeft(); break Label_1107; - } - case EAST: { + + case EAST: layout = layout.rotateRight(); break Label_1107; - } - case DOWN: { + + case DOWN: layout = layout.flipHorizontal(); break Label_1107; - } - case SOUTH: { + + case SOUTH: layout = layout.flipHorizontal(); for (int j = 0; j < rotation; ++j) { layout = layout.rotateLeft(); } break Label_1107; - } - case NORTH: { + + case NORTH: for (int j = 0; j < rotation; ++j) { layout = layout.rotateRight(); } break Label_1107; - } - default: { + + default: break Label_1107; - } } - } - case SOUTH: { + case SOUTH: switch (dir) { - case EAST: { + case EAST: layout = layout.rotateLeft(); break Label_1107; - } - case WEST: { + + case WEST: layout = layout.rotateRight(); break Label_1107; - } - case UP: { + + case UP: layout = layout.rotateRight().rotateRight(); break Label_1107; - } - case DOWN: { + + case DOWN: layout = layout.flipVertical(); break Label_1107; - } - case NORTH: { + + case NORTH: layout = layout.flipHorizontal(); for (int j = 0; j < rotation; ++j) { layout = layout.rotateLeft(); } break Label_1107; - } - case SOUTH: { + + case SOUTH: for (int j = 0; j < rotation; ++j) { layout = layout.rotateRight(); } break Label_1107; - } - default: { - break Label_1107; - } - } - } + default: + break Label_1107; + } } } return layout; @@ -319,7 +312,9 @@ public class DesignBlock { } public IIcon getIcon(IDesignSystem system, boolean secondary, ForgeDirection dir) { - return secondary ? getSecondaryIcon(system, dir) : getPrimaryIcon(system, dir); + return secondary + ? getSecondaryIcon(system, dir) + : getPrimaryIcon(system, dir); } public ForgeDirection getFacing() { @@ -364,8 +359,7 @@ public class DesignBlock { if (rotation > 3) { rotation = 0; - } - if (rotation < 0) { + } else if (rotation < 0) { rotation = 3; } } @@ -385,7 +379,7 @@ public class DesignBlock { public String getString() { String type; if (getPrimaryMaterial() != getSecondaryMaterial()) { - type = I18N.localise(ExtraTrees.instance, "block.tooltip.twoMaterials", getPrimaryMaterial().getName(), getSecondaryMaterial().getName()); + type = I18N.localise("extratrees.block.tooltip.twoMaterials", getPrimaryMaterial().getName(), getSecondaryMaterial().getName()); } else { type = getPrimaryMaterial().getName(); } diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java index 31420027..f47b2d18 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java @@ -1,6 +1,5 @@ package binnie.extratrees.carpentry; -import binnie.botany.Botany; import binnie.core.util.I18N; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.ILayout; @@ -412,7 +411,7 @@ public enum EnumDesign implements IDesign { @Override public String getName() { - return I18N.localise(Botany.instance, "design." + name); + return I18N.localise("botany.design." + name); } public void setName(String name) { diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java b/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java index 77911f75..b4e9a98f 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java @@ -1,6 +1,5 @@ package binnie.extratrees.carpentry; -import binnie.botany.Botany; import binnie.core.util.I18N; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; @@ -28,7 +27,7 @@ public enum EnumDesignCategory implements IDesignCategory { @Override public String getName() { - return I18N.localise(Botany.instance, "design.category." + name); + return I18N.localise("botany.design.category." + name); } @Override diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java index b9dcbcab..d2df303e 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/ControlTileSelect.java @@ -1,6 +1,5 @@ package binnie.extratrees.craftgui.dictionary; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -134,7 +133,8 @@ public class ControlTileSelect extends Control implements IControlValue if (tile == null) { return; } - Designer.ComponentWoodworkerRecipe recipe = tile.getMachine().getComponent(Designer.ComponentWoodworkerRecipe.class); + + tile.getMachine().getComponent(Designer.ComponentWoodworkerRecipe.class); NBTTagCompound nbt = new NBTTagCompound(); nbt.setShort("d", (short) CarpentryManager.carpentryInterface.getDesignIndex(getValue())); Window.get(getWidget()).sendClientAction("design", nbt); @@ -144,7 +144,7 @@ public class ControlTileSelect extends Control implements IControlValue @Override public void getTooltip(Tooltip tooltip) { - tooltip.add(I18N.localise(BinnieCore.instance, "gui.designer.pattern", getValue().getName())); + tooltip.add(I18N.localise("binniecore.gui.designer.pattern", getValue().getName())); } @Override diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PageFruit.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PageFruit.java index 2045b016..e5143443 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PageFruit.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PageFruit.java @@ -10,7 +10,7 @@ import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.item.ItemStack; @@ -28,7 +28,7 @@ public class PageFruit extends PageAbstract { public void onValueChanged(ItemStack species) { deleteAllChildren(); WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), ExtraTrees.proxy.localise("gui.database.tab.fruit." + (treesThatBearFruit ? "natural" : "potential")), TextJustification.MiddleCenter); + new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), I18N.localise("extratrees.gui.database.tab.fruit." + (treesThatBearFruit ? "natural" : "potential")), TextJustification.MIDDLE_CENTER); Collection trees = treesThatBearFruit ? ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()) : ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatCanBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()); new ControlSpeciesBox(this, 4.0f, 24.0f, size().x() - 8.0f, size().y() - 4.0f - 24.0f).setOptions(trees); } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java index f334adcc..76887dd4 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksOverview.java @@ -1,18 +1,15 @@ package binnie.extratrees.craftgui.dictionary; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageAbstract; -import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; import binnie.extratrees.block.DoorType; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; @@ -28,15 +25,14 @@ public class PagePlanksOverview extends PageAbstract { @Override public void onValueChanged(ItemStack species) { deleteAllChildren(); - WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), species.getDisplayName(), TextJustification.MiddleCenter); - new ControlText(this, new IArea(12.0f, 24.0f, size().x() - 24.0f, 24.0f), ExtraTrees.proxy.localise("gui.database.planks.use"), TextJustification.MiddleLeft); + new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), species.getDisplayName(), TextJustification.MIDDLE_CENTER); + new ControlText(this, new IArea(12.0f, 24.0f, size().x() - 24.0f, 24.0f), I18N.localise("extratrees.gui.database.planks.use"), TextJustification.MIDDLE_LEFT); IPlankType type = WoodManager.get(species); int x = 12; if (type != null) { ItemStack fence = WoodManager.getFence(type, new FenceType(0), 1); ItemStack gate = WoodManager.getGate(type); - ItemStack door = WoodManager.getDoor(type, DoorType.Standard); + ItemStack door = WoodManager.getDoor(type, DoorType.STANDARD); if (fence != null) { new ControlItemDisplay(this, x, 48.0f).setItemStack(fence); x += 22; @@ -47,12 +43,11 @@ public class PagePlanksOverview extends PageAbstract { } if (door != null) { new ControlItemDisplay(this, x, 48.0f).setItemStack(door); - x += 22; } } - ControlText controlDescription = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.MiddleCenter); - ControlText controlSignature = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.BottomRight); + ControlText controlDescription = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.MIDDLE_CENTER); + ControlText controlSignature = new ControlText(this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.BOTTOM_RIGHT); String desc = ""; if (type != null) { desc = type.getDescription(); @@ -61,7 +56,7 @@ public class PagePlanksOverview extends PageAbstract { String descBody = EnumChatFormatting.ITALIC.toString(); String descSig = ""; if (desc == null || desc.length() == 0) { - descBody += BinnieCore.proxy.localise("gui.database.nodescription"); + descBody += I18N.localise("binniecore.gui.database.nodescription"); } else { String[] descStrings = desc.split("\\|"); descBody += descStrings[0]; diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksTrees.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksTrees.java index 60964826..e84de3cf 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksTrees.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PagePlanksTrees.java @@ -24,7 +24,7 @@ public class PagePlanksTrees extends PageAbstract { public void onValueChanged(ItemStack species) { deleteAllChildren(); WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), species.getDisplayName(), TextJustification.MiddleCenter); + new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), species.getDisplayName(), TextJustification.MIDDLE_CENTER); Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatMakePlanks(species, database.isNEI(), database.getWorld(), database.getUsername()); new ControlSpeciesBox(this, 4.0f, 24.0f, size().x() - 8.0f, size().y() - 4.0f - 24.0f).setOptions(trees); } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesTreeGenome.java index d157fc33..8a00ed6e 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PageSpeciesTreeGenome.java @@ -1,7 +1,6 @@ package binnie.extratrees.craftgui.dictionary; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.core.Control; @@ -13,7 +12,7 @@ import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; -import binnie.extratrees.ExtraTrees; +import binnie.core.util.I18N; import binnie.extratrees.FakeWorld; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpecies; @@ -37,9 +36,9 @@ public class PageSpeciesTreeGenome extends PageSpecies { public static String tolerated(boolean t) { if (t) { - return BinnieCore.proxy.localise("gui.tolerated"); + return I18N.localise("binniecore.gui.tolerated"); } - return BinnieCore.proxy.localise("gui.nottolerated"); + return I18N.localise("binniecore.gui.nottolerated"); } @Override @@ -49,6 +48,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { if (template == null) { return; } + ITree tree = Binnie.Genetics.getTreeRoot().templateAsIndividual(template); if (tree == null) { return; @@ -68,7 +68,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { IAlleleTreeSpecies treeSpecies = genome.getPrimary(); int w = 144; int h = 176; - new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), getValue().toString(), TextJustification.MiddleCenter); + new ControlText(this, new IArea(0.0f, 4.0f, w, 16.0f), getValue().toString(), TextJustification.MIDDLE_CENTER); ControlScrollableContent scrollable = new ControlScrollableContent(this, 4.0f, 20.0f, w - 8, h - 8 - 16, 12.0f); Control contents = new Control(scrollable, 0.0f, 0.0f, w - 8 - 12, h - 8 - 16); int tw = w - 8 - 12; @@ -78,11 +78,11 @@ public class PageSpeciesTreeGenome extends PageSpecies { int th = 14; int th2 = 18; 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); + new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.PLANT) + " : ", TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), BinnieCore.proxy.localise("gui.temperature.short") + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise("binniecore.gui.temperature.short") + " : ", TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFT); y += th; IIcon leaf = treeSpecies.getLeafIcon(false, false); IIcon fruit = null; @@ -96,7 +96,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { } if (leaf != null) { - new ControlText(contents, new IArea(0.0f, y, w2, th2), ExtraTrees.proxy.localise("gui.database.leaves") + " : ", TextJustification.MiddleRight); + new ControlText(contents, new IArea(0.0f, y, w2, th2), I18N.localise("extratrees.gui.database.leaves") + " : ", TextJustification.MIDDLE_RIGHT); new ControlBlockIconDisplay(contents, w2, y, leaf).setColor(treeSpecies.getLeafColour(false)); if (fruit != null && !treeSpecies.getUID().equals("forestry.treeOak")) { new ControlBlockIconDisplay(contents, w2, y, fruit).setColor(fruitColour); @@ -107,27 +107,27 @@ public class PageSpeciesTreeGenome extends PageSpecies { // ItemStack log = (genome.getFruitProvider().getProducts().length // > 0) ? genome.getFruitProvider().getProducts()[0] : null; if (log != null) { - new ControlText(contents, new IArea(0.0f, y, w2, th2), ExtraTrees.proxy.localise("gui.database.log") + " : ", TextJustification.MiddleRight); + new ControlText(contents, new IArea(0.0f, y, w2, th2), I18N.localise("extratrees.gui.database.log") + " : ", TextJustification.MIDDLE_RIGHT); ControlItemDisplay display = new ControlItemDisplay(contents, w2, y); display.setItemStack(log); display.setTooltip(); y += th2; } - new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.GROWTH) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getGrowthProvider().getDescription(), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.GROWTH) + " : ", TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(w2, y, w3, th), genome.getGrowthProvider().getDescription(), TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.HEIGHT) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getHeight() + "x", TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.HEIGHT) + " : ", TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(w2, y, w3, th), genome.getHeight() + "x", TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.FERTILITY) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.FERTILITY) + " : ", TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFT); y += th; List fruits = new ArrayList(); Collections.addAll(fruits, genome.getFruitProvider().getProducts()); if (!fruits.isEmpty()) { - new ControlText(contents, new IArea(0.0f, y, w2, th2), syst.getChromosomeShortName(EnumTreeChromosome.FRUITS) + " : ", TextJustification.MiddleRight); + new ControlText(contents, new IArea(0.0f, y, w2, th2), syst.getChromosomeShortName(EnumTreeChromosome.FRUITS) + " : ", TextJustification.MIDDLE_RIGHT); for (ItemStack fruitw : fruits) { ControlItemDisplay display2 = new ControlItemDisplay(contents, w2, y); display2.setItemStack(fruitw); @@ -136,17 +136,17 @@ public class PageSpeciesTreeGenome extends PageSpecies { } } - new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.YIELD) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getYield() + "x", TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.YIELD) + " : ", TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(w2, y, w3, th), genome.getYield() + "x", TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.SAPPINESS) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getSappiness() + "x", TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.SAPPINESS) + " : ", TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(w2, y, w3, th), genome.getSappiness() + "x", TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.MATURATION) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getMaturationTime() + "x", TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.MATURATION) + " : ", TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(w2, y, w3, th), genome.getMaturationTime() + "x", TextJustification.MIDDLE_LEFT); y += th; - new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.GIRTH) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getGirth() + "x" + genome.getGirth(), TextJustification.MiddleLeft); + new ControlText(contents, new IArea(0.0f, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.GIRTH) + " : ", TextJustification.MIDDLE_RIGHT); + new ControlText(contents, new IArea(w2, y, w3, th), genome.getGirth() + "x" + genome.getGirth(), TextJustification.MIDDLE_LEFT); y += th; contents.setSize(new IPoint(contents.size().x(), y)); scrollable.setScrollableContent(contents); diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/PageWood.java b/src/main/java/binnie/extratrees/craftgui/dictionary/PageWood.java index 8d125c05..bad9e528 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/PageWood.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/PageWood.java @@ -24,7 +24,7 @@ public class PageWood extends PageAbstract { public void onValueChanged(ItemStack species) { deleteAllChildren(); WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), getValue().toString(), TextJustification.MiddleCenter); + new ControlText(this, new IArea(0.0f, 0.0f, size().x(), 24.0f), getValue().toString(), TextJustification.MIDDLE_CENTER); Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatHaveWood(species, database.isNEI(), database.getWorld(), database.getUsername()); new ControlSpeciesBox(this, 4.0f, 24.0f, size().x() - 8.0f, size().y() - 4.0f - 24.0f).setOptions(trees); } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java index fbc107a4..c3a23424 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowArboristDatabase.java @@ -18,6 +18,7 @@ import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; @@ -103,7 +104,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { @Override public String getName() { - return ExtraTrees.proxy.localise("gui.database.mode." + name().toLowerCase()); + return I18N.localise("extratrees.gui.database.mode." + name().toLowerCase()); } } } diff --git a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowWoodworker.java b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowWoodworker.java index 3cc02020..48f6baf2 100644 --- a/src/main/java/binnie/extratrees/craftgui/dictionary/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/craftgui/dictionary/WindowWoodworker.java @@ -1,7 +1,6 @@ package binnie.extratrees.craftgui.dictionary; import binnie.core.AbstractMod; -import binnie.core.BinnieCore; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextEdit; import binnie.core.craftgui.controls.scroll.ControlScrollableContent; @@ -17,6 +16,7 @@ import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.window.Panel; import binnie.core.machines.Machine; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.Designer; import binnie.extratrees.machines.DesignerType; @@ -45,7 +45,7 @@ public class WindowWoodworker extends Window { @Override public void initialiseClient() { setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName()); - new ControlText(this, new IArea(190.0f, 36.0f, 114.0f, 10.0f), BinnieCore.proxy.localise("gui.design"), TextJustification.TopCenter).setColor(4473924); + new ControlText(this, new IArea(190.0f, 36.0f, 114.0f, 10.0f), I18N.localise("binniecore.gui.design"), TextJustification.TOP_CENTER).setColor(4473924); new Panel(this, 188.0f, 48.0f, 118.0f, 126.0f, MinecraftGUI.PanelType.Gray); textEdit = new ControlTextEdit(this, 188.0f, 178.0f, 118.0f, 12.0f); ControlScrollableContent scroll = new ControlScrollableContent(this, 190.0f, 50.0f, 114.0f, 122.0f, 12.0f); diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java index 9237fcc8..cf63d14c 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java @@ -1,6 +1,7 @@ package binnie.extratrees.genetics; import binnie.Binnie; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.FruitPod; import binnie.extratrees.config.ConfigurationMain; @@ -337,7 +338,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { @Override public String getDescription() { - return ExtraTrees.proxy.localise("item.food." + name().toLowerCase()); + return I18N.localise("extratrees.item.food." + name().toLowerCase()); } @Override diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java index a75d23ed..66da4961 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java @@ -2,6 +2,7 @@ package binnie.extratrees.genetics; import binnie.Binnie; import binnie.core.Mods; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.ILogType; import binnie.extratrees.worldgen.DefaultTreeGenerator; @@ -63,7 +64,7 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.EnumPlantType; -import java.awt.*; +import java.awt.Color; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; @@ -1091,12 +1092,12 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm @Override public String getName() { - return ExtraTrees.proxy.localise("species." + name().toLowerCase() + ".name"); + return I18N.localise("extratrees.species." + name().toLowerCase() + ".name"); } @Override public String getDescription() { - return ExtraTrees.proxy.localiseOrBlank("species." + name().toLowerCase() + ".desc"); + return I18N.localiseOrBlank("extratrees.species." + name().toLowerCase() + ".desc"); } @Override diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index 1017b422..9c4aa4e2 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -51,7 +51,7 @@ public enum ExtraTreeItems implements IItemMisc { @Override public String getName(ItemStack itemStack) { - return I18N.localise(ExtraTrees.instance, "item." + name); + return I18N.localise("extratrees.item." + name); } @Override diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index b7b18941..cb56c1b4 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -3,6 +3,7 @@ package binnie.extratrees.item; import binnie.Binnie; import binnie.core.Mods; import binnie.core.item.IItemMisc; +import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.alcohol.Juice; import forestry.api.recipes.RecipeManagers; @@ -148,7 +149,7 @@ public enum Food implements IItemMisc { @Override public String getName(ItemStack itemStack) { - return ExtraTrees.proxy.localise("item.food." + name().toLowerCase()); + return I18N.localise("extratrees.item.food." + name().toLowerCase()); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index 8a44d25d..b5def86d 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -32,8 +32,8 @@ public class ItemHammer extends Item implements IToolHammer { @Override public String getItemStackDisplayName(ItemStack i) { return isDurableHammer ? - I18N.localise(ExtraTrees.instance, "item.masterCarpentryHammer") : - I18N.localise(ExtraTrees.instance, "item.carpentryHammer"); + I18N.localise("extratrees.item.masterCarpentryHammer") : + I18N.localise("extratrees.item.carpentryHammer"); } @Override diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java b/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java index f2396f4d..65114c08 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java @@ -1,10 +1,6 @@ package binnie.extratrees.worldgen; import binnie.extratrees.genetics.ExtraTreeSpecies; -import binnie.extratrees.worldgen.BlockType; -import binnie.extratrees.worldgen.BlockTypeLeaf; -import binnie.extratrees.worldgen.BlockTypeLog; -import binnie.extratrees.worldgen.BlockTypeVoid; import forestry.api.world.ITreeGenData; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/src/main/java/binnie/genetics/GeneticsCreativeTab.java b/src/main/java/binnie/genetics/GeneticsCreativeTab.java index fb84ac79..e54fa9da 100644 --- a/src/main/java/binnie/genetics/GeneticsCreativeTab.java +++ b/src/main/java/binnie/genetics/GeneticsCreativeTab.java @@ -1,6 +1,6 @@ package binnie.genetics; -import binnie.extrabees.ExtraBees; +import binnie.core.util.I18N; import binnie.genetics.item.GeneticsItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -32,7 +32,7 @@ public class GeneticsCreativeTab extends CreativeTabs { @Override @SideOnly(Side.CLIENT) public String getTabLabel() { - return ExtraBees.proxy.localise("tab.genetics"); + return I18N.localise("extrabees.tab.genetics"); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/ControlSequencerProgress.java b/src/main/java/binnie/genetics/craftgui/ControlSequencerProgress.java index dc96f3b1..04cbc8cd 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlSequencerProgress.java +++ b/src/main/java/binnie/genetics/craftgui/ControlSequencerProgress.java @@ -20,7 +20,7 @@ public class ControlSequencerProgress extends ControlProgressBase { public ControlSequencerProgress(IWidget parent, int x, int y) { super(parent, x, y, 100.0f, 52.0f); Panel panel = new Panel(this, 0.0f, 0.0f, 100.0f, 52.0f, MinecraftGUI.PanelType.Gray); - textControl = new ControlText(panel, new IArea(4.0f, 4.0f, 92.0f, 44.0f), "", TextJustification.MiddleCenter); + textControl = new ControlText(panel, new IArea(4.0f, 4.0f, 92.0f, 44.0f), "", TextJustification.MIDDLE_CENTER); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java b/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java index 1cca3e12..be4a29ee 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java @@ -48,7 +48,7 @@ public class WindowAcclimatiser extends WindowMachine { @Override public String getTitle() { - return I18N.localise(Genetics.instance, "machine.labMachine.acclimatiser"); + return I18N.localise("genetics.machine.labMachine.acclimatiser"); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java b/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java index 496eae2a..e8998296 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java @@ -64,7 +64,7 @@ public class WindowAnalyser extends WindowMachine { @Override public String getTitle() { - return I18N.localise(Genetics.instance, "machine.labMachine.analyser"); + return I18N.localise("genetics.machine.labMachine.analyser"); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java index 95269173..1156f9cd 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java +++ b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java @@ -60,7 +60,7 @@ public class WindowGenepool extends WindowMachine { @Override public String getTitle() { - return I18N.localise(Genetics.instance, "machine.labMachine.genepool"); + return I18N.localise("genetics.machine.labMachine.genepool"); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java index 77b65356..8ffe4943 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java @@ -61,7 +61,7 @@ public class WindowIncubator extends WindowMachine { @Override public String getTitle() { - return I18N.localise(Genetics.instance, "machine.labMachine.incubator"); + return I18N.localise("genetics.machine.labMachine.incubator"); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java index 0cfa278c..457f4514 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java @@ -48,7 +48,7 @@ public class WindowInoculator extends WindowMachine { new ControlEnergyBar(this, 91, 118, 60, 16, Position.LEFT); new ControlErrorState(this, 161.0f, 118.0f); x += 142; - CraftGUIUtil.verticalGrid(x, y, TextJustification.MiddleLeft, 8.0f, new ControlSlotArray(this, x, y, 4, 1).create(Inoculator.SLOT_RESERVE), new ControlSlot(this, x, y + 18 + 8).assign(9), new ControlSlotArray(this, x, y + 18 + 8 + 18 + 8, 4, 1).create(Inoculator.SLOT_FINISHED)); + CraftGUIUtil.verticalGrid(x, y, TextJustification.MIDDLE_LEFT, 8.0f, new ControlSlotArray(this, x, y, 4, 1).create(Inoculator.SLOT_RESERVE), new ControlSlot(this, x, y + 18 + 8).assign(9), new ControlSlotArray(this, x, y + 18 + 8 + 18 + 8, 4, 1).create(Inoculator.SLOT_FINISHED)); new ControlIconDisplay(this, x + 18, y + 18 + 2, GUIIcon.ArrowUpLeft.getIcon()); new ControlIconDisplay(this, x + 18, y + 18 + 18, GUIIcon.ArrowLeftDown.getIcon()); new ControlPlayerInventory(this); @@ -56,7 +56,7 @@ public class WindowInoculator extends WindowMachine { @Override public String getTitle() { - return I18N.localise(Genetics.instance, "machine.machine.inoculator"); + return I18N.localise("genetics.machine.machine.inoculator"); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java index 8f605d69..931b33ed 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java @@ -66,7 +66,7 @@ public class WindowIsolator extends WindowMachine { @Override public String getTitle() { - return I18N.localise(Genetics.instance, "machine.machine.isolator"); + return I18N.localise("genetics.machine.machine.isolator"); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java index fdcc2a9a..be55f28a 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java @@ -59,7 +59,7 @@ public class WindowPolymeriser extends WindowMachine { @Override public String getTitle() { - return I18N.localise(Genetics.instance, "machine.machine.polymeriser"); + return I18N.localise("genetics.machine.machine.polymeriser"); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/WindowSequencer.java b/src/main/java/binnie/genetics/craftgui/WindowSequencer.java index 44a992ee..a4dab9c5 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowSequencer.java +++ b/src/main/java/binnie/genetics/craftgui/WindowSequencer.java @@ -46,7 +46,7 @@ public class WindowSequencer extends WindowMachine { if (side == Side.CLIENT && name.equals("username")) { slotText.setValue( EnumChatFormatting.DARK_GRAY - + I18N.localise(Genetics.instance, "machine.sequencer.gui.sequensedBy", nbt.getString("username")) + + I18N.localise("genetics.machine.sequencer.gui.sequensedBy", nbt.getString("username")) ); } super.recieveGuiNBT(side, player, name, nbt); @@ -57,12 +57,12 @@ public class WindowSequencer extends WindowMachine { super.initialiseClient(); int x = 16; int y = 32; - CraftGUIUtil.horizontalGrid(x, y, TextJustification.MiddleCenter, 2.0f, new ControlSlotArray(this, 0, 0, 2, 2).create(Sequencer.SLOT_RESERVE), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSequencerProgress(this, 0, 0), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSlot(this, 0.0f, 0.0f).assign(6)); + CraftGUIUtil.horizontalGrid(x, y, TextJustification.MIDDLE_CENTER, 2.0f, new ControlSlotArray(this, 0, 0, 2, 2).create(Sequencer.SLOT_RESERVE), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSequencerProgress(this, 0, 0), new ControlIconDisplay(this, 0.0f, 0.0f, GUIIcon.ArrowRight.getIcon()), new ControlSlot(this, 0.0f, 0.0f).assign(6)); ControlSlot slotTarget = new ControlSlot(this, x + 96, y + 16); slotTarget.assign(5); x = 34; y = 92; - slotText = new ControlText(this, new IArea(0.0f, y, w(), 12.0f), EnumChatFormatting.DARK_GRAY + I18N.localise(Genetics.instance, "machine.sequencer.gui.willNotSave"), TextJustification.MiddleCenter); + slotText = new ControlText(this, new IArea(0.0f, y, w(), 12.0f), EnumChatFormatting.DARK_GRAY + I18N.localise("genetics.machine.sequencer.gui.willNotSave"), TextJustification.MIDDLE_CENTER); y += 20; ControlSlot slotDye = new ControlSlot(this, x, y); slotDye.assign(0); @@ -77,7 +77,7 @@ public class WindowSequencer extends WindowMachine { @Override public String getTitle() { - return I18N.localise(Genetics.instance, "machine.machine.sequencer"); + return I18N.localise("genetics.machine.machine.sequencer"); } @Override diff --git a/src/main/java/binnie/genetics/craftgui/WindowSplicer.java b/src/main/java/binnie/genetics/craftgui/WindowSplicer.java index fd225dd6..01fd0c3f 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowSplicer.java +++ b/src/main/java/binnie/genetics/craftgui/WindowSplicer.java @@ -57,7 +57,7 @@ public class WindowSplicer extends WindowMachine { CraftGUIUtil.verticalGrid( (w() - 72.0f) / 2.0f, 32.0f, - TextJustification.MiddleCenter, + TextJustification.MIDDLE_CENTER, 4.0f, new ControlSlotArray(this, 0, 0, 4, 1) .create(Inoculator.SLOT_RESERVE), @@ -72,7 +72,7 @@ public class WindowSplicer extends WindowMachine { @Override public String getTitle() { - return I18N.localise(Genetics.instance, "machine.advMachine.splicer"); + return I18N.localise("genetics.machine.advMachine.splicer"); } @Override diff --git a/src/main/java/binnie/genetics/genetics/AlleleHelper.java b/src/main/java/binnie/genetics/genetics/AlleleHelper.java index 262d469a..eb50c4ec 100644 --- a/src/main/java/binnie/genetics/genetics/AlleleHelper.java +++ b/src/main/java/binnie/genetics/genetics/AlleleHelper.java @@ -1,6 +1,5 @@ package binnie.genetics.genetics; -import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; @@ -97,15 +96,15 @@ public class AlleleHelper extends forestry.core.genetics.alleles.AlleleHelper { } public static String toDisplay(EnumMoisture moisture) { - return I18N.localise(Botany.instance, "moisture." + moisture.getID()); + return I18N.localise("botany.moisture." + moisture.getID()); } public static String toDisplay(EnumAcidity acidity) { - return I18N.localise(Botany.instance, "ph." + acidity.getID()); + return I18N.localise("botany.ph." + acidity.getID()); } public static String toDisplay(EnumSoilType soilType) { - return I18N.localise(Botany.instance, "soil." + soilType.getID()); + return I18N.localise("botany.soil." + soilType.getID()); } public static String toDisplay(EnumTolerance tolerance) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java index cb248dfa..145aee6c 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java @@ -1,13 +1,13 @@ package binnie.genetics.gui; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.TextJustification; +import binnie.core.util.I18N; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBee; import forestry.api.genetics.IIndividual; @@ -36,9 +36,9 @@ public class AnalystPageBehaviour extends ControlAnalystPage { IAlleleBeeEffect effect = bee.getGenome().getEffect(); int[] t = bee.getGenome().getTerritory(); if (!effect.getUID().contains("None")) { - String effectDesc = BinnieCore.proxy.localiseOrBlank("allele." + effect.getUID() + ".desc"); + String effectDesc = I18N.localiseOrBlank("binniecore.allele." + effect.getUID() + ".desc"); String loc = effectDesc.equals("") ? ("Effect: " + effect.getName()) : effectDesc; - new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 0.0f), loc, TextJustification.TopCenter).setColor(getColor()); + new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 0.0f), loc, TextJustification.TOP_CENTER).setColor(getColor()); y += (int) (CraftGUI.Render.textHeight(loc, w() - 8.0f) + 1.0f); new ControlTextCentered(this, y, EnumChatFormatting.ITALIC + "Within " + (int) (t[0] / 2.0f) + " blocks").setColor(getColor()); y += 22; @@ -57,9 +57,9 @@ public class AnalystPageBehaviour extends ControlAnalystPage { y += 22; IAlleleButterflyEffect effect2 = bee2.getGenome().getEffect(); if (!effect2.getUID().contains("None")) { - String effectDesc2 = BinnieCore.proxy.localiseOrBlank("allele." + effect2.getUID() + ".desc"); + String effectDesc2 = I18N.localiseOrBlank("binniecore.allele." + effect2.getUID() + ".desc"); String loc2 = effectDesc2.equals("") ? ("Effect: " + effect2.getName()) : effectDesc2; - new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 0.0f), loc2, TextJustification.TopCenter).setColor(getColor()); + new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 0.0f), loc2, TextJustification.TOP_CENTER).setColor(getColor()); y += (int) (CraftGUI.Render.textHeight(loc2, w() - 8.0f) + 1.0f); y += 22; } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/AnalystPageClimate.java index 0bf3a962..3d669fbb 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageClimate.java @@ -48,17 +48,17 @@ public class AnalystPageClimate extends ControlAnalystPage { int y = 4; new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + "Climate").setColor(getColor()); y += 16; - new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Temp. Tolerance", TextJustification.MiddleCenter).setColor(getColor()); + new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Temp. Tolerance", TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; createTemperatureBar(this, (w() - 100.0f) / 2.0f, y, 100.0f, 10.0f, temp, tempTol); y += 16; if (!(ind instanceof IFlower)) { - new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Humidity Tolerance", TextJustification.MiddleCenter).setColor(getColor()); + new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Humidity Tolerance", TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; createHumidity(this, (w() - 100.0f) / 2.0f, y, 100.0f, 10.0f, humid, humidTol); y += 16; } - new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Biomes", TextJustification.MiddleCenter).setColor(getColor()); + new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Biomes", TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; List biomes = new ArrayList(); for (BiomeGenBase biome : BiomeGenBase.getBiomeGenArray()) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index 7e1bec69..acf840a0 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -97,7 +97,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { @Override public void onRenderBackground() { - CraftGUI.Render.text(getArea(), TextJustification.MiddleCenter, value.getName(), 16777215); + CraftGUI.Render.text(getArea(), TextJustification.MIDDLE_CENTER, value.getName(), 16777215); } }; } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java index b59fe7ea..2e453650 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java @@ -54,8 +54,8 @@ public class AnalystPageDescription extends ControlAnalystPage { y += (int) (3.0f + CraftGUI.Render.textHeight("Discovered by " + EnumChatFormatting.BOLD + authority + EnumChatFormatting.RESET, w())); new ControlTextCentered(this, y, "Genetic Complexity: " + species.getComplexity()).setColor(getColor()); y += 26; - ControlText descText = new ControlText(this, new IArea(8.0f, y, w() - 16.0f, 0.0f), descBody + EnumChatFormatting.RESET, TextJustification.TopCenter); - IWidget signatureText = new ControlText(this, new IArea(8.0f, y, w() - 16.0f, 0.0f), descSig + EnumChatFormatting.RESET, TextJustification.BottomRight); + ControlText descText = new ControlText(this, new IArea(8.0f, y, w() - 16.0f, 0.0f), descBody + EnumChatFormatting.RESET, TextJustification.TOP_CENTER); + IWidget signatureText = new ControlText(this, new IArea(8.0f, y, w() - 16.0f, 0.0f), descSig + EnumChatFormatting.RESET, TextJustification.BOTTOM_RIGHT); descText.setColor(getColor()); signatureText.setColor(getColor()); float descHeight = CraftGUI.Render.textHeight(descText.getValue(), descText.getSize().x()); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index 73c3d9cb..c7c62469 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -47,8 +47,8 @@ public class AnalystPageGenome extends ControlAnalystPage { IAllele allele = active ? ind.getGenome().getActiveAllele(chromo) : ind.getGenome().getInactiveAllele(chromo); String alleleName = system.getAlleleName(chromo, allele); float height = CraftGUI.Render.textHeight(alleleName, w() / 2.0f - 2.0f); - new ControlText(scaled, new IArea(0.0f, y + (height - 9.0f) / 2.0f, w() / 2.0f - 2.0f, 0.0f), system.getChromosomeShortName(chromo) + " :", TextJustification.TopRight).setColor(getColor()); - new ControlText(scaled, new IArea(w() / 2.0f + 2.0f, y, w() / 2.0f - 2.0f, 0.0f), alleleName, TextJustification.TopLeft).setColor(getColor()); + new ControlText(scaled, new IArea(0.0f, y + (height - 9.0f) / 2.0f, w() / 2.0f - 2.0f, 0.0f), system.getChromosomeShortName(chromo) + " :", TextJustification.TOP_RIGHT).setColor(getColor()); + new ControlText(scaled, new IArea(w() / 2.0f + 2.0f, y, w() / 2.0f - 2.0f, 0.0f), alleleName, TextJustification.TOP_LEFT).setColor(getColor()); y += (int) (3.0f + height); } setSize(new IPoint(w(), y + 8)); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index f72141a9..9fcb0a07 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -259,7 +259,7 @@ public class AnalystPageMutations extends ControlAnalystPage { @Override public void onRenderBackground() { - CraftGUI.Render.text(getArea(), TextJustification.MiddleCenter, "UNKNOWN", 11184810); + CraftGUI.Render.text(getArea(), TextJustification.MIDDLE_CENTER, "UNKNOWN", 11184810); } } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/AnalystPageSoil.java index 98c3023f..b00820ce 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageSoil.java @@ -32,15 +32,15 @@ public class AnalystPageSoil extends ControlAnalystPage { int y = 4; new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + "Soil").setColor(getColor()); y += 16; - new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Moisture Tolerance", TextJustification.MiddleCenter).setColor(getColor()); + new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Moisture Tolerance", TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; createMoisture(this, (w() - 100.0f) / 2.0f, y, 100.0f, 10.0f, moisture, moistureTol); y += 16; - new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "pH Tolerance", TextJustification.MiddleCenter).setColor(getColor()); + new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "pH Tolerance", TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; createAcidity(this, (w() - 100.0f) / 2.0f, y, 100.0f, 10.0f, pH, pHTol); y += 16; - new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Recommended Soil", TextJustification.MiddleCenter).setColor(getColor()); + new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Recommended Soil", TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; EnumMoisture recomMoisture = EnumMoisture.NORMAL; boolean canTolNormal = Tolerance.canTolerate(moisture, EnumMoisture.NORMAL, moistureTol); @@ -82,7 +82,7 @@ public class AnalystPageSoil extends ControlAnalystPage { recomSoil.setItemStack(stack); recomSoil.setTooltip(); y += 32; - new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Other Soils", TextJustification.MiddleCenter).setColor(getColor()); + new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Other Soils", TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; List stacks = new ArrayList<>(); for (EnumAcidity a : EnumSet.range(EnumAcidity.ACID, EnumAcidity.ALKALINE)) { diff --git a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java index 3cd42ee6..11b5837f 100644 --- a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java +++ b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java @@ -23,8 +23,8 @@ public class ControlGenesisOption extends ControlOption { @Override public void onRenderBackground() { super.onRenderBackground(); - CraftGUI.Render.text(new IArea(0.0f, 0.0f, 70.0f, 22.0f), TextJustification.MiddleCenter, getChromosomeName(), getColor()); - CraftGUI.Render.text(new IArea(75.0f, 0.0f, 80.0f, 22.0f), TextJustification.MiddleCenter, getAlleleName(), getColor()); + CraftGUI.Render.text(new IArea(0.0f, 0.0f, 70.0f, 22.0f), TextJustification.MIDDLE_CENTER, getChromosomeName(), getColor()); + CraftGUI.Render.text(new IArea(75.0f, 0.0f, 80.0f, 22.0f), TextJustification.MIDDLE_CENTER, getAlleleName(), getColor()); CraftGUI.Render.solid(new IArea(70.0f, 2.0f, 1.0f, 16.0f), 0xff000000 + getColor()); } diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index e6509bac..3c7cd695 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -29,8 +29,8 @@ import binnie.core.genetics.BreedingSystem; import binnie.core.machines.inventory.SlotValidator; import binnie.genetics.Genetics; import binnie.genetics.item.GeneticsItems; -import binnie.genetics.machine.analyser.Analyser; import binnie.genetics.machine.ModuleMachine; +import binnie.genetics.machine.analyser.Analyser; import cpw.mods.fml.relauncher.Side; import forestry.api.apiculture.IBee; import forestry.api.arboriculture.ITree; diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 1335e03d..f02375b0 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -44,11 +44,12 @@ public enum GeneticsItems implements IItemMisc { @Override public void addInformation(List data) { + // ignored } @Override public String getName(ItemStack itemStack) { - return I18N.localise(Genetics.instance, "item." + name + ".name"); + return I18N.localise("genetics.item." + name + ".name"); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index b179998c..10c94671 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -1,7 +1,7 @@ package binnie.genetics.item; -import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.Genetics; +import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index 6dbc2ac7..9860349b 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -1,7 +1,7 @@ package binnie.genetics.item; -import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.Genetics; +import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index 1168dce0..f878841f 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -1,7 +1,7 @@ package binnie.genetics.item; -import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.Genetics; +import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.genetics.IGeneItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index 9bba0c5f..bfa32d10 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -1,7 +1,7 @@ package binnie.genetics.item; -import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.Genetics; +import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index a5929b5e..acbcc4dc 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -1,7 +1,7 @@ package binnie.genetics.item; -import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.Genetics; +import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index 4676c341..7882669c 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -2,8 +2,9 @@ package binnie.genetics.item; import binnie.Binnie; import binnie.core.genetics.Gene; -import binnie.genetics.GeneticsCreativeTab; +import binnie.core.util.I18N; import binnie.genetics.Genetics; +import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemAnalysable; import binnie.genetics.api.IItemChargable; @@ -55,7 +56,7 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); - tooltip.add(Genetics.proxy.localise("item.sequence." + (5 - stack.getItemDamage() % 6))); + tooltip.add(I18N.localise("genetics.item.sequence." + (5 - stack.getItemDamage() % 6))); SequencerItem gene = new SequencerItem(stack); if (gene.isCorrupted()) { return; diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index d104ed4b..f499d425 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -9,8 +9,8 @@ import binnie.core.liquid.ItemFluidContainer; import binnie.core.resource.BinnieIcon; import binnie.extrabees.ExtraBees; import binnie.extratrees.ExtraTrees; -import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.Genetics; +import binnie.genetics.GeneticsCreativeTab; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; import net.minecraft.init.Blocks; diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 80441a0a..96645a24 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -5,8 +5,8 @@ import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.machines.MachineGroup; import binnie.core.machines.inventory.ValidatorIcon; -import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.Genetics; +import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.acclimatiser.Acclimatiser; import binnie.genetics.machine.incubator.Incubator; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserComponentLogic.java b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserComponentLogic.java index 6b25b1c7..18dff66e 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserComponentLogic.java @@ -4,7 +4,6 @@ import binnie.core.machines.IMachine; import binnie.core.machines.power.ComponentProcessIndefinate; import binnie.core.machines.power.ErrorState; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import net.minecraft.item.ItemStack; import java.util.ArrayList; @@ -19,13 +18,13 @@ public class AcclimatiserComponentLogic extends ComponentProcessIndefinate { public ErrorState canWork() { if (getUtil().getStack(Acclimatiser.SLOT_TARGET) == null) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.acclimatiser.error.noIndividual"), + I18N.localise("genetics.machine.acclimatiser.error.noIndividual"), Acclimatiser.SLOT_TARGET ); } if (getUtil().getNonNullStacks(Acclimatiser.SLOT_ACCLIMATISER).isEmpty()) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.acclimatiser.error.noAcclimatizingItems"), + I18N.localise("genetics.machine.acclimatiser.error.noAcclimatizingItems"), Acclimatiser.SLOT_ACCLIMATISER ); } @@ -36,7 +35,7 @@ public class AcclimatiserComponentLogic extends ComponentProcessIndefinate { public ErrorState canProgress() { if (!Acclimatiser.canAcclimatise(getUtil().getStack(Acclimatiser.SLOT_TARGET), getUtil().getNonNullStacks(Acclimatiser.SLOT_ACCLIMATISER))) { return new ErrorState.InvalidItem( - I18N.localise(Genetics.instance, "machine.acclimatiser.error.invalidAcclimatizingItems"), + I18N.localise("genetics.machine.acclimatiser.error.invalidAcclimatizingItems"), Acclimatiser.SLOT_TARGET ); } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserItemSlotValidator.java b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserItemSlotValidator.java index 1b8ccfcc..d00a194b 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserItemSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserItemSlotValidator.java @@ -2,7 +2,6 @@ package binnie.genetics.machine.acclimatiser; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import net.minecraft.item.ItemStack; public class AcclimatiserItemSlotValidator extends SlotValidator { @@ -22,6 +21,6 @@ public class AcclimatiserItemSlotValidator extends SlotValidator { @Override public String getTooltip() { - return I18N.localise(Genetics.instance, "machine.acclimatiser.acclimatizingItems"); + return I18N.localise("genetics.machine.acclimatiser.acclimatizingItems"); } } diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentLogic.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentLogic.java index b0e764f5..d6835e6e 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentLogic.java @@ -5,7 +5,6 @@ import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import net.minecraft.item.ItemStack; public class AnalyserComponentLogic extends ComponentProcessSetCost implements IProcess { @@ -17,7 +16,7 @@ public class AnalyserComponentLogic extends ComponentProcessSetCost implements I public ErrorState canWork() { if (getUtil().isSlotEmpty(Analyser.SLOT_TARGET)) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.analyser.error.noItem"), + I18N.localise("genetics.machine.analyser.error.noItem"), Analyser.SLOT_TARGET ); } @@ -28,8 +27,8 @@ public class AnalyserComponentLogic extends ComponentProcessSetCost implements I } return new ErrorState.InvalidItem( - I18N.localise(Genetics.instance, "machine.analyser.error.alreadyAnalysed.title"), - I18N.localise(Genetics.instance, "machine.analyser.error.alreadyAnalysed"), + I18N.localise("genetics.machine.analyser.error.alreadyAnalysed.title"), + I18N.localise("genetics.machine.analyser.error.alreadyAnalysed"), Analyser.SLOT_TARGET ); } @@ -41,8 +40,8 @@ public class AnalyserComponentLogic extends ComponentProcessSetCost implements I } return new ErrorState.Item( - I18N.localise(Genetics.instance, "machine.analyser.error.insufficientDye.title"), - I18N.localise(Genetics.instance, "machine.analyser.error.insufficientDye"), + I18N.localise("genetics.machine.analyser.error.insufficientDye.title"), + I18N.localise("genetics.machine.analyser.error.insufficientDye"), new int[]{Analyser.SLOT_DYE} ); } diff --git a/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java b/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java index f63b80cf..0794602c 100644 --- a/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java @@ -2,7 +2,6 @@ package binnie.genetics.machine.analyser; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ModuleMachine; import net.minecraft.item.ItemStack; @@ -19,6 +18,6 @@ public class DyeSlotValidator extends SlotValidator { @Override public String getTooltip() { - return I18N.localise(Genetics.instance, "machine.analyser.dnaDye"); + return I18N.localise("genetics.machine.analyser.dnaDye"); } } diff --git a/src/main/java/binnie/genetics/machine/analyser/UnanalysedSlotValidator.java b/src/main/java/binnie/genetics/machine/analyser/UnanalysedSlotValidator.java index 92c11626..fa408a4a 100644 --- a/src/main/java/binnie/genetics/machine/analyser/UnanalysedSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/analyser/UnanalysedSlotValidator.java @@ -2,7 +2,6 @@ package binnie.genetics.machine.analyser; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import net.minecraft.item.ItemStack; public class UnanalysedSlotValidator extends SlotValidator { @@ -18,6 +17,6 @@ public class UnanalysedSlotValidator extends SlotValidator { @Override public String getTooltip() { - return I18N.localise(Genetics.instance, "machine.analyser.unanalysedItem"); + return I18N.localise("genetics.machine.analyser.unanalysedItem"); } } diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java index f096650f..4d168623 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java @@ -7,7 +7,6 @@ import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.item.GeneticLiquid; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; @@ -25,7 +24,7 @@ public class GenepoolComponentLogic extends ComponentProcessSetCost implements I public ErrorState canWork() { if (getUtil().isSlotEmpty(0)) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.genepool.error.noIndividual"), + I18N.localise("genetics.machine.genepool.error.noIndividual"), Genepool.SLOT_BEE ); } @@ -36,19 +35,19 @@ public class GenepoolComponentLogic extends ComponentProcessSetCost implements I public ErrorState canProgress() { if (!getUtil().spaceInTank(Genepool.TANK_DNA, getDNAAmount(getUtil().getStack(Genepool.TANK_DNA)))) { return new ErrorState.NoSpace( - I18N.localise(Genetics.instance, "machine.genepool.error.noRoom"), + I18N.localise("genetics.machine.genepool.error.noRoom"), Genepool.TANK_DNA ); } if (!getUtil().liquidInTank(1, 1)) { return new ErrorState.InsufficientLiquid( - I18N.localise(Genetics.instance, "machine.genepool.error.noEthanol"), + I18N.localise("genetics.machine.genepool.error.noEthanol"), Genepool.TANK_ETHANOL ); } if (getUtil().getSlotCharge(Genepool.SLOT_ENZYME) == 0.0f) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.genepool.error.insufficientEnzyme"), + I18N.localise("genetics.machine.genepool.error.insufficientEnzyme"), Genepool.SLOT_ENZYME ); } diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java index b446ce99..6b59eac6 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java @@ -6,7 +6,6 @@ import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.machines.transfer.TransferRequest; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.api.IIncubatorRecipe; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -31,8 +30,8 @@ public class IncubatorComponentLogic extends ComponentProcessIndefinate implemen return super.canWork(); } return new ErrorState( - I18N.localise(Genetics.instance, "machine.incubator.error.noRecipe.title"), - I18N.localise(Genetics.instance, "machine.incubator.error.noRecipe") + I18N.localise("genetics.machine.incubator.error.noRecipe.title"), + I18N.localise("genetics.machine.incubator.error.noRecipe") ); } @@ -41,13 +40,13 @@ public class IncubatorComponentLogic extends ComponentProcessIndefinate implemen if (recipe != null) { if (!recipe.isInputLiquidSufficient(getUtil().getFluid(Incubator.TANK_INPUT))) { return new ErrorState.InsufficientLiquid( - I18N.localise(Genetics.instance, "machine.incubator.error.noLiquid"), + I18N.localise("genetics.machine.incubator.error.noLiquid"), Incubator.TANK_INPUT ); } if (!roomForOutput) { return new ErrorState.TankSpace( - I18N.localise(Genetics.instance, "machine.incubator.error.noRoom"), + I18N.localise("genetics.machine.incubator.error.noRoom"), Incubator.TANK_OUTPUT ); } diff --git a/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java b/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java index a7f3e145..e2989343 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java @@ -3,7 +3,6 @@ package binnie.genetics.machine.inoculator; import binnie.Binnie; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; @@ -21,6 +20,6 @@ public class IndividualInoculateValidator extends SlotValidator { @Override public String getTooltip() { - return I18N.localise(Genetics.instance, "machine.inoculator.inoculableIndividual"); + return I18N.localise("genetics.machine.inoculator.inoculableIndividual"); } } diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java index b2a61ea2..faa40f85 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java @@ -5,7 +5,6 @@ import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.Engineering; @@ -46,28 +45,28 @@ public class InoculatorComponentLogic extends ComponentProcessSetCost implements public String getTooltip() { int n = getNumberOfGenes(); if (n > 1) { - return I18N.localise(Genetics.instance, "machine.inoculator.inoculatingWithGenes", n); + return I18N.localise("genetics.machine.inoculator.inoculatingWithGenes", n); } - return I18N.localise(Genetics.instance, "machine.inoculator.inoculatingWithGene"); + return I18N.localise("genetics.machine.inoculator.inoculatingWithGene"); } @Override public ErrorState canWork() { if (getUtil().isSlotEmpty(Inoculator.SLOT_TARGET)) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.inoculator.error.noIndividual"), + I18N.localise("genetics.machine.inoculator.error.noIndividual"), Inoculator.SLOT_TARGET ); } if (getUtil().isSlotEmpty(Inoculator.SLOT_SERUM_VIAL)) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.inoculator.error.noSerum"), + I18N.localise("genetics.machine.inoculator.error.noSerum"), Inoculator.SLOT_SERUM_VIAL ); } if (getUtil().isTankEmpty(Inoculator.TANK_VECTOR)) { return new ErrorState.InsufficientLiquid( - I18N.localise(Genetics.instance, "machine.inoculator.error.noLiquid"), + I18N.localise("genetics.machine.inoculator.error.noLiquid"), Inoculator.TANK_VECTOR ); } @@ -80,8 +79,8 @@ public class InoculatorComponentLogic extends ComponentProcessSetCost implements ItemStack stack = getUtil().getStack(Inoculator.SLOT_SERUM_VIAL); if (stack != null && Engineering.getCharges(stack) == 0) { return new ErrorState( - I18N.localise(Genetics.instance, "machine.inoculator.error.emptySerum.title"), - I18N.localise(Genetics.instance, "machine.inoculator.error.emptySerum") + I18N.localise("genetics.machine.inoculator.error.emptySerum.title"), + I18N.localise("genetics.machine.inoculator.error.emptySerum") ); } return super.canWork(); @@ -93,14 +92,14 @@ public class InoculatorComponentLogic extends ComponentProcessSetCost implements IGene[] genes = Engineering.getGenes(serum); if (genes.length == 0) { return new ErrorState( - I18N.localise(Genetics.instance, "machine.inoculator.error.invalidSerum.title"), - I18N.localise(Genetics.instance, "machine.inoculator.error.invalidSerum.0") + I18N.localise("genetics.machine.inoculator.error.invalidSerum.title"), + I18N.localise("genetics.machine.inoculator.error.invalidSerum.0") ); } if (!genes[0].getSpeciesRoot().isMember(target)) { return new ErrorState( - I18N.localise(Genetics.instance, "machine.inoculator.error.invalidSerum.title"), - I18N.localise(Genetics.instance, "machine.inoculator.error.invalidSerum.1") + I18N.localise("genetics.machine.inoculator.error.invalidSerum.title"), + I18N.localise("genetics.machine.inoculator.error.invalidSerum.1") ); } @@ -123,8 +122,8 @@ public class InoculatorComponentLogic extends ComponentProcessSetCost implements return null; } return new ErrorState( - I18N.localise(Genetics.instance, "machine.inoculator.error.defunctSerum.title"), - I18N.localise(Genetics.instance, "machine.inoculator.error.defunctSerum") + I18N.localise("genetics.machine.inoculator.error.defunctSerum.title"), + I18N.localise("genetics.machine.inoculator.error.defunctSerum") ); } diff --git a/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java b/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java index 4fa5888c..8dc9f8af 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java @@ -2,7 +2,6 @@ package binnie.genetics.machine.inoculator; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.api.IItemSerum; import binnie.genetics.machine.ModuleMachine; import net.minecraft.item.ItemStack; @@ -19,6 +18,6 @@ public class SerumSlotValidator extends SlotValidator { @Override public String getTooltip() { - return I18N.localise(Genetics.instance, "machine.inoculator.serums"); + return I18N.localise("genetics.machine.inoculator.serums"); } } diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java index ff955fdd..1a038901 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java @@ -7,7 +7,6 @@ import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.item.ItemSequence; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -30,20 +29,20 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I public ErrorState canWork() { if (getUtil().isSlotEmpty(Isolator.SLOT_TARGET)) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.isolator.error.noIndividual"), + I18N.localise("genetics.machine.isolator.error.noIndividual"), Isolator.SLOT_TARGET ); } // TODO check slot id in validation if (!getUtil().isSlotEmpty(Isolator.SLOT_RESULT)) { return new ErrorState.NoSpace( - I18N.localise(Genetics.instance, "machine.isolator.error.noRoom"), + I18N.localise("genetics.machine.isolator.error.noRoom"), Isolator.SLOT_FINISHED ); } if (getUtil().isSlotEmpty(Isolator.SLOT_SEQUENCER_VIAL)) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.isolator.error.noVials"), + I18N.localise("genetics.machine.isolator.error.noVials"), Isolator.SLOT_SEQUENCER_VIAL ); } @@ -54,13 +53,13 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I public ErrorState canProgress() { if (!getUtil().liquidInTank(Isolator.TANK_ETHANOL, (int) ethanolPerProcess)) { return new ErrorState.InsufficientLiquid( - I18N.localise(Genetics.instance, "machine.isolator.error.noLiquid"), + I18N.localise("genetics.machine.isolator.error.noLiquid"), Isolator.TANK_ETHANOL ); } if (getUtil().getSlotCharge(Isolator.SLOT_ENZYME) == 0.0f) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.isolator.error.noEnzyme"), + I18N.localise("genetics.machine.isolator.error.noEnzyme"), Isolator.SLOT_ENZYME ); } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java index 8859911c..6284d5f4 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java @@ -5,7 +5,6 @@ import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.genetics.Engineering; import net.minecraft.item.ItemStack; @@ -67,22 +66,22 @@ public class PolymeriserComponentLogic extends ComponentProcessSetCost implement public String getTooltip() { int n = getNumberOfGenes(); if (n > 1) { - return I18N.localise(Genetics.instance, "machine.polymeriser.replicatingWithGenes", n); + return I18N.localise("genetics.machine.polymeriser.replicatingWithGenes", n); } - return I18N.localise(Genetics.instance, "machine.polymeriser.replicatingWithGene"); + return I18N.localise("genetics.machine.polymeriser.replicatingWithGene"); } @Override public ErrorState canWork() { if (getUtil().isSlotEmpty(Polymeriser.SLOT_SERUM)) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.polymeriser.error.noItem"), + I18N.localise("genetics.machine.polymeriser.error.noItem"), Polymeriser.SLOT_SERUM ); } if (!getUtil().getStack(Polymeriser.SLOT_SERUM).isItemDamaged()) { return new ErrorState.InvalidItem( - I18N.localise(Genetics.instance, "machine.polymeriser.error.itemFilled"), + I18N.localise("genetics.machine.polymeriser.error.itemFilled"), Polymeriser.SLOT_SERUM ); } @@ -93,13 +92,13 @@ public class PolymeriserComponentLogic extends ComponentProcessSetCost implement public ErrorState canProgress() { if (getUtil().getFluid(Polymeriser.TANK_BACTERIA) == null) { return new ErrorState.InsufficientLiquid( - I18N.localise(Genetics.instance, "machine.polymeriser.error.noLiquid"), + I18N.localise("genetics.machine.polymeriser.error.noLiquid"), Polymeriser.TANK_BACTERIA ); } if (getUtil().getFluid(Polymeriser.TANK_DNA) == null) { return new ErrorState.InsufficientLiquid( - I18N.localise(Genetics.instance, "machine.polymeriser.error.noDNA"), + I18N.localise("genetics.machine.polymeriser.error.noDNA"), Polymeriser.TANK_DNA ); } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java b/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java index 80ba78d3..958aaf9f 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java @@ -2,7 +2,6 @@ package binnie.genetics.machine.polymeriser; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.api.IItemChargable; import binnie.genetics.machine.ModuleMachine; import net.minecraft.item.ItemStack; @@ -19,6 +18,6 @@ public class UnfilledSerumSlotValidator extends SlotValidator { @Override public String getTooltip() { - return I18N.localise(Genetics.instance, "machine.polymeriser.unfilledSerum"); + return I18N.localise("genetics.machine.polymeriser.unfilledSerum"); } } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java index 0df66569..dea99501 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java @@ -6,7 +6,6 @@ import binnie.core.machines.power.ComponentProcess; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.genetics.GeneTracker; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.item.GeneticsItems; @@ -41,7 +40,7 @@ public class SequencerComponentLogic extends ComponentProcess implements IProces public ErrorState canWork() { if (getUtil().isSlotEmpty(Sequencer.SLOT_TARGET_INDEX)) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.sequencer.error.noSequence"), + I18N.localise("genetics.machine.sequencer.error.noSequence"), Sequencer.SLOT_TARGET_INDEX ); } @@ -52,8 +51,8 @@ public class SequencerComponentLogic extends ComponentProcess implements IProces public ErrorState canProgress() { if (getMachine().getOwner() == null) { return new ErrorState( - I18N.localise(Genetics.instance, "machine.sequencer.error.noOwner.title"), - I18N.localise(Genetics.instance, "machine.sequencer.error.noOwner") + I18N.localise("genetics.machine.sequencer.error.noOwner.title"), + I18N.localise("genetics.machine.sequencer.error.noOwner") ); } if (getUtil().getSlotCharge(Sequencer.SLOT_DYE_INDEX) == 0.0f) { @@ -66,7 +65,7 @@ public class SequencerComponentLogic extends ComponentProcess implements IProces ItemStack stack = getUtil().getStack(Sequencer.SLOT_DONE_INDEX); if (stack != null && stack.stackSize >= 64) { return new ErrorState.NoSpace( - I18N.localise(Genetics.instance, "machine.sequencer.error.noSpace"), + I18N.localise("genetics.machine.sequencer.error.noSpace"), Sequencer.SLOT_DONE_INDEX ); } diff --git a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java index f6d2babe..7e85e886 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java @@ -23,6 +23,6 @@ public class UnsequencedSlotValidator extends SlotValidator { @Override public String getTooltip() { - return I18N.localise(Genetics.instance, "machine.sequencer.unsequencedDNA"); + return I18N.localise("genetics.machine.sequencer.unsequencedDNA"); } } diff --git a/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java b/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java index 3bc031e9..7ae1817a 100644 --- a/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java +++ b/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java @@ -3,7 +3,6 @@ package binnie.genetics.machine.splicer; import binnie.Binnie; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; @@ -21,6 +20,6 @@ public class IndividualInoculateValidator extends SlotValidator { @Override public String getTooltip() { - return I18N.localise(Genetics.instance, "machine.splicer.splicableIndividual"); + return I18N.localise("genetics.machine.splicer.splicableIndividual"); } } diff --git a/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java b/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java index 86d19496..9c161727 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java @@ -2,7 +2,6 @@ package binnie.genetics.machine.splicer; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.api.IItemSerum; import binnie.genetics.machine.ModuleMachine; import net.minecraft.item.ItemStack; @@ -19,6 +18,6 @@ class SerumSlotValidator extends SlotValidator { @Override public String getTooltip() { - return I18N.localise(Genetics.instance, "machine.splicer.serums"); + return I18N.localise("genetics.machine.splicer.serums"); } } diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java index a007c5c8..7e85c4f8 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java @@ -5,7 +5,6 @@ import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; import binnie.genetics.genetics.Engineering; @@ -92,28 +91,28 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP int f = getFullNumberOfGenes(); if (f > 1) { if (n > 1) { - return I18N.localise(Genetics.instance, "machine.splicer.splicingIn.0", n, f); + return I18N.localise("genetics.machine.splicer.splicingIn.0", n, f); } - return I18N.localise(Genetics.instance, "machine.splicer.splicingIn.1", n, f); + return I18N.localise("genetics.machine.splicer.splicingIn.1", n, f); } if (n > 1) { - return I18N.localise(Genetics.instance, "machine.splicer.splicingIn.2", n); + return I18N.localise("genetics.machine.splicer.splicingIn.2", n); } - return I18N.localise(Genetics.instance, "machine.splicer.splicingIn.3", n); + return I18N.localise("genetics.machine.splicer.splicingIn.3", n); } @Override public ErrorState canWork() { if (getUtil().isSlotEmpty(Splicer.SLOT_TARGET)) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.splicer.error.noIndividual"), + I18N.localise("genetics.machine.splicer.error.noIndividual"), Splicer.SLOT_TARGET ); } if (getUtil().isSlotEmpty(Splicer.SLOT_SERUM_VIAL)) { return new ErrorState.NoItem( - I18N.localise(Genetics.instance, "machine.splicer.error.noSerum"), + I18N.localise("genetics.machine.splicer.error.noSerum"), Splicer.SLOT_SERUM_VIAL ); } @@ -125,8 +124,8 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP if (getUtil().getStack(0) != null && Engineering.getCharges(getUtil().getStack(Splicer.SLOT_SERUM_VIAL)) == 0) { return new ErrorState( - I18N.localise(Genetics.instance, "machine.splicer.error.emptySerum.title"), - I18N.localise(Genetics.instance, "machine.splicer.error.emptySerum") + I18N.localise("genetics.machine.splicer.error.emptySerum.title"), + I18N.localise("genetics.machine.splicer.error.emptySerum") ); } return super.canWork(); @@ -138,14 +137,14 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP IGene[] genes = Engineering.getGenes(serum); if (genes.length == 0) { return new ErrorState( - I18N.localise(Genetics.instance, "machine.splicer.error.invalidSerum.title"), - I18N.localise(Genetics.instance, "machine.splicer.error.invalidSerum.0") + I18N.localise("genetics.machine.splicer.error.invalidSerum.title"), + I18N.localise("genetics.machine.splicer.error.invalidSerum.0") ); } if (!genes[0].getSpeciesRoot().isMember(target)) { return new ErrorState( - I18N.localise(Genetics.instance, "machine.splicer.error.invalidSerum.title"), - I18N.localise(Genetics.instance, "machine.splicer.error.invalidSerum.1") + I18N.localise("genetics.machine.splicer.error.invalidSerum.title"), + I18N.localise("genetics.machine.splicer.error.invalidSerum.1") ); } @@ -165,8 +164,8 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP if (hasAll) { return new ErrorState( - I18N.localise(Genetics.instance, "machine.splicer.error.defunctSerum.title"), - I18N.localise(Genetics.instance, "machine.splicer.error.defunctSerum") + I18N.localise("genetics.machine.splicer.error.defunctSerum.title"), + I18N.localise("genetics.machine.splicer.error.defunctSerum") ); } return null; diff --git a/src/main/resources/assets/binniecore/lang/en_US.lang b/src/main/resources/assets/binniecore/lang/en_US.lang index 667973f0..df6fd49e 100644 --- a/src/main/resources/assets/binniecore/lang/en_US.lang +++ b/src/main/resources/assets/binniecore/lang/en_US.lang @@ -223,7 +223,6 @@ binniecore.gui.genesis=Genesis binniecore.gui.database.nodescription=No Description Provided. binniecore.gui.database.mode.species=Species binniecore.gui.database.mode.branches=Branches -binniecore.gui.database.mode.branches.count=%d/%d Branches binniecore.gui.database.mode.breeder=Breeder binniecore.gui.database.discovered.discovered=Discovered Species binniecore.gui.database.discovered.undiscovered=Undiscovered Species @@ -235,6 +234,7 @@ binniecore.gui.database.branch.name=%s Branch binniecore.gui.database.branch.apidae=Apidae %s binniecore.gui.database.branch.discoveredBy=Discovered by %s binniecore.gui.database.branch.noDesc=No Description Provided. +binniecore.gui.database.branch.count=%d/%d Branches binniecore.gui.database.furtherMutations=Further Mutations binniecore.gui.database.resultantMutations=Resultant Mutations binniecore.gui.database.descriptor=%s Profile diff --git a/src/main/resources/assets/binniecore/lang/ru_RU.lang b/src/main/resources/assets/binniecore/lang/ru_RU.lang index 84594131..a32b47ef 100644 --- a/src/main/resources/assets/binniecore/lang/ru_RU.lang +++ b/src/main/resources/assets/binniecore/lang/ru_RU.lang @@ -223,7 +223,6 @@ binniecore.gui.genesis=Генезис binniecore.gui.database.nodescription=Нет описания binniecore.gui.database.mode.species=Виды binniecore.gui.database.mode.branches=Семейства -binniecore.gui.database.mode.branches.count=%d/%d ветвей binniecore.gui.database.mode.breeder=Селекция binniecore.gui.database.discovered.discovered=Найденные виды binniecore.gui.database.discovered.undiscovered=Ненайденные виды @@ -235,6 +234,7 @@ binniecore.gui.database.branch.name=%s ветвь binniecore.gui.database.branch.apidae=Природная %s binniecore.gui.database.branch.discoveredBy=Найдено игроком %s binniecore.gui.database.branch.noDesc=Описание отсутствует. +binniecore.gui.database.branch.count=%d/%d ветвей binniecore.gui.database.furtherMutations=Дальнейшие мутации binniecore.gui.database.resultantMutations=Результирующие мутации binniecore.gui.database.descriptor=%s diff --git a/src/main/resources/assets/binniecore/lang/zh_CN.lang b/src/main/resources/assets/binniecore/lang/zh_CN.lang index ac70d559..b4e27fd6 100644 --- a/src/main/resources/assets/binniecore/lang/zh_CN.lang +++ b/src/main/resources/assets/binniecore/lang/zh_CN.lang @@ -223,7 +223,6 @@ binniecore.gui.genesis=Genesis binniecore.gui.database.nodescription=未提供说明. binniecore.gui.database.mode.species=种 binniecore.gui.database.mode.branches=族 -binniecore.gui.database.mode.branches.count=%d/%d 分支 binniecore.gui.database.mode.breeder=变异 binniecore.gui.database.discovered.discovered=已发现品种 binniecore.gui.database.discovered.undiscovered=未发现品种 @@ -235,6 +234,7 @@ binniecore.gui.database.branch.name=%s 分支 binniecore.gui.database.branch.apidae=Apidae %s binniecore.gui.database.branch.discoveredBy=由 %s 发现 binniecore.gui.database.branch.noDesc=没有描述。 +binniecore.gui.database.branch.count=%d/%d 分支 binniecore.gui.database.furtherMutations=次代突变 binniecore.gui.database.resultantMutations=导向突变 binniecore.gui.database.descriptor=%s 档案 diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index 8b18b1bc..b402c097 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -122,7 +122,6 @@ botany.design.category.bars=Bars botany.design.category.letters=Letters botany.design.category.diagonals=Diagonals - botany.ph.acid=Acidic botany.ph.neutral=Neutral botany.ph.alkaline=Alkaline @@ -142,6 +141,10 @@ botany.soil.loam=Loam botany.soil.flowerbed=Flowerbed botany.soil.weedkiller=Weedkiller +botany.soil.tooltip.type=Type: +botany.soil.tooltip.moisture=Moisture: +botany.soil.tooltip.pH=pH: + botany.item.tooltip.holdMore= botany.item.tooltip.bugged=This item is bugged. Destroy it! botany.item.tooltip.unknownGenome= diff --git a/src/main/resources/assets/botany/lang/ru_RU.lang b/src/main/resources/assets/botany/lang/ru_RU.lang index 89c32c59..69582edb 100644 --- a/src/main/resources/assets/botany/lang/ru_RU.lang +++ b/src/main/resources/assets/botany/lang/ru_RU.lang @@ -13,6 +13,115 @@ botany.verticalCeramicBricks=Вертикальный керамический botany.verticalStripedCeramicBricks=Вертикальная полосатая керамическая плитка botany.largeVerticalCeramicBricks=Длинный вертикальный керамический кирпич +botany.design.blank=Пустой +botany.design.octagon=Октагон +botany.design.diamond=Алмаз +botany.design.ringed=Кольцо +botany.design.squared=Squared +botany.design.multiply=Multiply +botany.design.halved=Halved +botany.design.striped=Striped +botany.design.thinStriped=Thin Striped +botany.design.fullChequered=Full Chequered +botany.design.fullTiled=Full Tiled +botany.design.chequered=Chequered +botany.design.tiled=Tiled +botany.design.veryThinCornered=Very Thin Cornered +botany.design.thinCornered=Thin Cornered +botany.design.cornered=Cornered +botany.design.thickCornered=Thick Cornered +botany.design.edged=Edged +botany.design.thinEdged=Thin Edged +botany.design.thinBarred=Thin Barred +botany.design.barred=Barred +botany.design.thickBarred=Thick Barred +botany.design.diagonal=Diagonal +botany.design.thickDiagonal=Thick Diagonal +botany.design.thinSaltire=Thin Saltire +botany.design.saltire=Saltire +botany.design.thickSaltire=Thick Saltire +botany.design.thinCrossed=Thin Crossed +botany.design.crossed=Crossed +botany.design.thickCrossed=Thick Crossed +botany.design.thinTSection=Thin T Section +botany.design.tSection=T-секция +botany.design.thickTSection=Thick T Section +botany.design.thinBarredCorner=Thin Barred Corner +botany.design.barredCorner=Barred Corner +botany.design.thickBarredCorner=Thick Barred Corner +botany.design.thinStripedCorner=Thin Striped Corner +botany.design.stripedCorner=Striped Corner +botany.design.emblem1=Эмблема 1 +botany.design.emblem2=Эмблема 2 +botany.design.emblem3=Эмблема 3 +botany.design.emblem4=Эмблема 4 +botany.design.emblem5=Эмблема 5 +botany.design.letterA=Буква A +botany.design.letterB=Буква B +botany.design.letterC=Буква C +botany.design.letterD=Буква D +botany.design.letterE=Буква E +botany.design.letterF=Буква F +botany.design.letterG=Буква G +botany.design.letterH=Буква H +botany.design.letterI=Буква I +botany.design.letterJ=Буква J +botany.design.letterK=Буква K +botany.design.letterL=Буква L +botany.design.letterM=Буква M +botany.design.letterN=Буква N +botany.design.letterO=Буква O +botany.design.letterP=Буква P +botany.design.letterQ=Буква Q +botany.design.letterR=Буква R +botany.design.letterS=Буква S +botany.design.letterT=Буква T +botany.design.letterU=Буква U +botany.design.letterV=Буква V +botany.design.letterW=Буква W +botany.design.letterX=Буква X +botany.design.letterY=Буква Y +botany.design.letterZ=Буква Z +botany.design.thinCurvedCrossed=Thin Curved Crossed +botany.design.thinCurvedBarredCorner=Thin Curved Barred Corner +botany.design.curvedBarredCorner=Curved Barred Corner +botany.design.thinCurvedCorner=Thin Curved Corner +botany.design.curvedCorner=Curved Corner +botany.design.thinCurvedTSection=Thin Curved T Section +botany.design.curvedTSection=Curved T Section +botany.design.barredEnd=Barred End +botany.design.diagonalCorner=Diagonal Corner +botany.design.diagonalTSection=Diagonal T Section +botany.design.diagonalCurvedCorner=Diagonal Curved Corner +botany.design.diagonalCurvedTSection=Diagonal Curved T Section +botany.design.ornateBarred=Ornate Barred +botany.design.splitBarred=Split Barred +botany.design.splitBarredCorner=Split Barred Corner +botany.design.splitBarredTSection=Split Barred T Section +botany.design.splitCrossed=Split Crossed +botany.design.splitBarredEnd=Split Barred End +botany.design.ornateThinBarred=Ornate Thin Barred +botany.design.circle=Круг +botany.design.plus=Крест +botany.design.creeper=Крипер +botany.design.ornateStripedCorner=Ornate Striped Corner +botany.design.testingBlock=Тестовый блок +botany.design.diagonalHalved=Diagonal Halved +botany.design.corneredDiagonal=Cornered Diagonal +botany.design.oppositeCorneredDiagonal=Opposite Cornered Diagonal +botany.design.thickCorneredDiagonal=Thick Cornered Diagonal +botany.design.thinBarredEnd=Thin Barred End +botany.design.thickBarredEnd=Thick Barred End +botany.design.overlappedBarred=Overlapped Barred +botany.design.overlappedSplitBarred=Overlapped Split Barred + +botany.design.category.designsEmblems=Дизайны и эмблемы +botany.design.category.squaresStripes=Squares & Stripes +botany.design.category.edges=Edges +botany.design.category.bars=Bars +botany.design.category.letters=Буквы +botany.design.category.diagonals=Diagonals + botany.ph.acid=Кислотный botany.ph.neutral=Нейтральный botany.ph.alkaline=Щелочной @@ -32,6 +141,10 @@ botany.soil.loam=Суглинок botany.soil.flowerbed=Цветник botany.soil.weedkiller=Средство от сорняков +botany.soil.tooltip.type=Тип: +botany.soil.tooltip.moisture=влажность: +botany.soil.tooltip.pH=pH: + botany.item.tooltip.holdMore=<Зажмите SHIFT для подробностей> botany.item.tooltip.bugged=Предмет содержит ошибки. Уничтожь его! botany.item.tooltip.unknownGenome=<Неизвестный геном> diff --git a/src/main/resources/assets/extrabees/lang/en_US.lang b/src/main/resources/assets/extrabees/lang/en_US.lang index 9cfecd49..d46d0327 100644 --- a/src/main/resources/assets/extrabees/lang/en_US.lang +++ b/src/main/resources/assets/extrabees/lang/en_US.lang @@ -130,6 +130,10 @@ extrabees.item.template.corrupted=Corrupted Template extrabees.item.template.name=%s Template extrabees.item.template.empty=Blank Template +extrabees.item.database=Apiarist Database +extrabees.item.masterDatabase=Master Apiarist Database +extrabees.item.database.tooltip=Flora-in-a-box + extrabees.item.scentedGear=Scented Gear extrabees.item.diamondShard=Diamond Fragment extrabees.item.emeraldShard=Emerald Fragment @@ -186,17 +190,29 @@ extrabees.liquid.dna=Liquid DNA extrabees.machine.alveay.frame=Frame Housing extrabees.machine.alveay.frame.info=The Frame Housing holds one hive frame to alter a bee's traits. +extrabees.machine.alveay.frame.tooltip=Hive Frames + extrabees.machine.alveay.lighting=Alveary Lighting extrabees.machine.alveay.lighting.info=The Alveary Lighting tricks bees into thinking it is daylight at night time. + extrabees.machine.alveay.mutator=Mutator extrabees.machine.alveay.mutator.info=The Mutator uses certain items in order to encourage bee mutation. +extrabees.machine.alveay.mutator.tooltip=Mutagenic Agents + extrabees.machine.alveay.rainShield=Rain Shield extrabees.machine.alveay.rainShield.info=The Rain Shield prevents bees from being affected by rainfall. + extrabees.machine.alveay.stimulator=Electrical Stimulator extrabees.machine.alveay.stimulator.info=Uses circuits and power to stimulate bees in a way similar to frames. +extrabees.machine.alveay.stimulator.tooltip=Forestry Circuits + extrabees.machine.alveay.hatchery=Hatchery extrabees.machine.alveay.hatchery.info=Collect larvae laid by queen bees inside the alveary. +extrabees.machine.alveay.hatchery.tooltip=Larvae + extrabees.machine.alveay.transmission=Alveary Transmission +extrabees.machine.alveay.transmission.info= + ################################################## ## Misc @@ -220,7 +236,6 @@ extrabees.genetics.quality.poor=Poor extrabees.genetics.quality.average=Average extrabees.genetics.quality.good=Good extrabees.genetics.quality.excellent=Excellent - extrabees.genetics.quality.tooltip=%s Quality extrabees.genetics.allele.shortest=Shortest @@ -287,37 +302,38 @@ extrabees.genetics.allele.caveDwelling=Cave Dwelling extrabees.genetics.allele.tolerantFlyer=Rainfall extrabees.genetics.corrupted=Corrupted +extrabees.genetics.requirements.user=Can only be bred by %s -extrabees.branch.barren.name=Barren -extrabees.branch.barren.desc=Although initially these bees are considerably useless due to their meagre combs, they can lead onto greater things. -extrabees.branch.hostile.name=Hostile -extrabees.branch.hostile.desc=Prone to summoning monsters out of the blue, these bees nonetheless make useful if distasteful products. -extrabees.branch.rocky.name=Rocky -extrabees.branch.rocky.desc=Found amoungst the rocks, these bees have very high tolarance to adverse conditions. -extrabees.branch.metallic.name=Rusty -extrabees.branch.metallic2.name=Metallic -extrabees.branch.alloy.name=Alloyed -extrabees.branch.farming.name=Agricultural -extrabees.branch.precious.name=Precious -extrabees.branch.mineral.name=Mineral -extrabees.branch.gemstone.name=Gemstone -extrabees.branch.nuclear.name=Nuclear -extrabees.branch.historic.name=Historic -extrabees.branch.fossilized.name=Fossilised -extrabees.branch.refined.name=Refined -extrabees.branch.aquatic.name=Aquatic -extrabees.branch.saccharine.name=Saccharine -extrabees.branch.volcanic.name=Volcanic -extrabees.branch.viscous.name=Viscous -extrabees.branch.virulent.name=Virulent -extrabees.branch.caustic.name=Caustic -extrabees.branch.energetic.name=Energetic -extrabees.branch.shadow.name=Shadow -extrabees.branch.primary.name=Primary -extrabees.branch.secondary.name=Secondary -extrabees.branch.tertiary.name=Tertiary -extrabees.branch.ftb.name=Beastly -extrabees.branch.quantum.name=Quantum +for.genus.bees.barren=Barren +for.genus.bees.barren.description=Although initially these bees are considerably useless due to their meagre combs, they can lead onto greater things. +for.genus.bees.hostile=Hostile +for.genus.bees.hostile.description=Prone to summoning monsters out of the blue, these bees nonetheless make useful if distasteful products. +for.genus.bees.rocky=Rocky +for.genus.bees.rocky.description=Found amoungst the rocks, these bees have very high tolarance to adverse conditions. +for.genus.bees.metallic=Rusty +for.genus.bees.metallic2=Metallic +for.genus.bees.alloy=Alloyed +for.genus.bees.farming=Agricultural +for.genus.bees.precious=Precious +for.genus.bees.mineral=Mineral +for.genus.bees.gemstone=Gemstone +for.genus.bees.nuclear=Nuclear +for.genus.bees.historic=Historic +for.genus.bees.fossilized=Fossilised +for.genus.bees.refined=Refined +for.genus.bees.aquatic=Aquatic +for.genus.bees.saccharine=Saccharine +for.genus.bees.volcanic=Volcanic +for.genus.bees.viscous=Viscous +for.genus.bees.virulent=Virulent +for.genus.bees.caustic=Caustic +for.genus.bees.energetic=Energetic +for.genus.bees.shadow=Shadow +for.genus.bees.primary=Primary +for.genus.bees.secondary=Secondary +for.genus.bees.tertiary=Tertiary +for.genus.bees.ftb=Beastly +for.genus.bees.quantum=Quantum extrabees.flowers.water.name=Lily Pads extrabees.flowers.sugar.name=Reeds @@ -514,6 +530,9 @@ extrabees.gui.database.tab.species.overview=Overview extrabees.gui.database.tab.species.classification=Classification extrabees.gui.database.tab.species.genome=Genome extrabees.gui.database.tab.species.products=Products +extrabees.gui.database.tab.species.products.everyHours=Every %s hours +extrabees.gui.database.tab.species.products.everyMins=Every %s min. +extrabees.gui.database.tab.species.products.everySecs=Every %s sec. extrabees.gui.database.tab.species.climate=Climate extrabees.gui.database.tab.species.resultant=Resultant Mutations extrabees.gui.database.tab.species.further=Further Mutations diff --git a/src/main/resources/assets/extrabees/lang/ru_RU.lang b/src/main/resources/assets/extrabees/lang/ru_RU.lang index ffce5883..5bc0e942 100644 --- a/src/main/resources/assets/extrabees/lang/ru_RU.lang +++ b/src/main/resources/assets/extrabees/lang/ru_RU.lang @@ -130,6 +130,10 @@ extrabees.item.template.corrupted=повреждённый шаблон extrabees.item.template.name=%s шаблон extrabees.item.template.empty=пустой шаблон +extrabees.item.database=База данных пчеловода +extrabees.item.masterDatabase=База данных пчеловода-мастера +extrabees.item.database.tooltip=Флора-в-коробке + extrabees.item.scentedGear=Ароматная шестерня extrabees.item.diamondShard=Алмазный осколок extrabees.item.emeraldShard=Изумрудный осколок @@ -164,7 +168,6 @@ extrabees.item.cyaniteDust=Цианитовые гранулы extrabees.block.apiaristMachine.name=Базовый механизм пчеловода extrabees.block.geneticMachine.name=Генетическая машина extrabees.block.advGeneticMachine.name=Улучшенная генетическая машина - extrabees.block.ectoplasm.name=Эктоплазма extrabees.block.hive.0=Водный улей @@ -181,32 +184,36 @@ extrabees.liquid.poison=Яд extrabees.liquid.glacial=Жидкий азот extrabees.liquid.dna=Жидкая ДНК -extrabees.acid=Кислота -extrabees.poison=Яд -extrabees.glacial=Жидкий азот - ################################################## ## Machines extrabees.machine.alveay.frame=Хранитель рамок улья extrabees.machine.alveay.frame.info=Хранитель рамок вмещает одну рамку улья для изменения черты пчелы. +extrabees.machine.alveay.frame.tooltip=Рамки + extrabees.machine.alveay.lighting=Осветитель улья extrabees.machine.alveay.lighting.info=Осветитель улья освещает улей ночью для продуктивности пчёл. + extrabees.machine.alveay.mutator=Мутатор улья extrabees.machine.alveay.mutator.info=Мутатор использует определенные предметы для увеличения шанса мутации пчелы. Коэффициент ускорения для катализаторов: Песок душ - 1,5; Жемчуг Эндера - 2; Око Эндера - 4; Урановая руда - 10; Звезда нижнего мира - 50. Несколько мутаторов складывают коэффициенты. При кратности более 10 возможна деградация пчелы. +extrabees.machine.alveay.mutator.tooltip=Мутагены + extrabees.machine.alveay.rainShield=Навес улья extrabees.machine.alveay.rainShield.info=Навес защищает пчёл от дождя. + extrabees.machine.alveay.stimulator=Электростимулятор улья extrabees.machine.alveay.stimulator.info=Использует схемы и энергию, чтобы стимулировать пчел, вместо использования рамок. +extrabees.machine.alveay.stimulator.tooltip=Forestry платы + extrabees.machine.alveay.hatchery=Инкубатор личинок улья extrabees.machine.alveay.hatchery.info=Инкубатор накапливает личинки принцесс внутри улья. +extrabees.machine.alveay.hatchery.tooltip=Личинка + extrabees.machine.alveay.transmission=Электротрансформатор улья extrabees.machine.alveay.transmission.info=Трансформатор принимает и распределяет энергию (RF или EU) для блоков, которые её требуют для работы. - - ################################################## ## Misc @@ -280,7 +287,6 @@ extrabees.genetics.allele.down5=вниз 5 extrabees.genetics.allele.noeffect=отмена эффекта extrabees.genetics.allele.noflower=неопыляющие - extrabees.genetics.allele.lifespan=%s срока жизни extrabees.genetics.allele.production=%s продукции extrabees.genetics.allele.fertility=%s плодовитости @@ -297,65 +303,42 @@ extrabees.genetics.allele.caveDwelling=пещерности extrabees.genetics.allele.tolerantFlyer=дождливости extrabees.genetics.corrupted=повреждено +extrabees.genetics.requirements.user=Может быть выведено только игроком %s # КЛАССЫ ПЧЁЛ -extrabees.branch.botania.name=Мистическая -extrabees.branch.barren.name=Бесплодная -extrabees.branch.barren.desc=Производят бесплодные соты, в которых продукта меньше, чем в обычных сотах. Начальная ветвь для многих других ветвей. -extrabees.branch.hostile.name=Враждебная -extrabees.branch.hostile.desc=Каждая пчела враждебной ветви "имеет связи" с поределенным видом мобов. Способна спавнить этих мобов возле улья. Отличный способ фармить лут от мобов. Остерегайтесь криперов, они взрывают и сами ульи. -extrabees.branch.rocky.name=Скалистая -extrabees.branch.rocky.desc=Начальная ветвь для огромного числа ценных пчел. Очень убогое потомство, но высокая стойкость к условиям. Добываются карьером. -extrabees.branch.metallic.name=Ржавая -extrabees.branch.metallic.desc= -extrabees.branch.metallic2.name=Металлическая -extrabees.branch.metallic2.desc= -extrabees.branch.alloy.name=Сплавовая -extrabees.branch.alloy.desc= -extrabees.branch.farming.name=Сельскохозяйственная -extrabees.branch.farming.desc= -extrabees.branch.precious.name=Драгоценная -extrabees.branch.precious.desc= -extrabees.branch.mineral.name=Минеральная -extrabees.branch.mineral.desc= -extrabees.branch.gemstone.name=Самоцветовая -extrabees.branch.gemstone.desc= -extrabees.branch.nuclear.name=Ядерная -extrabees.branch.nuclear.desc= -extrabees.branch.historic.name=Историческая -extrabees.branch.historic.desc= -extrabees.branch.fossilized.name=Ископаемая -extrabees.branch.fossilized.desc= -extrabees.branch.refined.name=Изысканная -extrabees.branch.refined.desc= -extrabees.branch.aquatic.name=Водная -extrabees.branch.aquatic.desc= -extrabees.branch.saccharine.name=Сахарная -extrabees.branch.saccharine.desc= -extrabees.branch.volcanic.name=Вулканическая -extrabees.branch.volcanic.desc= -extrabees.branch.viscous.name=Вязкая -extrabees.branch.viscous.desc= -extrabees.branch.virulent.name=Заразная -extrabees.branch.virulent.desc= -extrabees.branch.caustic.name=Едкая -extrabees.branch.caustic.desc= -extrabees.branch.energetic.name=Энергетическая -extrabees.branch.energetic.desc= -extrabees.branch.shadow.name=Тёмная -extrabees.branch.shadow.desc= -extrabees.branch.primary.name=Первичная -extrabees.branch.primary.desc= -extrabees.branch.secondary.name=Вторичная -extrabees.branch.secondary.desc= -extrabees.branch.tertiary.name=Третичная -extrabees.branch.tertiary.desc= -extrabees.branch.ftb.name=Мерзкая -extrabees.branch.ftb.desc= -extrabees.branch.quantum.name=Квантовая -extrabees.branch.quantum.desc= +for.genus.bees.botania=Мистическая +for.genus.bees.barren=Бесплодная +for.genus.bees.barren.description=Производят бесплодные соты, в которых продукта меньше, чем в обычных сотах. Начальная ветвь для многих других ветвей. +for.genus.bees.hostile=Враждебная +for.genus.bees.hostile.description=Каждая пчела враждебной ветви "имеет связи" с поределенным видом мобов. Способна спавнить этих мобов возле улья. Отличный способ фармить лут от мобов. Остерегайтесь криперов, они взрывают и сами ульи. +for.genus.bees.rocky=Скалистая +for.genus.bees.rocky.description=Начальная ветвь для огромного числа ценных пчел. Очень убогое потомство, но высокая стойкость к условиям. Добываются карьером. +for.genus.bees.metallic=Ржавая +for.genus.bees.metallic2=Металлическая +for.genus.bees.alloy=Сплавовая +for.genus.bees.farming=Сельскохозяйственная +for.genus.bees.precious=Драгоценная +for.genus.bees.mineral=Минеральная +for.genus.bees.gemstone=Самоцветовая +for.genus.bees.nuclear=Ядерная +for.genus.bees.historic=Историческая +for.genus.bees.fossilized=Ископаемая +for.genus.bees.refined=Изысканная +for.genus.bees.aquatic=Водная +for.genus.bees.saccharine=Сахарная +for.genus.bees.volcanic=Вулканическая +for.genus.bees.viscous=Вязкая +for.genus.bees.virulent=Заразная +for.genus.bees.caustic=Едкая +for.genus.bees.energetic=Энергетическая +for.genus.bees.shadow=Тёмная +for.genus.bees.primary=Первичная +for.genus.bees.secondary=Вторичная +for.genus.bees.tertiary=Третичная +for.genus.bees.ftb=Мерзкая +for.genus.bees.quantum=Квантовая # РАСТЕНИЯ-ОПЫЛИТЕЛИ @@ -723,6 +706,9 @@ extrabees.gui.database.tab.species.overview=Обзор extrabees.gui.database.tab.species.classification=Классификация extrabees.gui.database.tab.species.genome=Генотип extrabees.gui.database.tab.species.products=Продукция +extrabees.gui.database.tab.species.products.everyHours=Каждые %s ч. +extrabees.gui.database.tab.species.products.everyMins=Каждые %s м. +extrabees.gui.database.tab.species.products.everySecs=Каждые %s с. extrabees.gui.database.tab.species.climate=Климат extrabees.gui.database.tab.species.resultant=Произведённые мутации extrabees.gui.database.tab.species.further=Дальнейшие возможные мутации diff --git a/src/main/resources/assets/extrabees/lang/zh_CN.lang b/src/main/resources/assets/extrabees/lang/zh_CN.lang index 29cb1bec..3b3e179a 100644 --- a/src/main/resources/assets/extrabees/lang/zh_CN.lang +++ b/src/main/resources/assets/extrabees/lang/zh_CN.lang @@ -288,36 +288,36 @@ extrabees.genetics.allele.tolerantFlyer=耐雨 extrabees.genetics.corrupted=肮脏的 -extrabees.branch.barren.name=荒芜 -extrabees.branch.barren.desc=虽然一开始它们贫瘠的蜂巢使人们认为它们是无用的蜜蜂,但是它们却可以引发更大的事情. -extrabees.branch.hostile.name=敌对 -extrabees.branch.hostile.desc=这些蜜蜂经常突然召唤怪物,然而它们也有一些出一些令人不快的产物. -extrabees.branch.rocky.name=岩石 -extrabees.branch.rocky.desc=多于岩石中被发现,这些蜜蜂对于极端环境有极强的耐受性。 -extrabees.branch.metallic.name=粉末 -extrabees.branch.metallic2.name=金属 -extrabees.branch.alloy.name=合金 -extrabees.branch.farming.name=农业 -extrabees.branch.precious.name=珍贵 -extrabees.branch.mineral.name=矿物 -extrabees.branch.gemstone.name=宝石 -extrabees.branch.nuclear.name=核能 -extrabees.branch.historic.name=历史 -extrabees.branch.fossilized.name=化石 -extrabees.branch.refined.name=原油 -extrabees.branch.aquatic.name=水生 -extrabees.branch.saccharine.name=甜蜜 -extrabees.branch.volcanic.name=火山 -extrabees.branch.viscous.name=黏液 -extrabees.branch.virulent.name=毒药 -extrabees.branch.caustic.name=腐蚀 -extrabees.branch.energetic.name=充能 -extrabees.branch.shadow.name=暗影 -extrabees.branch.primary.name=一级染料 -extrabees.branch.secondary.name=二级染料 -extrabees.branch.tertiary.name=三级染料 -extrabees.branch.ftb.name=野兽 -extrabees.branch.quantum.name=量子 +for.genus.bees.barren=荒芜 +for.genus.bees.barren.desription=虽然一开始它们贫瘠的蜂巢使人们认为它们是无用的蜜蜂,但是它们却可以引发更大的事情. +for.genus.bees.hostile=敌对 +for.genus.bees.hostile.desription=这些蜜蜂经常突然召唤怪物,然而它们也有一些出一些令人不快的产物. +for.genus.bees.rocky=岩石 +for.genus.bees.rocky.desription=多于岩石中被发现,这些蜜蜂对于极端环境有极强的耐受性。 +for.genus.bees.metallic=粉末 +for.genus.bees.metallic2=金属 +for.genus.bees.alloy=合金 +for.genus.bees.farming=农业 +for.genus.bees.precious=珍贵 +for.genus.bees.mineral=矿物 +for.genus.bees.gemstone=宝石 +for.genus.bees.nuclear=核能 +for.genus.bees.historic=历史 +for.genus.bees.fossilized=化石 +for.genus.bees.refined=原油 +for.genus.bees.aquatic=水生 +for.genus.bees.saccharine=甜蜜 +for.genus.bees.volcanic=火山 +for.genus.bees.viscous=黏液 +for.genus.bees.virulent=毒药 +for.genus.bees.caustic=腐蚀 +for.genus.bees.energetic=充能 +for.genus.bees.shadow=暗影 +for.genus.bees.primary=一级染料 +for.genus.bees.secondary=二级染料 +for.genus.bees.tertiary=三级染料 +for.genus.bees.ftb=野兽 +for.genus.bees.quantum=量子 extrabees.flowers.water.name=睡莲 extrabees.flowers.sugar.name=芦苇 diff --git a/src/main/resources/assets/extratrees/lang/ru_RU.lang b/src/main/resources/assets/extratrees/lang/ru_RU.lang index 643170d1..322fbb47 100644 --- a/src/main/resources/assets/extratrees/lang/ru_RU.lang +++ b/src/main/resources/assets/extratrees/lang/ru_RU.lang @@ -176,7 +176,7 @@ extratrees.block.planks.forestry.maple.desc= extratrees.block.planks.forestry.citrus.desc= extratrees.block.tooltip.twoColors=%s и %s -extratrees.block.tooltip.twoMaterials=%s и %s +extratrees.block.tooltip.twoMaterials=Из %s и %s < %1$s is name of wood used for door > extratrees.block.door.name=Дверь из %1$s