From 2dac035df05b9e445186523bb7881b66bb40fb0d Mon Sep 17 00:00:00 2001 From: Elec332 Date: Sat, 13 May 2017 22:25:40 +0200 Subject: [PATCH] Separation basically done --- .../client => core}/ExtraBeeTexture.java | 2 +- .../binnie/core/craftgui/WindowFieldKit.java | 2 +- .../craftgui/resource/StyleSheetPunnett.java | 2 +- src/main/java/binnie/extrabees/ExtraBees.java | 6 - .../alveary/AbstractAlvearyLogic.java | 9 +- .../alveary/AlvearyLogicFrameHousing.java | 30 +++ .../alveary/AlvearyLogicHatchery.java | 32 +++ .../alveary/AlvearyLogicMutator.java | 31 +++ .../alveary/AlvearyLogicStimulator.java | 42 +++- .../extrabees/alveary/BlockAlveary.java | 15 ++ .../TileEntityExtraBeesAlvearyPart.java | 4 + .../apiary/ComponentBeeModifier.java | 92 ------- .../apiary/ComponentExtraBeeGUI.java | 24 -- .../binnie/extrabees/apiary/ModuleApiary.java | 35 --- .../extrabees/apiary/TileExtraBeeAlveary.java | 204 --------------- .../apiary/machine/AlvearyFrame.java | 112 --------- .../apiary/machine/AlvearyHatchery.java | 81 ------ .../apiary/machine/AlvearyLighting.java | 32 --- .../apiary/machine/AlvearyMachine.java | 71 ------ .../apiary/machine/AlvearyMutator.java | 80 ------ .../apiary/machine/AlvearyRainShield.java | 32 --- .../apiary/machine/AlvearyStimulator.java | 235 ------------------ .../apiary/machine/AlvearyTransmission.java | 74 ------ .../apiary/machine/package-info.java | 9 - .../binnie/extrabees/apiary/package-info.java | 9 - .../binnie/extrabees/client/ExtraBeeGUID.java | 56 ----- .../java/binnie/extrabees/client/GuiHack.java | 134 ---------- .../client/gui/WindowAlvearyFrame.java | 44 ---- .../client/gui/WindowAlvearyHatchery.java | 45 ---- .../gui/WindowAlvearyIndustrialFrame.java | 37 --- .../client/gui/WindowAlvearyMutator.java | 71 ------ .../client/gui/WindowAlvearyStimulator.java | 47 ---- .../extrabees/client/gui/package-info.java | 9 - .../client/gui2/AbstractAlvearyContainer.java | 59 +++++ .../client/gui2/ContainerFrameHousing.java | 24 ++ .../client/gui2/ContainerHatchery.java | 26 ++ .../client/gui2/ContainerMutator.java | 25 ++ .../client/gui2/ContainerStimulator.java | 61 +++++ .../client/gui2/GuiContainerAlvearyPart.java | 48 ++++ .../client/gui2/GuiContainerMutator.java | 43 ++++ .../client/gui2/GuiContainerStimulator.java | 31 +++ .../binnie/extrabees/init/BlockRegister.java | 2 +- .../binnie/extrabees/init/ItemRegister.java | 4 +- .../binnie/extrabees/init/RecipeRegister.java | 15 +- .../genetics/gui/ControlChromoPicker.java | 2 +- .../bee/database/WindowApiaristDatabase.java | 24 +- .../acclimatiser/WindowAcclimatiser.java | 2 +- .../machine/analyser/WindowAnalyser.java | 2 +- .../machine/genepool/WindowGenepool.java | 2 +- .../machine/isolator/WindowIsolator.java | 2 +- .../machine/sequencer/WindowSequencer.java | 2 +- .../extrabees/textures/gui/guiStimulatior.png | Bin 0 -> 2346 bytes .../extrabees/textures/gui/guiframe.png | Bin 0 -> 2015 bytes .../extrabees/textures/gui/guihatchery.png | Bin 0 -> 2166 bytes .../extrabees/textures/gui/guimutator.png | Bin 0 -> 2040 bytes .../assets/extrabees/textures/gui/guinull.png | Bin 0 -> 1970 bytes .../extrabees/textures/gui/guinull2.png | Bin 0 -> 1964 bytes .../extrabees/textures/gui/guinull3.png | Bin 0 -> 1991 bytes .../extrabees/textures/gui/guistimulator.png | Bin 0 -> 2346 bytes .../textures/items/machines/serum.empty.png | Bin 265 -> 0 bytes .../textures/items/validator/serum.0.png | Bin 272 -> 0 bytes .../textures/items/validator/serum.1.png | Bin 287 -> 0 bytes .../textures/blocks/liquids/dna.png | Bin .../textures/blocks/liquids/dna.png.mcmeta | 0 .../textures/blocks/liquids/dna.txt | 0 .../textures/blocks/liquids/molten.png | Bin .../textures/blocks/liquids/molten.png.mcmeta | 0 .../textures/blocks/liquids/molten.txt | 0 .../gui/fromExtraBees}/Acclimatiser.png | Bin .../textures/gui/fromExtraBees}/Database.png | Bin .../textures/gui/fromExtraBees}/Database2.png | Bin .../textures/gui/fromExtraBees}/Genepool.png | Bin .../textures/gui/fromExtraBees}/Indexer.png | Bin .../textures/gui/fromExtraBees}/Indexer2.png | Bin .../gui/fromExtraBees}/Inoculator.png | Bin .../gui/fromExtraBees}/Inoculator2.png | Bin .../textures/gui/fromExtraBees}/Isolator.png | Bin .../textures/gui/fromExtraBees}/Isolator2.png | Bin .../textures/gui/fromExtraBees}/Purifier.png | Bin .../gui/fromExtraBees}/Replicator.png | Bin .../gui/fromExtraBees}/Replicator2.png | Bin .../textures/gui/fromExtraBees}/Sequencer.png | Bin .../textures/gui/fromExtraBees}/Splicer.png | Bin .../textures/gui/fromExtraBees}/Splicer2.png | Bin .../gui/fromExtraBees}/Synthesizer.png | Bin .../gui/fromExtraBees}/alveary_frame.png | Bin .../gui/fromExtraBees}/alveary_mutator.png | Bin .../gui/fromExtraBees}/alveary_stimulator.png | Bin .../textures/gui/fromExtraBees}/processes.png | Bin .../gui/fromExtraBees}/processes2.png | Bin .../textures/gui/fromExtraBees}/punnett.png | Bin .../textures/items/actions/cancel_task.png | Bin .../textures/items/actions/pause_process.png | Bin .../textures/items/bees/jaded/body1.png | Bin .../textures/items/bees/jaded/drone.body2.png | Bin .../items/bees/jaded/drone.body2.png.mcmeta | 0 .../textures/items/bees/jaded/drone.body2.txt | 0 .../items/bees/jaded/drone.outline.png | Bin .../items/bees/jaded/drone.outline.png.mcmeta | 0 .../items/bees/jaded/drone.outline.txt | 0 .../textures/items/bees/jaded/larvae.body.png | Bin .../items/bees/jaded/larvae.body.png.mcmeta | 0 .../textures/items/bees/jaded/larvae.body.txt | 0 .../items/bees/jaded/larvae.body2.png | Bin .../items/bees/jaded/larvae.body2.png.mcmeta | 0 .../items/bees/jaded/larvae.body2.txt | 0 .../items/bees/jaded/larvae.outline.png | Bin .../bees/jaded/larvae.outline.png.mcmeta | 0 .../items/bees/jaded/larvae.outline.txt | 0 .../items/bees/jaded/princess.body2.png | Bin .../bees/jaded/princess.body2.png.mcmeta | 0 .../items/bees/jaded/princess.body2.txt | 0 .../items/bees/jaded/princess.outline.png | Bin .../bees/jaded/princess.outline.png.mcmeta | 0 .../items/bees/jaded/princess.outline.txt | 0 .../textures/items/bees/jaded/queen.body2.png | Bin .../items/bees/jaded/queen.body2.png.mcmeta | 0 .../textures/items/bees/jaded/queen.body2.txt | 0 .../items/bees/jaded/queen.outline.png | Bin .../items/bees/jaded/queen.outline.png.mcmeta | 0 .../items/bees/jaded/queen.outline.txt | 0 .../textures/items/bees/pahi/princess.png | Bin .../textures/items/cast.png | Bin .../textures/items/cast/axe.png | Bin .../textures/items/cast/block.png | Bin .../textures/items/cast/boots.png | Bin .../textures/items/cast/chestplate.png | Bin .../textures/items/cast/gear.png | Bin .../textures/items/cast/helmet.png | Bin .../textures/items/cast/hoe.png | Bin .../textures/items/cast/legging.png | Bin .../textures/items/cast/pickaxe.png | Bin .../textures/items/cast/shovel.png | Bin .../textures/items/helix.png | Bin .../textures/items/icon/discovered_bee.png | Bin .../textures/items/icon/undiscovered_bee.png | Bin .../textures/items/machines/serum_caps.png | Bin .../textures/items/machines/serum_edges.png | Bin .../textures/items/machines/serum_filling.png | Bin .../items/machines/serum_filling.png.mcmeta | 0 .../textures/items/machines/serum_filling.txt | 0 .../textures/items/machines/serum_outline.png | Bin .../items/machines/template.blank.png | Bin .../textures/items/machines/template.edge.png | Bin .../items/machines/template.filling.png | Bin .../textures/items/misc/blutonium_dust.png | Bin .../textures/items/misc/clay_dust.png | Bin .../textures/items/misc/coal_dust.png | Bin .../textures/items/misc/copper_dust.png | Bin .../textures/items/misc/cyanite_dust.png | Bin .../textures/items/misc/diamond_cracked.png | Bin .../textures/items/misc/diamond_shard.png | Bin .../textures/items/misc/dye_black.png | Bin .../textures/items/misc/dye_blue.png | Bin .../textures/items/misc/dye_brown.png | Bin .../textures/items/misc/dye_green.png | Bin .../textures/items/misc/dye_red.png | Bin .../textures/items/misc/dye_white.png | Bin .../textures/items/misc/dye_yellow.png | Bin .../textures/items/misc/emerald_shard.png | Bin .../textures/items/misc/gold_dust.png | Bin .../textures/items/misc/iron_dust.png | Bin .../textures/items/misc/lapis_shard.png | Bin .../textures/items/misc/lead_dust.png | Bin .../textures/items/misc/nickel_dust.png | Bin .../textures/items/misc/platinum_dust.png | Bin .../textures/items/misc/radioactive_dust.png | Bin .../textures/items/misc/ruby_shard.png | Bin .../textures/items/misc/sapphire_shard.png | Bin .../textures/items/misc/scented_gear.png | Bin .../textures/items/misc/silver_dust.png | Bin .../textures/items/misc/tin_beeswax.png | Bin .../textures/items/misc/tin_dust.png | Bin .../textures/items/misc/titanium_dust.png | Bin .../textures/items/misc/tungsten_dust.png | Bin .../textures/items/misc/vial_dna.png | Bin .../textures/items/misc/vial_dna.png.mcmeta | 0 .../textures/items/misc/vial_sterilised.png | Bin .../textures/items/misc/yellorium_dust.png | Bin .../textures/items/misc/zinc_dust.png | Bin .../textures/items/particles/blindness.png | Bin .../textures/items/particles/bonemeal.png | Bin .../textures/items/particles/food.png | Bin .../textures/items/particles/gravity.png | Bin .../textures/items/particles/lightning.png | Bin .../textures/items/particles/meteor.png | Bin .../textures/items/particles/radioactive.png | Bin .../textures/items/particles/water.png | Bin .../textures/items/particles/wither.png | Bin .../textures/items/triggers/can_work.png | Bin .../textures/items/triggers/cannot_work.png | Bin .../items/triggers/is_not_working.png | Bin .../textures/items/triggers/is_working.png | Bin .../items/triggers/no_blank_template.png | Bin .../textures/items/triggers/no_template.png | Bin .../textures/items/triggers/power_full.png | Bin .../textures/items/triggers/power_high.png | Bin .../textures/items/triggers/power_low.png | Bin .../textures/items/triggers/power_medium.png | Bin .../textures/items/triggers/power_none.png | Bin .../textures/items/triggers/serum_empty.png | Bin .../textures/items/triggers/serum_full.png | Bin .../textures/items/triggers/serum_pure.png | Bin .../textures/items/validator/mutator.0.png | Bin .../textures/items/validator/mutator.1.png | Bin .../textures/items/validator/template.0.png | Bin .../textures/items/validator/template.1.png | Bin .../textures/tile/Indexer.png | Bin .../textures/tile/Replicator.png | Bin .../tile/advanced_genetic_machine.png | Bin .../textures/tile/advanced_indexer.png | Bin .../textures/tile/apiarist_databank.png | Bin .../textures/tile/apiarist_machine.png | Bin .../textures/tile/industrial_alveary.png | Bin .../textures/tile/old}/Acclimatiser.png | Bin .../textures/tile/old}/Genepool.png | Bin .../textures/tile/old}/Inoculator.png | Bin .../textures/tile/old}/Isolator.png | Bin .../textures/tile/old}/Purifier.png | Bin .../textures/tile/old}/Sequencer.png | Bin .../textures/tile/old}/Splicer.png | Bin .../textures/tile/old}/Synthesizer.png | Bin .../textures/tile/old}/genetic_machine.png | Bin 223 files changed, 507 insertions(+), 1575 deletions(-) rename src/main/java/binnie/{extrabees/client => core}/ExtraBeeTexture.java (97%) delete mode 100644 src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java delete mode 100644 src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java delete mode 100644 src/main/java/binnie/extrabees/apiary/ModuleApiary.java delete mode 100644 src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.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/AlvearyMachine.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 delete mode 100644 src/main/java/binnie/extrabees/apiary/machine/package-info.java delete mode 100644 src/main/java/binnie/extrabees/apiary/package-info.java delete mode 100644 src/main/java/binnie/extrabees/client/ExtraBeeGUID.java delete mode 100644 src/main/java/binnie/extrabees/client/GuiHack.java delete mode 100644 src/main/java/binnie/extrabees/client/gui/WindowAlvearyFrame.java delete mode 100644 src/main/java/binnie/extrabees/client/gui/WindowAlvearyHatchery.java delete mode 100644 src/main/java/binnie/extrabees/client/gui/WindowAlvearyIndustrialFrame.java delete mode 100644 src/main/java/binnie/extrabees/client/gui/WindowAlvearyMutator.java delete mode 100644 src/main/java/binnie/extrabees/client/gui/WindowAlvearyStimulator.java delete mode 100644 src/main/java/binnie/extrabees/client/gui/package-info.java create mode 100644 src/main/java/binnie/extrabees/client/gui2/AbstractAlvearyContainer.java create mode 100644 src/main/java/binnie/extrabees/client/gui2/ContainerFrameHousing.java create mode 100644 src/main/java/binnie/extrabees/client/gui2/ContainerHatchery.java create mode 100644 src/main/java/binnie/extrabees/client/gui2/ContainerMutator.java create mode 100644 src/main/java/binnie/extrabees/client/gui2/ContainerStimulator.java create mode 100644 src/main/java/binnie/extrabees/client/gui2/GuiContainerAlvearyPart.java create mode 100644 src/main/java/binnie/extrabees/client/gui2/GuiContainerMutator.java create mode 100644 src/main/java/binnie/extrabees/client/gui2/GuiContainerStimulator.java create mode 100644 src/main/resources/assets/extrabees/textures/gui/guiStimulatior.png create mode 100644 src/main/resources/assets/extrabees/textures/gui/guiframe.png create mode 100644 src/main/resources/assets/extrabees/textures/gui/guihatchery.png create mode 100644 src/main/resources/assets/extrabees/textures/gui/guimutator.png create mode 100644 src/main/resources/assets/extrabees/textures/gui/guinull.png create mode 100644 src/main/resources/assets/extrabees/textures/gui/guinull2.png create mode 100644 src/main/resources/assets/extrabees/textures/gui/guinull3.png create mode 100644 src/main/resources/assets/extrabees/textures/gui/guistimulator.png delete mode 100644 src/main/resources/assets/extrabees/textures/items/machines/serum.empty.png delete mode 100644 src/main/resources/assets/extrabees/textures/items/validator/serum.0.png delete mode 100644 src/main/resources/assets/extrabees/textures/items/validator/serum.1.png rename src/main/resources/assets/{extrabees => genetics}/textures/blocks/liquids/dna.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/blocks/liquids/dna.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/blocks/liquids/dna.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/blocks/liquids/molten.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/blocks/liquids/molten.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/blocks/liquids/molten.txt (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Acclimatiser.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Database.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Database2.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Genepool.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Indexer.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Indexer2.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Inoculator.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Inoculator2.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Isolator.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Isolator2.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Purifier.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Replicator.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Replicator2.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Sequencer.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Splicer.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Splicer2.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/Synthesizer.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/alveary_frame.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/alveary_mutator.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/alveary_stimulator.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/processes.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/processes2.png (100%) rename src/main/resources/assets/{extrabees/textures/gui => genetics/textures/gui/fromExtraBees}/punnett.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/actions/cancel_task.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/actions/pause_process.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/body1.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/drone.body2.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/drone.body2.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/drone.body2.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/drone.outline.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/drone.outline.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/drone.outline.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/larvae.body.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/larvae.body.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/larvae.body.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/larvae.body2.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/larvae.body2.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/larvae.body2.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/larvae.outline.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/larvae.outline.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/larvae.outline.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/princess.body2.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/princess.body2.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/princess.body2.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/princess.outline.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/princess.outline.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/princess.outline.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/queen.body2.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/queen.body2.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/queen.body2.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/queen.outline.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/queen.outline.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/jaded/queen.outline.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/bees/pahi/princess.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast/axe.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast/block.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast/boots.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast/chestplate.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast/gear.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast/helmet.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast/hoe.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast/legging.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast/pickaxe.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/cast/shovel.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/helix.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/icon/discovered_bee.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/icon/undiscovered_bee.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/machines/serum_caps.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/machines/serum_edges.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/machines/serum_filling.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/machines/serum_filling.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/machines/serum_filling.txt (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/machines/serum_outline.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/machines/template.blank.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/machines/template.edge.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/machines/template.filling.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/blutonium_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/clay_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/coal_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/copper_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/cyanite_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/diamond_cracked.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/diamond_shard.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/dye_black.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/dye_blue.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/dye_brown.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/dye_green.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/dye_red.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/dye_white.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/dye_yellow.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/emerald_shard.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/gold_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/iron_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/lapis_shard.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/lead_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/nickel_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/platinum_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/radioactive_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/ruby_shard.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/sapphire_shard.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/scented_gear.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/silver_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/tin_beeswax.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/tin_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/titanium_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/tungsten_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/vial_dna.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/vial_dna.png.mcmeta (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/vial_sterilised.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/yellorium_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/misc/zinc_dust.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/particles/blindness.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/particles/bonemeal.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/particles/food.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/particles/gravity.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/particles/lightning.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/particles/meteor.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/particles/radioactive.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/particles/water.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/particles/wither.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/can_work.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/cannot_work.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/is_not_working.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/is_working.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/no_blank_template.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/no_template.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/power_full.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/power_high.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/power_low.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/power_medium.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/power_none.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/serum_empty.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/serum_full.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/triggers/serum_pure.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/validator/mutator.0.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/validator/mutator.1.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/validator/template.0.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/validator/template.1.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/tile/Indexer.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/tile/Replicator.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/tile/advanced_genetic_machine.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/tile/advanced_indexer.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/tile/apiarist_databank.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/tile/apiarist_machine.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/tile/industrial_alveary.png (100%) rename src/main/resources/assets/{extrabees/textures/tile => genetics/textures/tile/old}/Acclimatiser.png (100%) rename src/main/resources/assets/{extrabees/textures/tile => genetics/textures/tile/old}/Genepool.png (100%) rename src/main/resources/assets/{extrabees/textures/tile => genetics/textures/tile/old}/Inoculator.png (100%) rename src/main/resources/assets/{extrabees/textures/tile => genetics/textures/tile/old}/Isolator.png (100%) rename src/main/resources/assets/{extrabees/textures/tile => genetics/textures/tile/old}/Purifier.png (100%) rename src/main/resources/assets/{extrabees/textures/tile => genetics/textures/tile/old}/Sequencer.png (100%) rename src/main/resources/assets/{extrabees/textures/tile => genetics/textures/tile/old}/Splicer.png (100%) rename src/main/resources/assets/{extrabees/textures/tile => genetics/textures/tile/old}/Synthesizer.png (100%) rename src/main/resources/assets/{extrabees/textures/tile => genetics/textures/tile/old}/genetic_machine.png (100%) diff --git a/src/main/java/binnie/extrabees/client/ExtraBeeTexture.java b/src/main/java/binnie/core/ExtraBeeTexture.java similarity index 97% rename from src/main/java/binnie/extrabees/client/ExtraBeeTexture.java rename to src/main/java/binnie/core/ExtraBeeTexture.java index c756d90e..c71010c8 100644 --- a/src/main/java/binnie/extrabees/client/ExtraBeeTexture.java +++ b/src/main/java/binnie/core/ExtraBeeTexture.java @@ -1,4 +1,4 @@ -package binnie.extrabees.client; +package binnie.core; import binnie.Binnie; import binnie.core.resource.BinnieResource; diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index 589147d9..6aad145b 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -18,7 +18,7 @@ import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.resource.StyleSheetPunnett; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.machines.inventory.SlotValidator; -import binnie.extrabees.client.ExtraBeeTexture; +import binnie.core.ExtraBeeTexture; import binnie.genetics.gui.ControlChromosome; import binnie.genetics.machine.analyser.Analyser; import forestry.api.genetics.*; diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java b/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java index c560dd68..6a8500ff 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java @@ -3,7 +3,7 @@ package binnie.core.craftgui.resource; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.craftgui.resource.minecraft.PaddedTexture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.client.ExtraBeeTexture; +import binnie.core.ExtraBeeTexture; import binnie.genetics.gui.punnett.ExtraBeeGUITexture; public class StyleSheetPunnett extends StyleSheet { diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 2b73a825..27e05490 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,7 +1,6 @@ package binnie.extrabees; import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart; -import binnie.extrabees.client.GuiHack; import binnie.extrabees.genetics.ExtraBeeMutation; import binnie.extrabees.genetics.ExtraBeesBranch; import binnie.extrabees.genetics.ExtraBeesFlowers; @@ -67,7 +66,6 @@ public class ExtraBees { @Mod.EventHandler @SuppressWarnings("all") public void preInit(final FMLPreInitializationEvent event) { - GuiHack.INSTANCE.preInit(); materialBeehive = new MaterialBeehive(); configHandler = new ConfigHandler(event.getSuggestedConfigurationFile()); @@ -92,8 +90,6 @@ public class ExtraBees { @Mod.EventHandler public void init(final FMLInitializationEvent evt) { - GuiHack.INSTANCE.init(); - configHandler.reload(true); ItemHoneyComb.addSubtypes(); GameRegistry.registerWorldGenerator(new ExtraBeesWorldGenerator(), 0); @@ -105,8 +101,6 @@ public class ExtraBees { @Mod.EventHandler public void postInit(final FMLPostInitializationEvent evt) { - GuiHack.INSTANCE.postInit(); - BlockRegister.postInitBlocks(); RecipeRegister.postInitRecipes(); //Register mutations diff --git a/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java b/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java index 2e73028a..95844e90 100644 --- a/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java +++ b/src/main/java/binnie/extrabees/alveary/AbstractAlvearyLogic.java @@ -1,5 +1,6 @@ package binnie.extrabees.alveary; +import binnie.extrabees.client.gui2.AbstractAlvearyContainer; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; @@ -102,12 +103,10 @@ public abstract class AbstractAlvearyLogic implements IBeeModifier, IBeeListener } @Nullable - public Container getContainer(@Nonnull EntityPlayer player, int data) { + public AbstractAlvearyContainer getContainer(@Nonnull EntityPlayer player, int data) { return null; } - - @Override public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return false; @@ -123,4 +122,8 @@ public abstract class AbstractAlvearyLogic implements IBeeModifier, IBeeListener return null; } + public boolean hasGui(){ + return false; + } + } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java index d55654a3..aa0f8b7f 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicFrameHousing.java @@ -1,5 +1,8 @@ package binnie.extrabees.alveary; +import binnie.extrabees.client.gui2.AbstractAlvearyContainer; +import binnie.extrabees.client.gui2.ContainerFrameHousing; +import binnie.extrabees.client.gui2.GuiContainerAlvearyPart; import binnie.extrabees.utils.Utils; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; @@ -7,7 +10,11 @@ import forestry.api.apiculture.IBeeRoot; import forestry.api.apiculture.IHiveFrame; import forestry.api.multiblock.IAlvearyController; import forestry.api.multiblock.IMultiblockLogicAlveary; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; @@ -20,12 +27,17 @@ import javax.annotation.Nullable; public class AlvearyLogicFrameHousing extends AbstractAlvearyLogic { public AlvearyLogicFrameHousing(TileEntityExtraBeesAlvearyPart tile){ + this.tile = tile; inv = new ItemStackHandler(1); } private TileEntityExtraBeesAlvearyPart tile; private final IItemHandlerModifiable inv; + public IItemHandlerModifiable getInventory() { + return inv; + } + @Override public void wearOutEquipment(final int amount) { IHiveFrame hiveFrame = this.getHiveFrame(); @@ -78,4 +90,22 @@ public class AlvearyLogicFrameHousing extends AbstractAlvearyLogic { return (this.getHiveFrame() == null) ? 1.0f : this.getHiveFrame().getBeeModifier().getFloweringModifier(genome, currentModifier); } + @Nullable + @Override + @SideOnly(Side.CLIENT) + public GuiContainer getGui(@Nonnull EntityPlayer player, int data) { + return new GuiContainerAlvearyPart(getContainer(player, data)); + } + + @Nullable + @Override + public AbstractAlvearyContainer getContainer(@Nonnull EntityPlayer player, int data) { + return new ContainerFrameHousing(player, this); + } + + @Override + public boolean hasGui() { + return true; + } + } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java index 52d73583..b0d01cc8 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicHatchery.java @@ -1,14 +1,24 @@ package binnie.extrabees.alveary; +import binnie.extrabees.client.gui2.AbstractAlvearyContainer; +import binnie.extrabees.client.gui2.ContainerHatchery; +import binnie.extrabees.client.gui2.GuiContainerAlvearyPart; import binnie.extrabees.utils.Utils; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeRoot; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + /** * Created by Elec332 on 13-5-2017. */ @@ -20,6 +30,10 @@ public class AlvearyLogicHatchery extends AbstractAlvearyLogic { private final IItemHandlerModifiable inv; + public IItemHandlerModifiable getInventory() { + return inv; + } + @Override public void updateServer(TileEntityExtraBeesAlvearyPart tile) { if (tile.getWorldObj().rand.nextInt(2400) == 0) { @@ -40,4 +54,22 @@ public class AlvearyLogicHatchery extends AbstractAlvearyLogic { } } + @Nullable + @Override + @SideOnly(Side.CLIENT) + public GuiContainer getGui(@Nonnull EntityPlayer player, int data) { + return new GuiContainerAlvearyPart(getContainer(player, data)); + } + + @Nullable + @Override + public AbstractAlvearyContainer getContainer(@Nonnull EntityPlayer player, int data) { + return new ContainerHatchery(player, this); + } + + @Override + public boolean hasGui() { + return true; + } + } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java index d74028c6..224ea453 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicMutator.java @@ -1,12 +1,21 @@ package binnie.extrabees.alveary; +import binnie.extrabees.client.gui2.AbstractAlvearyContainer; +import binnie.extrabees.client.gui2.ContainerMutator; +import binnie.extrabees.client.gui2.GuiContainerAlvearyPart; +import binnie.extrabees.client.gui2.GuiContainerMutator; import binnie.extrabees.utils.AlvearyMutationHandler; import forestry.api.apiculture.IBeeGenome; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; import javax.annotation.Nonnull; +import javax.annotation.Nullable; /** * Created by Elec332 on 13-5-2017. @@ -19,6 +28,10 @@ public class AlvearyLogicMutator extends AbstractAlvearyLogic { private final IItemHandlerModifiable inv; + public IItemHandlerModifiable getInventory() { + return inv; + } + @Override public float getMutationModifier(@Nonnull IBeeGenome genome, @Nonnull IBeeGenome mate, float currentModifier) { ItemStack mutator = inv.getStackInSlot(0); @@ -31,4 +44,22 @@ public class AlvearyLogicMutator extends AbstractAlvearyLogic { inv.extractItem(0, 1, false); } + @Nullable + @Override + @SideOnly(Side.CLIENT) + public GuiContainer getGui(@Nonnull EntityPlayer player, int data) { + return new GuiContainerMutator(getContainer(player, data)); + } + + @Nullable + @Override + public AbstractAlvearyContainer getContainer(@Nonnull EntityPlayer player, int data) { + return new ContainerMutator(player, this); + } + + @Override + public boolean hasGui() { + return true; + } + } diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java index f58e8ce1..cc227f1f 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicStimulator.java @@ -1,11 +1,18 @@ package binnie.extrabees.alveary; import binnie.extrabees.circuit.StimulatorCircuit; +import binnie.extrabees.client.gui2.AbstractAlvearyContainer; +import binnie.extrabees.client.gui2.ContainerStimulator; +import binnie.extrabees.client.gui2.GuiContainerAlvearyPart; +import binnie.extrabees.client.gui2.GuiContainerStimulator; +import com.google.common.collect.Lists; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeModifier; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.items.IItemHandlerModifiable; @@ -25,7 +32,7 @@ public class AlvearyLogicStimulator extends AbstractAlvearyLogic { this.powerUsage = 0; this.powered = false; this.modifiers = new StimulatorCircuit[0]; - this.energyStorage = new EnergyStorage(2000); + this.energyStorage = new EnergyStorage(10000); this.inv = new ItemStackHandler(1); } @@ -34,6 +41,11 @@ public class AlvearyLogicStimulator extends AbstractAlvearyLogic { private StimulatorCircuit[] modifiers; private final IEnergyStorage energyStorage; private final IItemHandlerModifiable inv; + private final List containers = Lists.newArrayList(); + + public IItemHandlerModifiable getInventory() { + return inv; + } @Override public void updateServer(TileEntityExtraBeesAlvearyPart tile) { @@ -43,6 +55,17 @@ public class AlvearyLogicStimulator extends AbstractAlvearyLogic { this.powerUsage += beeMod.getPowerUsage(); } this.powered = energyStorage.extractEnergy(powerUsage, true) >= powerUsage; + for (ContainerStimulator c : containers){ + c.checkPower(); + } + } + + public void onContainerOpened(ContainerStimulator container){ + containers.add(container); + } + + public void onGuiClosed(ContainerStimulator container){ + containers.remove(container); } @Nullable @@ -202,4 +225,21 @@ public class AlvearyLogicStimulator extends AbstractAlvearyLogic { return energyStorage; } + @Nullable + @Override + public GuiContainer getGui(@Nonnull EntityPlayer player, int data) { + return new GuiContainerStimulator(getContainer(player, data)); + } + + @Nullable + @Override + public ContainerStimulator getContainer(@Nonnull EntityPlayer player, int data) { + return new ContainerStimulator(player, this); + } + + @Override + public boolean hasGui() { + return true; + } + } diff --git a/src/main/java/binnie/extrabees/alveary/BlockAlveary.java b/src/main/java/binnie/extrabees/alveary/BlockAlveary.java index 27990aa6..949b8507 100644 --- a/src/main/java/binnie/extrabees/alveary/BlockAlveary.java +++ b/src/main/java/binnie/extrabees/alveary/BlockAlveary.java @@ -1,16 +1,22 @@ package binnie.extrabees.alveary; import forestry.apiculture.MaterialBeehive; +import forestry.core.gui.GuiHandler; +import forestry.core.tiles.TileUtil; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import javax.annotation.Nonnull; @@ -29,6 +35,15 @@ public class BlockAlveary extends Block implements ITileEntityProvider { private static final PropertyEnum TYPE = PropertyEnum.create("type", AlvearyLogicType.class); + @Override + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + TileEntityExtraBeesAlvearyPart tile = TileUtil.getTile(worldIn, pos, TileEntityExtraBeesAlvearyPart.class); + if (tile != null && tile.hasGui()){ + GuiHandler.openGui(playerIn, tile); + } + return true; + } + @Nullable @Override public TileEntity createNewTileEntity(@Nonnull World worldIn, int meta) { diff --git a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java b/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java index 03b89107..d7870c3d 100644 --- a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java +++ b/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java @@ -53,6 +53,10 @@ public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry private AlvearyLogicType type; private AbstractAlvearyLogic alvearyLogic; + public boolean hasGui(){ + return alvearyLogic.hasGui(); + } + @Nonnull public AbstractAlvearyLogic getAlvearyLogic() { return alvearyLogic; diff --git a/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java b/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java deleted file mode 100644 index 85806bac..00000000 --- a/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java +++ /dev/null @@ -1,92 +0,0 @@ -package binnie.extrabees.apiary; - -import binnie.core.machines.Machine; -import binnie.core.machines.MachineComponent; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nullable; - -public class ComponentBeeModifier extends MachineComponent implements IBeeModifier, IBeeListener { - public ComponentBeeModifier(final Machine machine) { - super(machine); - } - - @Override - public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) { - return 1.0f; - } - - @Override - public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { - return 1.0f; - } - - @Override - public float getLifespanModifier(final IBeeGenome genome, @Nullable final IBeeGenome mate, final float currentModifier) { - return 1.0f; - } - - @Override - public float getProductionModifier(final IBeeGenome genome, final float currentModifier) { - return 1.0f; - } - - @Override - public float getFloweringModifier(final IBeeGenome genome, final float currentModifier) { - return 1.0f; - } - - @Override - public boolean isSealed() { - return false; - } - - @Override - public boolean isSelfLighted() { - return false; - } - - @Override - public boolean isSunlightSimulated() { - return false; - } - - @Override - public boolean isHellish() { - return false; - } - - public void onQueenChange(final ItemStack queen) { - } - - @Override - public void wearOutEquipment(final int amount) { - } - - public void onPostQueenDeath(final IBee queen) { - } - - public boolean onEggLaid(final IBee queen) { - return false; - } - - @Override - public float getGeneticDecay(final IBeeGenome genome, final float currentModifier) { - return 1.0f; - } - - @Override - public boolean onPollenRetrieved(IIndividual individual) { - return false; - } - - @Override - public void onQueenDeath() { - - } -} diff --git a/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java b/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java deleted file mode 100644 index e2a1ddd1..00000000 --- a/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java +++ /dev/null @@ -1,24 +0,0 @@ -package binnie.extrabees.apiary; - -import binnie.core.machines.Machine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.component.IInteraction; -import binnie.extrabees.client.GuiHack; -import binnie.extrabees.client.ExtraBeeGUID; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class ComponentExtraBeeGUI extends MachineComponent implements IInteraction.RightClick { - ExtraBeeGUID id; - - public ComponentExtraBeeGUI(final Machine machine, final ExtraBeeGUID id) { - super(machine); - this.id = id; - } - - @Override - public void onRightClick(final World world, final EntityPlayer player, final BlockPos pos) { - GuiHack.INSTANCE.openGui(this.id, player, pos); - } -} diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java deleted file mode 100644 index bca2ac05..00000000 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ /dev/null @@ -1,35 +0,0 @@ -package binnie.extrabees.apiary; - -import binnie.core.IInitializable; -import binnie.core.machines.MachineGroup; -import binnie.core.machines.inventory.ValidatorSprite; -import binnie.extrabees.apiary.machine.AlvearyMachine; -import binnie.extrabees.client.GuiHack; -import binnie.extrabees.circuit.BinnieCircuitLayout; -import forestry.api.core.Tabs; -import net.minecraft.block.Block; -import net.minecraftforge.fml.common.registry.GameRegistry; - -public class ModuleApiary implements IInitializable { - - public static Block blockComponent; - public static ValidatorSprite spriteMutator; - - @Override - public void preInit() { - final MachineGroup machineGroup = new MachineGroup(GuiHack.INSTANCE, "alveay", "alveary", AlvearyMachine.values()); - machineGroup.setCreativeTab(Tabs.tabApiculture); - GameRegistry.registerTileEntity(TileExtraBeeAlveary.class, "extrabees.tile.alveary"); - ModuleApiary.blockComponent = machineGroup.getBlock(); - - } - - @Override - public void postInit() { - } - - @Override - public void init() { - ModuleApiary.spriteMutator = new ValidatorSprite(GuiHack.INSTANCE, "validator/mutator.0", "validator/mutator.1"); - } -} diff --git a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java deleted file mode 100644 index 6370956d..00000000 --- a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java +++ /dev/null @@ -1,204 +0,0 @@ -package binnie.extrabees.apiary; - -import binnie.core.machines.TileEntityMachine; -import binnie.extrabees.apiary.machine.AlvearyMachine; -import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import forestry.api.genetics.IIndividual; -import forestry.api.multiblock.*; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; - -import javax.annotation.Nullable; -import java.util.LinkedList; -import java.util.List; - -public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyComponent.Active, IAlvearyComponent.BeeModifier, IAlvearyComponent.BeeListener, IBeeListener, IBeeModifier { - private IMultiblockLogicAlveary structureLogic; - @Nullable - private BlockPos min; - @Nullable - private BlockPos max; - - public TileExtraBeeAlveary() { - this.structureLogic = MultiblockManager.logicFactory.createAlvearyLogic(); - } - - public TileExtraBeeAlveary(final AlvearyMachine.AlvearyPackage alvearyPackage) { - super(alvearyPackage); - this.structureLogic = MultiblockManager.logicFactory.createAlvearyLogic(); - } - - @Override - public BlockPos getCoordinates() { - return getPos(); - } - - @Override - public GameProfile getOwner() { - return getMachine().getOwner(); - } - - public List getAlvearyBlocks() { - LinkedList tiles = new LinkedList<>(); - if (min != null && max != null) { - for (int x = min.getX(); x <= max.getX(); ++x) { - for (int z = min.getZ(); z <= max.getZ(); ++z) { - for (int y = min.getY(); y <= max.getY(); ++y) { - TileEntity tile = this.getWorld().getTileEntity(new BlockPos(x, y, z)); - if (tile instanceof IMultiblockComponent) { - tiles.add(tile); - } - } - } - } - } - return tiles; - } - - @Override - public void onMachineAssembled(IMultiblockController arg0, BlockPos min, BlockPos max) { - this.min = min; - this.max = max; - } - - @Override - public void onMachineBroken() { - this.min = null; - this.max = null; - - } - - @Override - public IMultiblockLogicAlveary getMultiblockLogic() { - return structureLogic; - } - - @Override - public void updateClient(int arg0) { - super.update(); - } - - @Override - public void updateServer(int arg0) { - super.update(); - } - - @Override - public void invalidate() { - super.invalidate(); - structureLogic.invalidate(world, this); - } - - @Override - public void onChunkUnload() { - super.onChunkUnload(); - structureLogic.onChunkUnload(world, this); - } - - @Override - public void validate() { - structureLogic.validate(world, this); - } - - @Override - public IBeeModifier getBeeModifier() { - return this.getMachine().getInterface(IBeeModifier.class); - } - - @Override - public IBeeListener getBeeListener() { - return this.getMachine().getInterface(IBeeListener.class); - } - - @Override - public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) { - return (this.getBeeModifier() == null) ? 1.0f : this.getBeeModifier().getTerritoryModifier(genome, currentModifier); - } - - @Override - public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { - return (this.getBeeModifier() == null) ? 1.0f : this.getBeeModifier().getMutationModifier(genome, mate, currentModifier); - } - - @Override - public float getLifespanModifier(final IBeeGenome genome, @Nullable final IBeeGenome mate, final float currentModifier) { - return (this.getBeeModifier() == null) ? 1.0f : this.getBeeModifier().getLifespanModifier(genome, mate, currentModifier); - } - - @Override - public float getProductionModifier(final IBeeGenome genome, final float currentModifier) { - return (this.getBeeModifier() == null) ? 1.0f : this.getBeeModifier().getProductionModifier(genome, currentModifier); - } - - @Override - public float getFloweringModifier(final IBeeGenome genome, final float currentModifier) { - return (this.getBeeModifier() == null) ? 1.0f : this.getBeeModifier().getFloweringModifier(genome, currentModifier); - } - - @Override - public boolean isSealed() { - return this.getBeeModifier() != null && this.getBeeModifier().isSealed(); - } - - @Override - public boolean isSelfLighted() { - return this.getBeeModifier() != null && this.getBeeModifier().isSelfLighted(); - } - - @Override - public boolean isSunlightSimulated() { - return this.getBeeModifier() != null && this.getBeeModifier().isSunlightSimulated(); - } - - @Override - public boolean isHellish() { - return this.getBeeModifier() != null && this.getBeeModifier().isHellish(); - } - - @Override - public void wearOutEquipment(int amount) { - if (this.getBeeListener() != null) { - this.getBeeListener().wearOutEquipment(amount); - } - } - - @Override - public void onQueenDeath() { - if (this.getBeeListener() != null) { - this.getBeeListener().onQueenDeath(); - } - } - - @Override - public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return 1.0f; - } - - @Override - public boolean onPollenRetrieved(IIndividual arg0) { - return false; - } - - @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbtTagCompound2) { - NBTTagCompound nbtTagCompound = super.writeToNBT(nbtTagCompound2); - NBTTagCompound tag = new NBTTagCompound(); - structureLogic.writeToNBT(tag); - nbtTagCompound.setTag("structureLogic", tag); - return nbtTagCompound; - } - - @Override - public void readFromNBT(NBTTagCompound nbtTagCompound) { - super.readFromNBT(nbtTagCompound); - NBTTagCompound tag = nbtTagCompound.getCompoundTag("structureLogic"); - if (tag != null) { - structureLogic.readFromNBT(tag); - } - } - -} 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 8be32054..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java +++ /dev/null @@ -1,112 +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.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.apiary.ComponentExtraBeeGUI; -import binnie.extrabees.apiary.TileExtraBeeAlveary; -import binnie.extrabees.client.ExtraBeeGUID; -import binnie.extrabees.client.ExtraBeeTexture; -import binnie.extrabees.utils.Utils; -import forestry.api.apiculture.*; -import forestry.api.multiblock.IAlvearyController; -import forestry.api.multiblock.IMultiblockLogicAlveary; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import javax.annotation.Nullable; - -public class AlvearyFrame { - public static int slotFrame = 0; - - public static class PackageAlvearyFrame extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyFrame() { - super("frame", ExtraBeeTexture.AlvearyFrame, false); - } - - @Override - public void createMachine(final Machine machine) { - new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyFrame); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(AlvearyFrame.slotFrame, "frame").setValidator(new SlotValidatorFrame()); - new ComponentFrameModifier(machine); - } - } - - public static class SlotValidatorFrame extends SlotValidator { - public SlotValidatorFrame() { - super(SlotValidator.spriteFrame); - } - - @Override - public boolean isValid(final ItemStack itemStack) { - return !itemStack.isEmpty() && itemStack.getItem() instanceof IHiveFrame; - } - - @Override - public String getTooltip() { - return "Hive Frames"; - } - } - - public static class ComponentFrameModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentFrameModifier(final Machine machine) { - super(machine); - } - - @Override - public void wearOutEquipment(final int amount) { - IHiveFrame hiveFrame = this.getHiveFrame(); - if (hiveFrame != null) { - final World world = this.getMachine().getTileEntity().getWorld(); - IBeeRoot beeRoot = Utils.getBeeRoot(); - IMultiblockLogicAlveary multiblockLogic = ((TileExtraBeeAlveary) this.getMachine().getTileEntity()).getMultiblockLogic(); - IAlvearyController alvearyController = multiblockLogic.getController(); - ItemStack queenStack = alvearyController.getBeeInventory().getQueen(); - IBee queen = beeRoot.getMember(queenStack); - if (queen != null) { - final int wear = Math.round(amount * 5 * beeRoot.getBeekeepingMode(world).getWearModifier()); - ItemStack frame = this.getInventory().getStackInSlot(AlvearyFrame.slotFrame); - ItemStack frameUsed = hiveFrame.frameUsed(alvearyController, frame, queen, wear); - this.getInventory().setInventorySlotContents(AlvearyFrame.slotFrame, frameUsed); - } - } - } - - @Nullable - public IHiveFrame getHiveFrame() { - ItemStack stackInSlot = this.getInventory().getStackInSlot(AlvearyFrame.slotFrame); - if (!stackInSlot.isEmpty()) { - return (IHiveFrame) stackInSlot.getItem(); - } - return null; - } - - @Override - public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) { - return (this.getHiveFrame() == null) ? 1.0f : this.getHiveFrame().getBeeModifier().getTerritoryModifier(genome, currentModifier); - } - - @Override - public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { - return (this.getHiveFrame() == null) ? 1.0f : this.getHiveFrame().getBeeModifier().getMutationModifier(genome, mate, currentModifier); - } - - @Override - public float getLifespanModifier(final IBeeGenome genome, @Nullable final IBeeGenome mate, final float currentModifier) { - return (this.getHiveFrame() == null) ? 1.0f : this.getHiveFrame().getBeeModifier().getLifespanModifier(genome, mate, currentModifier); - } - - @Override - public float getProductionModifier(final IBeeGenome genome, final float currentModifier) { - return (this.getHiveFrame() == null) ? 1.0f : this.getHiveFrame().getBeeModifier().getProductionModifier(genome, currentModifier); - } - - @Override - public float getFloweringModifier(final IBeeGenome genome, final float currentModifier) { - return (this.getHiveFrame() == null) ? 1.0f : this.getHiveFrame().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 a91232bf..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java +++ /dev/null @@ -1,81 +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.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.client.ExtraBeeGUID; -import binnie.extrabees.client.ExtraBeeTexture; -import binnie.extrabees.utils.Utils; -import forestry.api.apiculture.*; -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, false); - } - - @Override - public void createMachine(final Machine machine) { - new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyHatchery); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - for (final InventorySlot slot : inventory.addSlotArray(AlvearyHatchery.slotLarvae, "hatchery")) { - slot.setValidator(new SlotValidatorLarvae()); - } - new ComponentFrameModifier(machine); - } - } - - public static class SlotValidatorLarvae extends SlotValidator { - public SlotValidatorLarvae() { - super(SlotValidator.spriteBee); - } - - @Override - public boolean isValid(final ItemStack itemStack) { - IBeeRoot beeRoot = Utils.getBeeRoot(); - return beeRoot.isMember(itemStack) && beeRoot.getType(itemStack) == EnumBeeType.LARVAE; - } - - @Override - public String getTooltip() { - return "Larvae"; - } - } - - public static class ComponentFrameModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentFrameModifier(final Machine machine) { - super(machine); - } - - @Override - public void onUpdate() { - if (new Random().nextInt(2400) == 0) { - final TileEntity tile = this.getMachine().getTileEntity(); - if (tile instanceof TileExtraBeeAlveary) { - final IBeeHousing house = ((TileExtraBeeAlveary) tile).getMultiblockLogic().getController(); - if (house != null && !house.getErrorLogic().hasErrors()) { - final ItemStack queenStack = house.getBeeInventory().getQueen(); - IBeeRoot beeRoot = Utils.getBeeRoot(); - final IBee queen = (queenStack.isEmpty()) ? null : beeRoot.getMember(queenStack); - if (queen != null) { - final ItemStack larvae = beeRoot.getMemberStack(beeRoot.getBee(queen.getGenome()), EnumBeeType.LARVAE); - new TransferRequest(larvae, this.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 acd68d9a..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.client.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, false); - } - - @Override - public void createMachine(final Machine machine) { - new ComponentLighting(machine); - } - } - - public static class ComponentLighting extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentLighting(final 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 deleted file mode 100644 index af16c2ab..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java +++ /dev/null @@ -1,71 +0,0 @@ -package binnie.extrabees.apiary.machine; - -import binnie.core.machines.IMachineType; -import binnie.core.machines.Machine; -import binnie.core.machines.MachinePackage; -import binnie.core.machines.MachineRendererBlock; -import binnie.core.resource.IBinnieTexture; -import binnie.extrabees.apiary.ModuleApiary; -import binnie.extrabees.apiary.TileExtraBeeAlveary; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -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); - - Class clss; - - AlvearyMachine(final Class clss) { - this.clss = clss; - } - - @Override - public Class getPackageClass() { - return this.clss; - } - - public ItemStack get(final int size) { - return new ItemStack(ModuleApiary.blockComponent, size, this.ordinal()); - } - - @Override - public boolean isActive() { - return true; - } - - public abstract static class AlvearyPackage extends MachinePackage { - private final IBinnieTexture machineTexture; - - public AlvearyPackage(final String id, final IBinnieTexture machineTexture, final boolean powered) { - super(id, powered); - this.machineTexture = machineTexture; - } - - @Override - public void createMachine(final Machine machine) { - } - - @Override - public TileEntity createTileEntity() { - return new TileExtraBeeAlveary(this); - } - - @Override - public void register() { - } - - @Override - @SideOnly(Side.CLIENT) - public void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage) { - MachineRendererBlock.instance.renderMachine(this.machineTexture.getTexture(), x, y, z, partialTicks); - } - } -} 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 3836edf1..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java +++ /dev/null @@ -1,80 +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.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.apiary.ComponentExtraBeeGUI; -import binnie.extrabees.apiary.ModuleApiary; -import binnie.extrabees.client.ExtraBeeGUID; -import binnie.extrabees.client.ExtraBeeTexture; -import binnie.extrabees.utils.AlvearyMutationHandler; -import forestry.api.apiculture.IBee; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import org.apache.commons.lang3.tuple.Pair; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import static org.apache.commons.lang3.ObjectUtils.firstNonNull; - -public class AlvearyMutator { - public static int slotMutator = 0; - - public static class PackageAlvearyMutator extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyMutator() { - super("mutator", ExtraBeeTexture.AlvearyMutator, false); - } - - @Override - public void createMachine(final Machine machine) { - new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyMutator); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(AlvearyMutator.slotMutator, "mutator").setValidator(new SlotValidatorMutator()); - new ComponentMutatorModifier(machine); - } - } - - public static class SlotValidatorMutator extends SlotValidator { - public SlotValidatorMutator() { - super(ModuleApiary.spriteMutator); - } - - @Override - public boolean isValid(final ItemStack itemStack) { - return AlvearyMutationHandler.isMutationItem(itemStack); - } - - @Override - public String getTooltip() { - return "Mutagenic Agents"; - } - } - - public static class ComponentMutatorModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentMutatorModifier(final Machine machine) { - super(machine); - } - - @Override - public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { - ItemStack mutator = this.getUtil().getStack(AlvearyMutator.slotMutator); - final float mult = AlvearyMutationHandler.getMutationMult(mutator); - return Math.min(mult * currentModifier, 15f); - } - - @Override - public void onPostQueenDeath(final IBee queen) { - this.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 173acf41..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.client.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, false); - } - - @Override - public void createMachine(final Machine machine) { - new ComponentRainShield(machine); - } - } - - public static class ComponentRainShield extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentRainShield(final 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 1f043ef4..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java +++ /dev/null @@ -1,235 +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.power.ComponentPowerReceptor; -import binnie.extrabees.apiary.ComponentBeeModifier; -import binnie.extrabees.apiary.ComponentExtraBeeGUI; -import binnie.extrabees.circuit.StimulatorCircuit; -import binnie.extrabees.client.ExtraBeeGUID; -import binnie.extrabees.client.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 net.minecraft.item.ItemStack; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - -public class AlvearyStimulator { - public static int slotCircuit = 0; - - public static class PackageAlvearyStimulator extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyStimulator() { - super("stimulator", ExtraBeeTexture.AlvearyStimulator, true); - } - - @Override - public void createMachine(final Machine machine) { - new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyStimulator); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(AlvearyStimulator.slotCircuit, "circuit").setValidator(new SlotValidatorCircuit()); - final ComponentPowerReceptor power = new ComponentPowerReceptor(machine); - new ComponentStimulatorModifier(machine); - } - } - - public static class SlotValidatorCircuit extends SlotValidator { - public SlotValidatorCircuit() { - super(SlotValidator.spriteCircuit); - } - - @Override - public boolean isValid(final ItemStack itemStack) { - return !itemStack.isEmpty() && ChipsetManager.circuitRegistry.isChipset(itemStack); - } - - @Override - public String getTooltip() { - return "Forestry Circuits"; - } - } - - public static class ComponentStimulatorModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - float powerUsage; - boolean powered; - StimulatorCircuit[] modifiers; - - public ComponentStimulatorModifier(final Machine machine) { - super(machine); - this.powerUsage = 0.0f; - this.powered = false; - this.modifiers = new StimulatorCircuit[0]; - } - - @Override - public void onUpdate() { - super.onUpdate(); - this.modifiers = this.getCircuits(); - this.powerUsage = 0.0f; - for (final StimulatorCircuit beeMod : this.modifiers) { - this.powerUsage += beeMod.getPowerUsage(); - } - this.powered = this.getUtil().hasEnergyMJ(this.powerUsage); - } - - @Nullable - public ICircuitBoard getHiveFrame() { - if (!this.getUtil().isSlotEmpty(AlvearyStimulator.slotCircuit)) { - return ChipsetManager.circuitRegistry.getCircuitBoard(this.getUtil().getStack(AlvearyStimulator.slotCircuit)); - } - return null; - } - - public StimulatorCircuit[] getCircuits() { - final ICircuitBoard board = this.getHiveFrame(); - if (board == null) { - return new StimulatorCircuit[0]; - } - final ICircuit[] circuits = board.getCircuits(); - final List mod = new ArrayList<>(); - for (final ICircuit circuit : circuits) { - if (circuit instanceof StimulatorCircuit) { - mod.add((StimulatorCircuit) circuit); - } - } - return mod.toArray(new StimulatorCircuit[0]); - } - - @Override - public float getTerritoryModifier(final IBeeGenome genome, final float currentModifier) { - float mod = 1.0f; - if (!this.powered) { - return mod; - } - for (final IBeeModifier beeMod : this.modifiers) { - mod *= beeMod.getTerritoryModifier(genome, mod); - } - return mod; - } - - @Override - public float getMutationModifier(final IBeeGenome genome, final IBeeGenome mate, final float currentModifier) { - float mod = 1.0f; - if (!this.powered) { - return mod; - } - for (final IBeeModifier beeMod : this.modifiers) { - mod *= beeMod.getMutationModifier(genome, mate, mod); - } - return mod; - } - - @Override - public float getLifespanModifier(final IBeeGenome genome, @Nullable final IBeeGenome mate, final float currentModifier) { - float mod = 1.0f; - if (!this.powered) { - return mod; - } - for (final IBeeModifier beeMod : this.modifiers) { - mod *= beeMod.getLifespanModifier(genome, mate, mod); - } - return mod; - } - - @Override - public float getProductionModifier(final IBeeGenome genome, final float currentModifier) { - float mod = 1.0f; - if (!this.powered) { - return mod; - } - for (final IBeeModifier beeMod : this.modifiers) { - mod *= beeMod.getProductionModifier(genome, mod); - } - return mod; - } - - @Override - public float getFloweringModifier(final IBeeGenome genome, final float currentModifier) { - float mod = 1.0f; - if (!this.powered) { - return mod; - } - for (final IBeeModifier beeMod : this.modifiers) { - mod *= beeMod.getFloweringModifier(genome, mod); - } - return mod; - } - - @Override - public float getGeneticDecay(final IBeeGenome genome, final float currentModifier) { - float mod = 1.0f; - if (!this.powered) { - return mod; - } - for (final IBeeModifier beeMod : this.modifiers) { - mod *= beeMod.getGeneticDecay(genome, mod); - } - return mod; - } - - @Override - public boolean isSealed() { - if (!this.powered) { - return false; - } - for (final IBeeModifier beeMod : this.modifiers) { - if (beeMod.isSealed()) { - return true; - } - } - return false; - } - - @Override - public boolean isSelfLighted() { - if (!this.powered) { - return false; - } - for (final IBeeModifier beeMod : this.modifiers) { - if (beeMod.isSelfLighted()) { - return true; - } - } - return false; - } - - @Override - public boolean isSunlightSimulated() { - if (!this.powered) { - return false; - } - for (final IBeeModifier beeMod : this.modifiers) { - if (beeMod.isSunlightSimulated()) { - return true; - } - } - return false; - } - - @Override - public boolean isHellish() { - if (!this.powered) { - return false; - } - for (final IBeeModifier beeMod : this.modifiers) { - if (beeMod.isHellish()) { - return true; - } - } - return false; - } - - @Override - public void wearOutEquipment(final int amount) { - this.getUtil().useEnergyMJ(this.powerUsage); - } - } - -} 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 7c73c193..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.client.ExtraBeeTexture; -import forestry.api.apiculture.IBeeListener; -import forestry.api.apiculture.IBeeModifier; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.IEnergyStorage; - -import java.util.LinkedList; -import java.util.List; - -public class AlvearyTransmission { - public static class PackageAlvearyTransmission extends AlvearyMachine.AlvearyPackage implements IMachineInformation { - public PackageAlvearyTransmission() { - super("transmission", ExtraBeeTexture.AlvearyTransmission, false); - } - - @Override - public void createMachine(final Machine machine) { - new ComponentPowerReceptor(machine, 1000); - new ComponentTransmission(machine); - } - } - - public static class ComponentTransmission extends ComponentBeeModifier implements IBeeModifier, IBeeListener { - public ComponentTransmission(final Machine machine) { - super(machine); - } - - @Override - public void onUpdate() { - super.onUpdate(); - - int energy = this.getUtil().getPoweredMachine().getEnergyStored(); - if (energy == 0) { - return; - } - final TileExtraBeeAlveary tile = (TileExtraBeeAlveary) this.getMachine().getTileEntity(); - final List handlers = new LinkedList<>(); - for (final TileEntity alvearyTile : tile.getAlvearyBlocks()) { - if (alvearyTile != tile && alvearyTile.hasCapability(CapabilityEnergy.ENERGY, EnumFacing.NORTH)) { - handlers.add(alvearyTile.getCapability(CapabilityEnergy.ENERGY, EnumFacing.NORTH)); - } - } - if (handlers.isEmpty()) { - return; - } - final int maxOutput = 500; - int output = energy / handlers.size(); - if (output > maxOutput) { - output = maxOutput; - } - if (output < 1) { - output = 1; - } - for (final IEnergyStorage handler : handlers) { - final int recieved = handler.receiveEnergy(output, false); - this.getUtil().getPoweredMachine().receiveEnergy(-recieved, false); - energy = this.getUtil().getPoweredMachine().getEnergyStored(); - if (energy <= 0) { - return; - } - } - } - } -} diff --git a/src/main/java/binnie/extrabees/apiary/machine/package-info.java b/src/main/java/binnie/extrabees/apiary/machine/package-info.java deleted file mode 100644 index 2efd3272..00000000 --- a/src/main/java/binnie/extrabees/apiary/machine/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.extrabees.apiary.machine; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/apiary/package-info.java b/src/main/java/binnie/extrabees/apiary/package-info.java deleted file mode 100644 index 1033a5b3..00000000 --- a/src/main/java/binnie/extrabees/apiary/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.extrabees.apiary; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/client/ExtraBeeGUID.java b/src/main/java/binnie/extrabees/client/ExtraBeeGUID.java deleted file mode 100644 index 5385075d..00000000 --- a/src/main/java/binnie/extrabees/client/ExtraBeeGUID.java +++ /dev/null @@ -1,56 +0,0 @@ -package binnie.extrabees.client; - -import binnie.core.craftgui.minecraft.Window; -import binnie.core.gui.IBinnieGUID; -import binnie.extrabees.client.gui.WindowAlvearyFrame; -import binnie.extrabees.client.gui.WindowAlvearyHatchery; -import binnie.extrabees.client.gui.WindowAlvearyMutator; -import binnie.extrabees.client.gui.WindowAlvearyStimulator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; - -public enum ExtraBeeGUID implements IBinnieGUID { - AlvearyMutator, - AlvearyFrame, - AlvearyStimulator, - AlvearyHatchery; - - @Override - @Nullable - public Window getWindow(final EntityPlayer player, final World world, final int x, final int y, final int z, final Side side) { - Window window = null; - final TileEntity tileEntity = world.getTileEntity(new BlockPos(x, y, z)); - IInventory object = null; - if (tileEntity instanceof IInventory) { - object = (IInventory) tileEntity; - } - switch (this) { - case AlvearyMutator: { - window = WindowAlvearyMutator.create(player, object, side); - break; - } - case AlvearyFrame: { - window = WindowAlvearyFrame.create(player, object, side); - break; - } - case AlvearyStimulator: { - window = WindowAlvearyStimulator.create(player, object, side); - break; - } - case AlvearyHatchery: { - window = WindowAlvearyHatchery.create(player, object, side); - break; - } - default: { - break; - } - } - return window; - } -} diff --git a/src/main/java/binnie/extrabees/client/GuiHack.java b/src/main/java/binnie/extrabees/client/GuiHack.java deleted file mode 100644 index d7dd617d..00000000 --- a/src/main/java/binnie/extrabees/client/GuiHack.java +++ /dev/null @@ -1,134 +0,0 @@ -package binnie.extrabees.client; - -import binnie.core.AbstractMod; -import binnie.core.BinnieCore; -import binnie.core.gui.IBinnieGUID; -import binnie.core.network.BinniePacketHandler; -import binnie.core.proxy.IProxyCore; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.apiary.ModuleApiary; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.common.network.NetworkRegistry; - -import javax.annotation.Nonnull; - -/** - * Created by Elec332 on 12-5-2017. - */ -public class GuiHack extends AbstractMod { - - public static final GuiHack INSTANCE; - - private GuiHack(){ - proxy = new IProxyCore(){ - - @Override - public void setMod(AbstractMod mod) { - - } - - @Override - public Item registerItem(Item item) { - return ExtraBees.proxy.registerItem(item); - } - - @Override - public Block registerBlock(Block block) { - return ExtraBees.proxy.registerBlock(block); - } - - @Override - public void registerBlock(B block, ItemBlock itemBlock) { - throw new UnsupportedOperationException(); - } - - @Override - public void registerModels() { - - } - - @Override - public void registerItemAndBlockColors() { - - } - - @Override - public void preInit() { - - } - - @Override - public void init() { - NetworkRegistry.INSTANCE.registerGuiHandler(ExtraBees.instance, new binnie.core.gui.BinnieGUIHandler(GuiHack.INSTANCE)); - } - - @Override - public void postInit() { - - } - }; - } - - private IProxyCore proxy; - - public void openGui(final IBinnieGUID ID, final EntityPlayer player, final BlockPos pos) { - BinnieCore.getBinnieProxy().openGui(this, ID.ordinal(), player, pos); - } - - - @Override - protected void registerModules() { - addModule(new ModuleApiary()); - } - - @Override - @Nonnull - public Object getMod() { - return ExtraBees.instance; - } - - @Override - public boolean isActive() { - return true; - } - - @Override - public String getChannel() { - return "EB"; - } - - @Override - public IBinnieGUID[] getGUIDs() { - return ExtraBeeGUID.values(); - } - - @Override - public IProxyCore getProxy() { - return proxy; - } - - @Override - public String getModID() { - return ExtraBees.MODID; - } - - @Override - protected Class getPacketHandler() { - return PacketHandler.class; - } - - public static class PacketHandler extends BinniePacketHandler { - public PacketHandler() { - super(INSTANCE); - } - } - - static { - INSTANCE = new GuiHack(); - } - -} diff --git a/src/main/java/binnie/extrabees/client/gui/WindowAlvearyFrame.java b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyFrame.java deleted file mode 100644 index 3ad501ff..00000000 --- a/src/main/java/binnie/extrabees/client/gui/WindowAlvearyFrame.java +++ /dev/null @@ -1,44 +0,0 @@ -package binnie.extrabees.client.gui; - -import binnie.core.AbstractMod; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.extrabees.client.GuiHack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; - -public class WindowAlvearyFrame extends Window { - - public WindowAlvearyFrame(final EntityPlayer player, final IInventory inventory, final Side side) { - super(176, 144, player, inventory, side); - } - - @Nullable - public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { - if (inventory == null) { - return null; - } - return new WindowAlvearyFrame(player, inventory, side); - } - - @Override - public void initialiseClient() { - this.setTitle("Frame Housing"); - ControlPlayerInventory playerInventory = new ControlPlayerInventory(this); - new ControlSlot.Builder(this, 79, 30).assign(0); - } - - @Override - public AbstractMod getMod() { - return GuiHack.INSTANCE; - } - - @Override - public String getBackgroundTextureName() { - return "AlvearyFrame"; - } -} diff --git a/src/main/java/binnie/extrabees/client/gui/WindowAlvearyHatchery.java b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyHatchery.java deleted file mode 100644 index db16c47e..00000000 --- a/src/main/java/binnie/extrabees/client/gui/WindowAlvearyHatchery.java +++ /dev/null @@ -1,45 +0,0 @@ -package binnie.extrabees.client.gui; - -import binnie.core.AbstractMod; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlotArray; -import binnie.extrabees.apiary.machine.AlvearyHatchery; -import binnie.extrabees.client.GuiHack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; - -public class WindowAlvearyHatchery extends Window { - public WindowAlvearyHatchery(final EntityPlayer player, final IInventory inventory, final Side side) { - super(176, 144, player, inventory, side); - } - - @Nullable - public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { - if (inventory == null) { - return null; - } - return new WindowAlvearyHatchery(player, inventory, side); - } - - @Override - public void initialiseClient() { - this.setTitle("Hatchery"); - ControlPlayerInventory playerInventory = new ControlPlayerInventory(this); - final ControlSlotArray.Builder slot = new ControlSlotArray.Builder(this, 43, 30, 5, 1); - slot.create(AlvearyHatchery.slotLarvae); - } - - @Override - public AbstractMod getMod() { - return GuiHack.INSTANCE; - } - - @Override - public String getBackgroundTextureName() { - return "AlvearyHatchery"; - } -} diff --git a/src/main/java/binnie/extrabees/client/gui/WindowAlvearyIndustrialFrame.java b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyIndustrialFrame.java deleted file mode 100644 index 5d3768e6..00000000 --- a/src/main/java/binnie/extrabees/client/gui/WindowAlvearyIndustrialFrame.java +++ /dev/null @@ -1,37 +0,0 @@ -package binnie.extrabees.client.gui; - -import binnie.core.AbstractMod; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.extrabees.client.GuiHack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; - -public class WindowAlvearyIndustrialFrame extends Window { - public WindowAlvearyIndustrialFrame(final EntityPlayer player, final IInventory inventory, final Side side) { - super(176, 144, player, inventory, side); - } - - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowAlvearyIndustrialFrame(player, inventory, side); - } - - @Override - public void initialiseClient() { - this.setTitle("Industrial Frame Housing"); - ControlPlayerInventory playerInventory = new ControlPlayerInventory(this); - new ControlSlot.Builder(this, 79, 30).assign(0); - } - - @Override - public AbstractMod getMod() { - return GuiHack.INSTANCE; - } - - @Override - public String getBackgroundTextureName() { - return "AlvearyIndustrialFrame"; - } -} diff --git a/src/main/java/binnie/extrabees/client/gui/WindowAlvearyMutator.java b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyMutator.java deleted file mode 100644 index 5bac6e1f..00000000 --- a/src/main/java/binnie/extrabees/client/gui/WindowAlvearyMutator.java +++ /dev/null @@ -1,71 +0,0 @@ -package binnie.extrabees.client.gui; - -import binnie.core.AbstractMod; -import binnie.core.craftgui.controls.ControlText; -import binnie.core.craftgui.geometry.Area; -import binnie.core.craftgui.geometry.TextJustification; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.extrabees.apiary.machine.AlvearyMutator; -import binnie.extrabees.client.GuiHack; -import binnie.extrabees.utils.AlvearyMutationHandler; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.fml.relauncher.Side; -import org.apache.commons.lang3.tuple.Pair; - -import javax.annotation.Nullable; -import java.text.NumberFormat; - -public class WindowAlvearyMutator extends Window { - public WindowAlvearyMutator(final EntityPlayer player, final IInventory inventory, final Side side) { - super(176, 176, player, inventory, side); - } - - @Nullable - public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { - if (inventory == null) { - return null; - } - return new WindowAlvearyMutator(player, inventory, side); - } - - @Override - public void initialiseClient() { - this.setTitle("Mutator"); - new ControlPlayerInventory(this); - new ControlSlot.Builder(this, 79, 30).assign(0); - new ControlText(this, new Area(0, 52, this.width(), 16), "Possible Mutagens:", TextJustification.MiddleCenter).setColour(5592405); - final int size = AlvearyMutationHandler.getMutagens().size(); - final int w = size * 18; - NumberFormat numberFormat = NumberFormat.getNumberInstance(MinecraftForgeClient.getLocale()); - if (size > 0) { - int x = (this.width() - w) / 2; - for (final Pair mutagen : AlvearyMutationHandler.getMutagens()) { - final ControlItemDisplay display = new ControlItemDisplay(this, x, 66); - display.setItemStack(mutagen.getKey()); - display.hastooltip = true; - Float multiplier = mutagen.getValue(); - - String format = numberFormat.format(multiplier); - display.addTooltip(TextFormatting.GRAY + "Multiplier: " + format + "x"); - x += 18; - } - } - } - - @Override - public AbstractMod getMod() { - return GuiHack.INSTANCE; - } - - @Override - public String getBackgroundTextureName() { - return "AlvearyMutator"; - } -} diff --git a/src/main/java/binnie/extrabees/client/gui/WindowAlvearyStimulator.java b/src/main/java/binnie/extrabees/client/gui/WindowAlvearyStimulator.java deleted file mode 100644 index f891ec52..00000000 --- a/src/main/java/binnie/extrabees/client/gui/WindowAlvearyStimulator.java +++ /dev/null @@ -1,47 +0,0 @@ -package binnie.extrabees.client.gui; - -import binnie.core.AbstractMod; -import binnie.core.craftgui.geometry.Position; -import binnie.core.craftgui.minecraft.Window; -import binnie.core.craftgui.minecraft.control.ControlEnergyBar; -import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; -import binnie.core.craftgui.minecraft.control.ControlSlot; -import binnie.extrabees.apiary.machine.AlvearyStimulator; -import binnie.extrabees.client.GuiHack; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraftforge.fml.relauncher.Side; - -import javax.annotation.Nullable; - -public class WindowAlvearyStimulator extends Window { - public WindowAlvearyStimulator(final EntityPlayer player, final IInventory inventory, final Side side) { - super(176, 144, player, inventory, side); - } - - @Nullable - public static Window create(final EntityPlayer player, @Nullable final IInventory inventory, final Side side) { - if (inventory == null) { - return null; - } - return new WindowAlvearyStimulator(player, inventory, side); - } - - @Override - public void initialiseClient() { - this.setTitle("Stimulator"); - new ControlEnergyBar(this, 75, 29, 60, 16, Position.LEFT); - new ControlSlot.Builder(this, 41, 28).assign(AlvearyStimulator.slotCircuit); - new ControlPlayerInventory(this); - } - - @Override - public AbstractMod getMod() { - return GuiHack.INSTANCE; - } - - @Override - public String getBackgroundTextureName() { - return "AlvearyStimulator"; - } -} diff --git a/src/main/java/binnie/extrabees/client/gui/package-info.java b/src/main/java/binnie/extrabees/client/gui/package-info.java deleted file mode 100644 index 7c46779d..00000000 --- a/src/main/java/binnie/extrabees/client/gui/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.extrabees.client.gui; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/client/gui2/AbstractAlvearyContainer.java b/src/main/java/binnie/extrabees/client/gui2/AbstractAlvearyContainer.java new file mode 100644 index 00000000..2873a9b1 --- /dev/null +++ b/src/main/java/binnie/extrabees/client/gui2/AbstractAlvearyContainer.java @@ -0,0 +1,59 @@ +package binnie.extrabees.client.gui2; + +import binnie.extrabees.ExtraBees; +import binnie.extrabees.alveary.AlvearyLogicType; +import binnie.extrabees.utils.ExtraBeesResourceLocation; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.items.IItemHandlerModifiable; +import org.apache.commons.lang3.text.WordUtils; + +import javax.annotation.Nonnull; +import java.awt.*; + +/** + * Created by Elec332 on 13-5-2017. + */ +public abstract class AbstractAlvearyContainer extends Container { + + public AbstractAlvearyContainer(EntityPlayer player, IItemHandlerModifiable inv, AlvearyLogicType type, Dimension dimension){ + this.player = player; + this.inv = inv; + this.dimension = dimension; + String base = "extrabees.machine.alveay."+type.getName(); + title = ExtraBees.proxy.localise(base+".name"); + tooltip = ExtraBees.proxy.localise(base+".info"); + background = new ExtraBeesResourceLocation("textures/gui/gui"+ type.getName()+".png"); + setupContainer(); + } + + protected static final Dimension DEFAULT_DIMENSION = new Dimension(176, 144); + public final Dimension dimension; + protected final EntityPlayer player; + protected final IItemHandlerModifiable inv; + protected ResourceLocation background; + protected int offset = 0; + protected String tooltip, title; + + protected abstract void setupContainer(); + + protected final void addPlayerInventory(){ + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 9; j++) { + addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, (84 + this.offset) + i * 18)); + } + } + + for (int i = 0; i < 9; i++) { + addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142 + this.offset)); + } + } + + @Override + public boolean canInteractWith(@Nonnull EntityPlayer playerIn) { + return true; + } + +} diff --git a/src/main/java/binnie/extrabees/client/gui2/ContainerFrameHousing.java b/src/main/java/binnie/extrabees/client/gui2/ContainerFrameHousing.java new file mode 100644 index 00000000..34f35ae3 --- /dev/null +++ b/src/main/java/binnie/extrabees/client/gui2/ContainerFrameHousing.java @@ -0,0 +1,24 @@ +package binnie.extrabees.client.gui2; + +import binnie.extrabees.alveary.AlvearyLogicFrameHousing; +import binnie.extrabees.alveary.AlvearyLogicType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.items.SlotItemHandler; + +/** + * Created by Elec332 on 13-5-2017. + */ +public class ContainerFrameHousing extends AbstractAlvearyContainer { + + public ContainerFrameHousing(EntityPlayer player, AlvearyLogicFrameHousing logic) { + super(player, logic.getInventory(), AlvearyLogicType.FRAME, DEFAULT_DIMENSION); + } + + @Override + protected void setupContainer() { + offset = -21; + addPlayerInventory(); + addSlotToContainer(new SlotItemHandler(inv, 0, 80, 37)); + } + +} diff --git a/src/main/java/binnie/extrabees/client/gui2/ContainerHatchery.java b/src/main/java/binnie/extrabees/client/gui2/ContainerHatchery.java new file mode 100644 index 00000000..90d8d715 --- /dev/null +++ b/src/main/java/binnie/extrabees/client/gui2/ContainerHatchery.java @@ -0,0 +1,26 @@ +package binnie.extrabees.client.gui2; + +import binnie.extrabees.alveary.AlvearyLogicHatchery; +import binnie.extrabees.alveary.AlvearyLogicType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.items.SlotItemHandler; + +/** + * Created by Elec332 on 13-5-2017. + */ +public class ContainerHatchery extends AbstractAlvearyContainer { + + public ContainerHatchery(EntityPlayer player, AlvearyLogicHatchery logic) { + super(player, logic.getInventory(), AlvearyLogicType.HATCHERY, DEFAULT_DIMENSION); + } + + @Override + protected void setupContainer() { + offset = -21; + addPlayerInventory(); + for (int i = 0; i < 5; i++) { + addSlotToContainer(new SlotItemHandler(inv, i, 44 + i * 18, 37)); + } + } + +} diff --git a/src/main/java/binnie/extrabees/client/gui2/ContainerMutator.java b/src/main/java/binnie/extrabees/client/gui2/ContainerMutator.java new file mode 100644 index 00000000..7c8de755 --- /dev/null +++ b/src/main/java/binnie/extrabees/client/gui2/ContainerMutator.java @@ -0,0 +1,25 @@ +package binnie.extrabees.client.gui2; + +import binnie.extrabees.alveary.AlvearyLogicMutator; +import binnie.extrabees.alveary.AlvearyLogicType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.items.SlotItemHandler; + +import java.awt.*; + +/** + * Created by Elec332 on 13-5-2017. + */ +public class ContainerMutator extends AbstractAlvearyContainer { + + public ContainerMutator(EntityPlayer player, AlvearyLogicMutator logic) { + super(player, logic.getInventory(), AlvearyLogicType.MUTATOR, new Dimension(176, 176)); + } + + @Override + protected void setupContainer() { + addPlayerInventory(); + addSlotToContainer(new SlotItemHandler(inv, 0, 81, 29)); + } + +} diff --git a/src/main/java/binnie/extrabees/client/gui2/ContainerStimulator.java b/src/main/java/binnie/extrabees/client/gui2/ContainerStimulator.java new file mode 100644 index 00000000..8b875eeb --- /dev/null +++ b/src/main/java/binnie/extrabees/client/gui2/ContainerStimulator.java @@ -0,0 +1,61 @@ +package binnie.extrabees.client.gui2; + +import binnie.extrabees.alveary.AlvearyLogicStimulator; +import binnie.extrabees.alveary.AlvearyLogicType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IContainerListener; +import net.minecraftforge.energy.IEnergyStorage; +import net.minecraftforge.items.SlotItemHandler; + +import java.awt.*; +import java.awt.event.ContainerListener; + +/** + * Created by Elec332 on 13-5-2017. + */ +public class ContainerStimulator extends AbstractAlvearyContainer { + + public ContainerStimulator(EntityPlayer player, AlvearyLogicStimulator logic) { + super(player, logic.getInventory(), AlvearyLogicType.STIMULATOR, DEFAULT_DIMENSION); + this.storage = logic.getEnergyStorage(); + this.logic = logic; + this.maxPower = storage.getMaxEnergyStored(); + if (!player.world.isRemote){ + logic.onContainerOpened(this); + } + } + + private final AlvearyLogicStimulator logic; + private final IEnergyStorage storage; + protected int power, maxPower; + + @Override + protected void setupContainer() { + offset = -21; + addPlayerInventory(); + title = "Stimulator"; + addSlotToContainer(new SlotItemHandler(inv, 0, 44, 37)); + } + + public void checkPower(){ + if (power != storage.getEnergyStored()){ + for (IContainerListener listener : listeners){ + listener.sendProgressBarUpdate(this, 9, power = storage.getEnergyStored()); + } + } + } + + @Override + public void onContainerClosed(EntityPlayer playerIn) { + super.onContainerClosed(playerIn); + logic.onGuiClosed(this); + } + + @Override + public void updateProgressBar(int id, int data) { + if (id == 9){ + power = data; + } + } + +} diff --git a/src/main/java/binnie/extrabees/client/gui2/GuiContainerAlvearyPart.java b/src/main/java/binnie/extrabees/client/gui2/GuiContainerAlvearyPart.java new file mode 100644 index 00000000..f42aa806 --- /dev/null +++ b/src/main/java/binnie/extrabees/client/gui2/GuiContainerAlvearyPart.java @@ -0,0 +1,48 @@ +package binnie.extrabees.client.gui2; + +import binnie.extrabees.utils.ExtraBeesResourceLocation; +import com.google.common.collect.Lists; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraftforge.fml.client.config.GuiUtils; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import java.awt.*; + +/** + * Created by Elec332 on 13-5-2017. + */ +@SideOnly(Side.CLIENT) +public class GuiContainerAlvearyPart extends GuiContainer { + + public GuiContainerAlvearyPart(AbstractAlvearyContainer container) { + super(container); + this.container = container; + font = Minecraft.getMinecraft().fontRendererObj; + } + + @SuppressWarnings("all") + protected FontRenderer font; + protected AbstractAlvearyContainer container; + private int titleS = -1; + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { + int i = (this.width - this.xSize) / 2; + int j = (this.height - this.ySize) / 2; + Minecraft.getMinecraft().getTextureManager().bindTexture(container.background); + if (titleS == -1){ + titleS = (i + (xSize / 2)) - (font.getStringWidth(container.title) / 2); + } + + drawTexturedModalRect(i, j, 0, 0, container.dimension.width, container.dimension.height); + font.drawString(container.title, titleS, j + 8, Color.DARK_GRAY.getRGB()); + if (mouseX > i + 6 && mouseX < i + 23 && mouseY > j + 5 && mouseY < j + 22){ + GuiUtils.drawHoveringText(Lists.newArrayList(container.tooltip), mouseX, mouseY, width, height, 150, font); + } + + } + +} diff --git a/src/main/java/binnie/extrabees/client/gui2/GuiContainerMutator.java b/src/main/java/binnie/extrabees/client/gui2/GuiContainerMutator.java new file mode 100644 index 00000000..16b0dee9 --- /dev/null +++ b/src/main/java/binnie/extrabees/client/gui2/GuiContainerMutator.java @@ -0,0 +1,43 @@ +package binnie.extrabees.client.gui2; + +import binnie.extrabees.utils.AlvearyMutationHandler; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import org.apache.commons.lang3.tuple.Pair; + +import java.awt.*; + +/** + * Created by Elec332 on 13-5-2017. + */ +public class GuiContainerMutator extends GuiContainerAlvearyPart { + + public GuiContainerMutator(AbstractAlvearyContainer container) { + super(container); + mutagens = "Possible Mutagens:"; + } + + private String mutagens; + private int titleS = -1; + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY); + int i = (this.width - this.xSize) / 2; + int j = (this.height - this.ySize) / 2; + int mid = i + (xSize / 2); + if (titleS == -1){ + titleS = mid - (font.getStringWidth(mutagens) / 2); + } + font.drawString(mutagens, titleS, j + 50, Color.DARK_GRAY.getRGB()); + int gens = AlvearyMutationHandler.getMutagens().size(); + int width = gens * 18; + int w2 = width / 2; + int q = 0; + for (final Pair mutagen : AlvearyMutationHandler.getMutagens()) { + Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(mutagen.getLeft(), mid - w2 + q * 18, j + 62); + q++; + } + } + +} diff --git a/src/main/java/binnie/extrabees/client/gui2/GuiContainerStimulator.java b/src/main/java/binnie/extrabees/client/gui2/GuiContainerStimulator.java new file mode 100644 index 00000000..cc226683 --- /dev/null +++ b/src/main/java/binnie/extrabees/client/gui2/GuiContainerStimulator.java @@ -0,0 +1,31 @@ +package binnie.extrabees.client.gui2; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; + +/** + * Created by Elec332 on 13-5-2017. + */ +public class GuiContainerStimulator extends GuiContainerAlvearyPart { + + public GuiContainerStimulator(ContainerStimulator container) { + super(container); + this.container = container; + } + + private ContainerStimulator container; + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY); + Minecraft.getMinecraft().getTextureManager().bindTexture(container.background); + int i = (this.width - this.xSize) / 2; + int j = (this.height - this.ySize) / 2; + float fill = container.power / (float) container.maxPower; + float bar = fill * 70; + GlStateManager.color(1, 1, 1, 1); + drawTexturedModalRect(i + 71, j + 38, 0, 185, (int) bar, 14); + drawTexturedModalRect(i + 71, j + 38, 0, 165, 70, 14); + } + +} diff --git a/src/main/java/binnie/extrabees/init/BlockRegister.java b/src/main/java/binnie/extrabees/init/BlockRegister.java index 1818969d..7aee2d24 100644 --- a/src/main/java/binnie/extrabees/init/BlockRegister.java +++ b/src/main/java/binnie/extrabees/init/BlockRegister.java @@ -23,7 +23,7 @@ public final class BlockRegister { public static void preInitBlocks(){ registerHives(); registerMisc(); - //ExtraBees.alveary = ExtraBees.proxy.registerBlock(new BlockAlveary()); + ExtraBees.alveary = ExtraBees.proxy.registerBlock(new BlockAlveary()); GameRegistry.registerTileEntity(TileEntityExtraBeesAlvearyPart.class, "TileEntityExtraBeesAlvearyPart"); } diff --git a/src/main/java/binnie/extrabees/init/ItemRegister.java b/src/main/java/binnie/extrabees/init/ItemRegister.java index 519d33e3..87b90877 100644 --- a/src/main/java/binnie/extrabees/init/ItemRegister.java +++ b/src/main/java/binnie/extrabees/init/ItemRegister.java @@ -29,7 +29,7 @@ public final class ItemRegister { @SuppressWarnings("all") private static void registerMisc(){ - Item /*i; = GameRegistry.register(new ItemBlock(ExtraBees.alveary){ + Item i = GameRegistry.register(new ItemBlock(ExtraBees.alveary){ @Override public int getMetadata(int damage) { @@ -49,7 +49,7 @@ public final class ItemRegister { }.setRegistryName(ExtraBees.alveary.getRegistryName())); for (int j = 0; j < AlvearyLogicType.VALUES.length; j++) { ExtraBees.proxy.registerModel(i, j); - }*/ + } i = GameRegistry.register(new ItemBeehive(ExtraBees.hive)); for (int j = 0; j < EnumHiveType.values().length; j++) { ExtraBees.proxy.registerModel(i, j); diff --git a/src/main/java/binnie/extrabees/init/RecipeRegister.java b/src/main/java/binnie/extrabees/init/RecipeRegister.java index fe8ad314..58164c6e 100644 --- a/src/main/java/binnie/extrabees/init/RecipeRegister.java +++ b/src/main/java/binnie/extrabees/init/RecipeRegister.java @@ -1,7 +1,6 @@ package binnie.extrabees.init; import binnie.extrabees.ExtraBees; -import binnie.extrabees.apiary.machine.AlvearyMachine; import binnie.extrabees.circuit.AlvearySimulatorCircuitType; import binnie.extrabees.items.types.*; import binnie.extrabees.circuit.BinnieCircuitLayout; @@ -48,13 +47,13 @@ public final class RecipeRegister { Item thermionicTubes = PluginCore.getItems().tubes; Item chipsets = PluginCore.getItems().circuitboards; - GameRegistry.addRecipe(AlvearyMachine.Mutator.get(1), "g g", " a ", "t t", 'g', Items.GOLD_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); - GameRegistry.addRecipe(AlvearyMachine.Frame.get(1), "iii", "tat", " t ", 'i', Items.IRON_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); - GameRegistry.addRecipe(AlvearyMachine.RainShield.get(1), " b ", "bab", "t t", 'b', Items.BRICK, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); - GameRegistry.addRecipe(AlvearyMachine.Lighting.get(1), "iii", "iai", " t ", 'i', Items.GLOWSTONE_DUST, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); - GameRegistry.addRecipe(AlvearyMachine.Stimulator.get(1), "kik", "iai", " t ", 'i', Items.GOLD_NUGGET, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4), 'k', new ItemStack(chipsets, 1, 2)); - GameRegistry.addRecipe(AlvearyMachine.Hatchery.get(1), "i i", " a ", "iti", 'i', Blocks.GLASS_PANE, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); - GameRegistry.addRecipe(new ShapedOreRecipe(AlvearyMachine.Transmission.get(1), " t ", "tat", " t ", 'a', alveary, 't', "gearTin")); + //GameRegistry.addRecipe(AlvearyMachine.Mutator.get(1), "g g", " a ", "t t", 'g', Items.GOLD_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); + //GameRegistry.addRecipe(AlvearyMachine.Frame.get(1), "iii", "tat", " t ", 'i', Items.IRON_INGOT, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); + //GameRegistry.addRecipe(AlvearyMachine.RainShield.get(1), " b ", "bab", "t t", 'b', Items.BRICK, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); + //GameRegistry.addRecipe(AlvearyMachine.Lighting.get(1), "iii", "iai", " t ", 'i', Items.GLOWSTONE_DUST, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4)); + //GameRegistry.addRecipe(AlvearyMachine.Stimulator.get(1), "kik", "iai", " t ", 'i', Items.GOLD_NUGGET, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 4), 'k', new ItemStack(chipsets, 1, 2)); + //GameRegistry.addRecipe(AlvearyMachine.Hatchery.get(1), "i i", " a ", "iti", 'i', Blocks.GLASS_PANE, 'a', alveary, 't', new ItemStack(thermionicTubes, 1, 5)); + //GameRegistry.addRecipe(new ShapedOreRecipe(AlvearyMachine.Transmission.get(1), " t ", "tat", " t ", 'a', alveary, 't', "gearTin")); ICircuitLayout stimulatorLayout = new BinnieCircuitLayout("Stimulator", BinnieCircuitSocketType.STIMULATOR); for (final AlvearySimulatorCircuitType type : AlvearySimulatorCircuitType.values()) { type.createCircuit(stimulatorLayout); diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index bd1fdd44..931e22b7 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -11,7 +11,7 @@ import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.Point; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.client.ExtraBeeTexture; +import binnie.core.ExtraBeeTexture; import forestry.api.genetics.IChromosomeType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java b/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java index b9c55f58..89c298e2 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java @@ -4,7 +4,7 @@ import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.database.*; import binnie.core.craftgui.minecraft.Window; -import binnie.extrabees.client.GuiHack; +import binnie.genetics.Genetics; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -13,16 +13,16 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase { @Override @SideOnly(Side.CLIENT) protected void addTabs() { - new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.overview", 0)); - new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.classification", 0)); - new PageSpeciesGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.genome", 0)); - new PageSpeciesProducts(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.products", 0)); - new PageSpeciesClimate(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.climate", 0)); - new PageSpeciesResultant(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.resultant", 0)); - new PageSpeciesMutations(this.getInfoPages(Mode.SPECIES), new DatabaseTab(GuiHack.INSTANCE, "species.further", 0)); - new PageBranchOverview(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(GuiHack.INSTANCE, "branches.overview", 0)); - new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(GuiHack.INSTANCE, "branches.species", 0)); - new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(GuiHack.INSTANCE, "breeder", 0)); + new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.overview", 0)); + new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.classification", 0)); + new PageSpeciesGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.genome", 0)); + new PageSpeciesProducts(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.products", 0)); + new PageSpeciesClimate(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.climate", 0)); + new PageSpeciesResultant(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.resultant", 0)); + new PageSpeciesMutations(this.getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.further", 0)); + new PageBranchOverview(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(Genetics.instance, "branches.overview", 0)); + new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(Genetics.instance, "branches.species", 0)); + new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(Genetics.instance, "breeder", 0)); } public WindowApiaristDatabase(final EntityPlayer player, final Side side, final boolean nei) { @@ -35,7 +35,7 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase { @Override public AbstractMod getMod() { - return GuiHack.INSTANCE; + return Genetics.instance; } @Override diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java index 2f081433..f5916615 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java @@ -5,7 +5,7 @@ import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.client.ExtraBeeTexture; +import binnie.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java index f5abda9f..424d73d7 100644 --- a/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java @@ -8,7 +8,7 @@ import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.craftgui.window.Panel; -import binnie.extrabees.client.ExtraBeeTexture; +import binnie.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.craftgui.WindowMachine; diff --git a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java index 909691dc..674c6bd5 100644 --- a/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java @@ -6,7 +6,7 @@ import binnie.core.craftgui.minecraft.GUIIcon; import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.client.ExtraBeeTexture; +import binnie.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java index 27c899d9..26afe173 100644 --- a/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java @@ -6,7 +6,7 @@ import binnie.core.craftgui.minecraft.GUIIcon; import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.client.ExtraBeeTexture; +import binnie.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java index 628fe8b5..87e38c60 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java @@ -10,7 +10,7 @@ import binnie.core.craftgui.minecraft.GUIIcon; import binnie.core.craftgui.minecraft.control.*; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.StandardTexture; -import binnie.extrabees.client.ExtraBeeTexture; +import binnie.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.craftgui.WindowMachine; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/resources/assets/extrabees/textures/gui/guiStimulatior.png b/src/main/resources/assets/extrabees/textures/gui/guiStimulatior.png new file mode 100644 index 0000000000000000000000000000000000000000..4e83d008f8a60bc00c7175e1a69eec4709f01ab3 GIT binary patch literal 2346 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6PI(8N@(;O} z91m%@7}0Vis`Xk_+qD=VYQGWJc_X3gW^&KX)V^D(eYdkF-+gUr`o_ZIjg{3~YwNeR zw(soh-Z?nDcXWL3?EK!@@87@w|NjFWISNKYfEFQ8x5oc9D5I1F`2_=0+DHZr!Qa_cfnm&9 z;1OBOz`(Z)gc(Kmn_U75N|v}rlmzFem6RtIr7{#GX6BXX<)xM=nCKbk85%jWWWNCx zF#Vn`jv*CsZ)f)w37dd&H!?ZkNB; zpT9u(!#yr{_r=m3OeVV-1p@pU`fi%uJ#TH{#kHevPi1lKU$d0Afex}i^a9Sm{@E|b zYN9R_p#Q4VnKA$M&o!M)X=m4WtLtq)P*W%r_b0RV(iMAakq_%GN*c_y%eTpEe4Q4i zzo?-?VwZ?P_OkPf8(cS6JPdNEc(~j7!}QA7{|}0|&%|eN&-rzSsqno!WuA7%O;<^oWAhqe5c>XLBgcg|YzY2?e@t>YMN8H9N&Xfq*y{LyuF<5^*L&oe8r~mmW4P;Hxk4tQ_H7WK zgTwU-6|wCsHeR+YZQ*7tYvi}Hyt(!I+NliN6(R8(;9Y64mLlm&CO)D{QtStU*u(PX6(}6n9f+f`-<@W9$W4k_8dTe zl-yn1$N=(JVb)!oPh^2dPuhIO`W|qSOwS|G@#V&VdI7eZ@ox687x^Z!DU}O?_5Pcw!lX11yx$HJ3 zrm(5cwjFr!*PSs@dWK@`ml+~6E{Smj>|$l~+OFX6QjA68ZWF`OXn_SK+)PvQ92+j_ zf+bJ2pW1Uu!STRiftBrZPHA0jh}#~TwlayobIvI}nI^C8AM_@a6}?hizKQES)5dle zzf^HP$EDGEpjg}<%Erm`NOM}%iIr;(iNS4}mUYujFJ5=L<k*( z-@~h;m)_(Fiaqw4KUU}V9IwriOSrs$Y}y+$?`U3I_^h)Ejt&n>e^kv3&NORo(JiQx zD=VroHP$+tHX)C7&i1$Y549Ix%3<@2R`@pYmt+J`QAncf_UDP_?RiEZMXTQ0oon$s zwEN}l<2>#Bl3XBKN0*}aI1_r*}Ak29D#}zZ6pk#?_L`iUdT1k0gQ7S`0VrE{6 zUS4X6f{C7io}rO5OZFRJiQ?kv;uum9_x5&e{-p$o){k2I&MfM?BsM3<=>FY(|G%%U zy)n_xhez@J+>cLUuG=4<(lYhF#$~;*!vRw-PuQQe;@xRYhXudRzuy1*=ik@Q-D`h- zdwhMaT=lHH&)jbq^1L(6PU}rz`0|F8#X+XQF75lr@a$muZyo2I64c-h4wi8qtyngdY2=XwhHGa`6VELg9lICK#Ve{wyH20T{I-(2$(m>-E zd_E@zvd*C@>#tmT*5bKUkCZPm{F?oG-|u2;ko{orV$Wt^6#xYv-shK`d+TA)@NTyc z>%H3-{bWm3q#WLFscp=EcDWCxioxoA4yaOrfFpNLo-9?7aQGg(jOqQ`jOBe+Lc9yg zZ|yr^{yEbfrifu~`8GJ4;nBM%PppJ^;DJ)lQ1ZT1>%+fwWv^C%oS3;;{{#Ci+`6AV zgX(_3YtYRgvFgj7qaq9jAyw~$PW}5Oe4s*7&1J~QWp>DxW{A4Y saN!nP!!x)QpmdKI;Vst0Lx6%R{#J2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extrabees/textures/gui/guihatchery.png b/src/main/resources/assets/extrabees/textures/gui/guihatchery.png new file mode 100644 index 0000000000000000000000000000000000000000..c84b9b4e0c261316fb21e5f45eafd9ec60775614 GIT binary patch literal 2166 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6l<2>#Bl3XBKN0*}aI1_r)eAj~Mb-|P}lP_o1|q9iy!t)x7$D3zfgF*C13 zFE6!3!9>qM&(O%3CHoDqM7izh;uum9_jY!D@MQ-P*VQ3M7dg$^(y`#^{X^gX*BQ=^ zn{+}xZ~5K1D#hmumrbuc_hhf_S+*N|-Miw>v|HJBSADdQHlm3@~e|_D5s|UCH z5xvJ&@EH7ReGcf*Sd0}|_;%FB1(eXi#1&X{`m zbX!qy-aQMh73)+M+?l5B%sBt_*Z?CrD?CWLnxL^DV(q>946*;)BLB5Me$RA1WqvvYY^6c`veE?iA#fb$;|FzU}MUj4>$(;~LOV`2rrdya>QnsziboaBhmJN&vp zQ$6&G!l@J%ljQc3?B14ZfvT1%De%a~{aQLFBCuIQSYSg=-mT?3zk7QI0=bX5IUbi4 zZ};{L0&*5}XB_8!vp-|nq-7v&$_w_k{*OH62{hiQSNFpaBOO&=SKdWFj}&*zx7xr1 z(IYHiAW{22u1()>-3rGknj9I=^4$6Le=k*80pw=hVSE^GUHv_7UJTIq$pQur-jW3= zKr<8)Vi>po-XASFVHMCOH!%Y{4hIG%lX4@Vw^{G#&viu=vt6xHnve?x9f zd~^Ixh$uKXfC>c`?3~;PR0s?l5O2c!;Q1j_&oGs|yEOS@4p377P}AK^S;_ookF~%m zK&Cnrt20B?gYCHQ>9@)&jnS(7<;jX|i{DtTm=xXcZcAT}`R791_Nb_bs%~zmgc|qQ zv*BD^wb8uyTGf23o`@}YZze0bf1zx+BRIN1&YNW|3AZ1Z{``uALyfp+uyZ&xY;V{s z!}Q8^$Ge;p3Jc<1+$vW1`K!4hP5MmR-wT>23rF6*2UngFO23orlx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extrabees/textures/gui/guimutator.png b/src/main/resources/assets/extrabees/textures/gui/guimutator.png new file mode 100644 index 0000000000000000000000000000000000000000..7e3007edbd4b918132626f385b98669ed6a7acd7 GIT binary patch literal 2040 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6l<2>#Bl3XBKN0*}aI1_r*}Ak29D#}zZ6pk#?_L`iUdT1k0gQ7S`0VrE{6 zUS4X6f{C7io}rO5OZFRJi4yDS;uum9_x3ig|K$LQwuf4E3ClOFdn>@sx4#t_vRUVU zZO}6|Y}up!=E=_YEA%rb7gb%HcEiDxC)ASnW2kd!yq_e?s{eET-+e#-{(iYHZ;!9H zFTeHO=I$}>Hw<~+FW>0IC@{Ww!OG%b$6%ZG{jJ^olT(EgX7Ac}FE9VtO)I7?$@<4{ z?R$IQimAk#am(v%W-L20e}_(I2)q0I>&~aT7uHXIEWST;dhG9e0uQ{Gr#oDZDe2pO zU|aOo*DMp{+NLqAUboYO;dNeZDyKo+!*c$E{_r=uTiT6g}wN`tFy8pnkzU)%d1pWH9)U;pq&edFS?`R|{c;s|g9hFrrn zSutSY%e==TZ?UYPDB}i8txq2qrZ9iV%K3FdIHCO0o60LVz_XTn}Zy#1H&)b?K^v)-7(HT$-7|wtJ~%ES)jH#`k8wjq04MZvn#?0vulRal_aQ3iof{S)n_V@f0vL_As6+V&Dn2$}>!5 zkkFFd-E!!>J!8*yM?>H4KAppgr@0t>Z!=uj!aMk=voZ-1|Co}3KZSIk5l{np&ePS; JWt~$(699}b-EaT^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extrabees/textures/gui/guinull.png b/src/main/resources/assets/extrabees/textures/gui/guinull.png new file mode 100644 index 0000000000000000000000000000000000000000..1d187792d54e21ecb483a952faa71579c2b88dbd GIT binary patch literal 1970 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6eJ1o;I6 z6XZw+48h;oRe@2#S>O>_%)r362ZR}??kVyF3QCr^MwA5SrX`tBx0O39R_{`Img%|37vA*W}yR{jIz( zf3HvZPu4Pq@}*lMQp9I4lzeAmQs8rl-~7AG{{5RSmK%O|@8oRX{#ebu!Q@+&PU*_( z=NuQ-u}t_CBF%JXS>9bghS%S`>l1$pzW8itKGm1~uUl~8-SfGzjSQ(Qz@U3^=Oz;< zgklzZU&aV3=9i)iwl6L;&g5h*P&cr0Yp7NCkEm+yo+-HQRn9Bg18KK_cnm2 zxz^DjieXnZBdCD4D&Gd?g2DvID0!E|sL&AJ9-I9zD_hW1;qK zKfCY1{tJFMbKk!xL_+U!`fVij9g}iZ0P}$n#s&_I6kRknzhjHwPBzD@pScbS?83{ F1OUIYtyKU3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extrabees/textures/gui/guinull2.png b/src/main/resources/assets/extrabees/textures/gui/guinull2.png new file mode 100644 index 0000000000000000000000000000000000000000..abc85064ef5f0e158fa6853ddaeee1485b16533a GIT binary patch literal 1964 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6eJ1o;I6 z6XZw+48h;oRe@2#S>O>_%)r368-y8;|F~iX6qGD+jVKAuPb(=;EJ|f4NX*PD(aTFM zQ83Xn&@(i0X32g7EKvkKT^vIy;@;l5?RPss!Xl(&O0Aj^+=nR}Dg*nmk!Awd!~gm%xgDpMS~M{r^+ z8`ADZ-D8@)YhQ&mqt0tX=Z0nL?CYfB|NQ>=RA2VLm_^3-zvtFDG#D`fL$2iRO%TO! z;U+f+h$>Cz25}wI^%X$W^|`trF2mft4InDEd>e>jDEY>Ota*mt-&Y&5-`?St?_}Fy z_u}K7KCmhfvFlw9sH}&882i85H>J@p6Ej@X_&S*jwjpa*0C(9!=G zU)+2h^Wbyr+dF~oix|J$PK$q_zXiAMvuB~Y4@f5nG8%+juI$!iNLW$wPUzIXU+N7X z%`}!R?>-lKK=U*g!`fVij9g}iY-xt5+YA?Ou{B&XW7x8daluyJK`ph6_i((Lq9e!a Sdp>_bq2%f6=d#Wzp$Pzyu&vbq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extrabees/textures/gui/guinull3.png b/src/main/resources/assets/extrabees/textures/gui/guinull3.png new file mode 100644 index 0000000000000000000000000000000000000000..d2332add5432a9883db1b7c776a3c31bd6d98e7d GIT binary patch literal 1991 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6eJ1o;I6 z6XZw+48h;oRe@2#S>O>_%)r368-y8;|F~iX6qGD+jVKAuPb(=;EJ|f4NX*PD(aTFM zQ83Xn&@(i0X32g7EKzhkT^vIy;@;lQ&%cx)(fU#A6-()qZD&rZecpfj`~QZmsqVWH zk~nt0?@@og>)xCtDzQI%{oW>B{T^!h^a^8EtWVrm>gz z0$J0UGOnGyBk*9`%doc`8?x-z>g(h;=Ixc)_p@|!&g}9whWXKdc~-nWeeI*zjcu#b zY?*rOd2|`Wa%(M_*4+NORrSD!-ur(A{@gGKy(!PI(8N@(;O} z91m%@7}0Vis`Xk_+qD=VYQGWJc_X3gW^&KX)V^D(eYdkF-+gUr`o_ZIjg{3~YwNeR zw(soh-Z?nDcXWL3?EK!@@87@w|NjFWISNKYfEFQ8x5oc9D5I1F`2_=0+DHZr!Qa_cfnm&9 z;1OBOz`(Z)gc(Kmn_U75N|v}rlmzFem6RtIr7{#GX6BXX<)xM=nCKbk85%jWWWNCx zF#Vn`jv*CsZ)f)w37dd&H!?ZkNB; zpT9u(!#yr{_r=m3OeVV-1p@pU`fi%uJ#TH{#kHevPi1lKU$d0Afex}i^a9Sm{@E|b zYN9R_p#Q4VnKA$M&o!M)X=m4WtLtq)P*W%r_b0RV(iMAakq_%GN*c_y%eTpEe4Q4i zzo?-?VwZ?P_OkPf8(cS6JPdNEc(~j7!}QA7{|}0|&%|eN&-rzSsqno!WuA7%O;<^oWAhqe5c>XLBgcg|YzY2?e@t>YMN8H9N&Xfq*y{LyuF<5^*L&oe8r~mmW4P;Hxk4tQ_H7WK zgTwU-6|wCsHeR+YZQ*7tYvi}Hyt(!I+NliN6(R8(;9Y64mLlm&CO)D{QtStU*u(PX6(}6n9f+f`-<@W9$W4k_8dTe zl-yn1$N=(JVb)!oPh^2dPuhIO`W|qSOwS|G@#V&VdI7eZ@ox687x^Z!DU}O?_5Pcw!lX11yx$HJ3 zrm(5cwjFr!*PSs@dWK@`ml+~6E{Smj>|$l~+OFX6QjA68ZWF`OXn_SK+)PvQ92+j_ zf+bJ2pW1Uu!STRiftBrZPHA0jh}#~TwlayobIvI}nI^C8AM_@a6}?hizKQES)5dle zzf^HP$EDGEpjg}<%Erm`NOM}%iIr;(iNS4}mUYujFJ5=L<k*( z-@~h;m)_(Fiaqw4KUU}V9IwriOSrs$Y}y+$?`U3I_^h)Ejt&n>e^kv3&NORo(JiQx zD=VroHP$+tHX)C7&i1$Y549Ix%3<@2R`@pYmt+J`QAncf_UDP_?RiEZMXTQ0oon$s zwEN}zopr E0O!100{{R3 diff --git a/src/main/resources/assets/extrabees/textures/items/validator/serum.0.png b/src/main/resources/assets/extrabees/textures/items/validator/serum.0.png deleted file mode 100644 index 91fc177eaa363539bc91b0d3875c1ca65c635aef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2;EjP)t; z6M=$KC9V-A!TD(=<%vb93;~Imc_n&&t|1C##(JiDh6V;-iWUM@C3w0xhFJK&?Q`T} zFyvwSee2JEc0D9N@2Yh|J%}Y9yzya>l78oX!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z%2;EjP)t; z6M=$KC9V-A!TD(=<%vb93;~Imc_n&&t|1C##(JiDh6V;-iWUM@<$Jm~hFJLTJ>$rA zz=6a0qUGB=|JkPLwB)