From 7011e367ac5ccc34473283d6245bc2cec93b835e Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Fri, 19 Feb 2016 17:38:35 +1000 Subject: Removed Hard dependency on gregtech as another Project and added dev versions of all requires libs. Also started work on GT-EU EnderIO conduits, adding @Optional annotations where possible and a few other nice things. --- src/Java/binnie/Binnie.java | 23 - src/Java/binnie/Constants.java | 11 - src/Java/binnie/core/AbstractMod.java | 158 ------ src/Java/binnie/core/BinnieCore.java | 240 -------- src/Java/binnie/core/IInitializable.java | 10 - src/Java/binnie/core/ManagerBase.java | 19 - src/Java/binnie/core/Mods.java | 1 - src/Java/binnie/core/block/BlockMetadata.java | 138 ----- src/Java/binnie/core/block/IBlockMetadata.java | 21 - src/Java/binnie/core/block/IMultipassBlock.java | 8 - src/Java/binnie/core/block/ItemMetadata.java | 67 --- .../binnie/core/block/ItemMetadataRenderer.java | 64 --- .../binnie/core/block/MultipassBlockRenderer.java | 106 ---- .../binnie/core/block/MultipassItemRenderer.java | 78 --- src/Java/binnie/core/block/TileEntityMetadata.java | 116 ---- src/Java/binnie/core/circuits/BinnieCircuit.java | 80 --- .../binnie/core/circuits/BinnieCircuitLayout.java | 37 -- src/Java/binnie/core/gui/BinnieCoreGUI.java | 54 -- src/Java/binnie/core/gui/BinnieGUIHandler.java | 54 -- src/Java/binnie/core/gui/IBinnieGUID.java | 13 - src/Java/binnie/core/item/IItemEnum.java | 14 - src/Java/binnie/core/item/IItemMisc.java | 19 - src/Java/binnie/core/item/ItemFieldKit.java | 82 --- src/Java/binnie/core/item/ItemGenesis.java | 42 -- src/Java/binnie/core/item/ItemMisc.java | 81 --- src/Java/binnie/core/item/ManagerItem.java | 11 - src/Java/binnie/core/language/ManagerLanguage.java | 59 -- src/Java/binnie/core/machines/BlockMachine.java | 180 ------ src/Java/binnie/core/machines/IBlockMachine.java | 8 - src/Java/binnie/core/machines/IMachine.java | 25 - src/Java/binnie/core/machines/IMachineType.java | 11 - src/Java/binnie/core/machines/IOwnable.java | 10 - src/Java/binnie/core/machines/ItemMachine.java | 29 - src/Java/binnie/core/machines/Machine.java | 318 ----------- .../binnie/core/machines/MachineComponent.java | 61 --- src/Java/binnie/core/machines/MachineGroup.java | 113 ---- src/Java/binnie/core/machines/MachinePackage.java | 74 --- .../binnie/core/machines/MachineRendererBlock.java | 41 -- src/Java/binnie/core/machines/MachineUtil.java | 216 -------- src/Java/binnie/core/machines/ManagerMachine.java | 108 ---- src/Java/binnie/core/machines/ModelBlock.java | 42 -- src/Java/binnie/core/machines/RendererMachine.java | 68 --- .../binnie/core/machines/TileEntityMachine.java | 111 ---- .../core/machines/base/DefaultInventory.java | 82 --- .../binnie/core/machines/base/DefaultPower.java | 70 --- .../core/machines/base/DefaultTankContainer.java | 79 --- .../core/machines/base/TileEntityMachineBase.java | 256 --------- .../core/machines/component/ComponentRecipe.java | 14 - .../core/machines/component/IBuildcraft.java | 20 - .../core/machines/component/IComponentRecipe.java | 12 - .../core/machines/component/IInteraction.java | 22 - .../binnie/core/machines/component/IRender.java | 28 - .../core/machines/inventory/AccessDirection.java | 97 ---- .../binnie/core/machines/inventory/BaseSlot.java | 148 ----- .../machines/inventory/ComponentChargedSlots.java | 115 ---- .../machines/inventory/ComponentInventory.java | 22 - .../inventory/ComponentInventorySlots.java | 247 --------- .../inventory/ComponentInventoryTransfer.java | 162 ------ .../machines/inventory/ComponentTankContainer.java | 207 ------- .../core/machines/inventory/IChargedSlots.java | 10 - .../core/machines/inventory/IInventoryMachine.java | 8 - .../core/machines/inventory/IInventorySlots.java | 14 - .../machines/inventory/IValidatedInventory.java | 9 - .../inventory/IValidatedTankContainer.java | 10 - .../core/machines/inventory/InventorySlot.java | 115 ---- .../core/machines/inventory/MachineSide.java | 79 --- .../binnie/core/machines/inventory/SetList.java | 36 -- .../core/machines/inventory/SidedAccess.java | 106 ---- .../core/machines/inventory/SlotValidator.java | 66 --- .../binnie/core/machines/inventory/TankSlot.java | 58 -- .../core/machines/inventory/TransferHandler.java | 227 -------- .../binnie/core/machines/inventory/Validator.java | 9 - .../core/machines/inventory/ValidatorIcon.java | 25 - .../binnie/core/machines/network/INetwork.java | 30 - .../machines/power/ComponentPowerReceptor.java | 183 ------- .../core/machines/power/ComponentProcess.java | 90 --- .../machines/power/ComponentProcessIndefinate.java | 119 ---- .../machines/power/ComponentProcessSetCost.java | 27 - .../binnie/core/machines/power/ErrorState.java | 187 ------- .../core/machines/power/IErrorStateSource.java | 8 - .../core/machines/power/IPoweredMachine.java | 12 - src/Java/binnie/core/machines/power/IProcess.java | 13 - .../binnie/core/machines/power/IProcessTimed.java | 13 - .../binnie/core/machines/power/ITankMachine.java | 20 - src/Java/binnie/core/machines/power/PowerInfo.java | 41 -- .../binnie/core/machines/power/PowerInterface.java | 90 --- .../binnie/core/machines/power/PowerSystem.java | 44 -- .../binnie/core/machines/power/ProcessInfo.java | 67 --- src/Java/binnie/core/machines/power/TankInfo.java | 76 --- .../binnie/core/machines/storage/Compartment.java | 64 --- .../core/machines/storage/CompartmentTab.java | 77 --- .../machines/storage/ComponentBinnieCoreGUI.java | 27 - .../storage/ComponentCompartmentInventory.java | 128 ----- .../machines/storage/ControlColourSelector.java | 47 -- .../storage/MachineRendererCompartment.java | 50 -- .../core/machines/storage/ModelCompartment.java | 171 ------ .../core/machines/storage/ModuleStorage.java | 39 -- .../core/machines/storage/StandardCompartment.java | 142 ----- .../core/machines/storage/WindowCompartment.java | 594 -------------------- .../binnie/core/machines/storage/WindowTest.java | 40 -- .../core/machines/transfer/TransferHandler.java | 3 - .../core/machines/transfer/TransferRequest.java | 419 -------------- .../core/mod/config/BinnieConfiguration.java | 21 - .../binnie/core/mod/config/BinnieItemData.java | 15 - src/Java/binnie/core/mod/config/ConfigFile.java | 11 - .../binnie/core/mod/config/ConfigProperty.java | 26 - .../binnie/core/mod/config/ConfigurationMain.java | 4 - .../binnie/core/mod/config/ConfigurationMods.java | 18 - src/Java/binnie/core/mod/config/ManagerConfig.java | 71 --- src/Java/binnie/core/mod/config/PropBoolean.java | 38 -- src/Java/binnie/core/mod/config/PropDouble.java | 38 -- src/Java/binnie/core/mod/config/PropInteger.java | 38 -- .../binnie/core/mod/config/PropPercentage.java | 43 -- src/Java/binnie/core/mod/config/PropertyBase.java | 72 --- src/Java/binnie/core/mod/parser/FieldParser.java | 55 -- src/Java/binnie/core/mod/parser/ItemParser.java | 24 - .../core/multiblock/BlockMultiblockMachine.java | 27 - .../multiblock/TileEntityMultiblockMachine.java | 37 -- .../binnie/core/network/BinnieCorePacketID.java | 77 --- .../binnie/core/network/BinniePacketHandler.java | 43 -- src/Java/binnie/core/network/INetworkedEntity.java | 10 - src/Java/binnie/core/network/IOrdinaled.java | 6 - src/Java/binnie/core/network/IPacketID.java | 10 - src/Java/binnie/core/network/IPacketProvider.java | 8 - src/Java/binnie/core/network/packet/IPacket.java | 8 - .../core/network/packet/IPacketLocation.java | 15 - .../binnie/core/network/packet/IndexInPayload.java | 15 - .../binnie/core/network/packet/MachinePayload.java | 77 --- .../binnie/core/network/packet/MessageBase.java | 69 --- .../binnie/core/network/packet/MessageBinnie.java | 40 -- .../network/packet/MessageContainerUpdate.java | 17 - .../core/network/packet/MessageCoordinates.java | 59 -- .../core/network/packet/MessageCraftGUI.java | 18 - .../core/network/packet/MessageMetadata.java | 36 -- .../binnie/core/network/packet/MessageNBT.java | 49 -- .../binnie/core/network/packet/MessageTileNBT.java | 82 --- .../binnie/core/network/packet/MessageUpdate.java | 92 ---- .../binnie/core/network/packet/PacketPayload.java | 70 --- src/Java/binnie/core/proxy/BinnieModProxy.java | 67 --- src/Java/binnie/core/proxy/BinnieProxy.java | 156 ------ src/Java/binnie/core/proxy/BinnieProxyClient.java | 158 ------ src/Java/binnie/core/proxy/BinnieProxyServer.java | 6 - src/Java/binnie/core/proxy/IBinnieModProxy.java | 21 - src/Java/binnie/core/proxy/IBinnieProxy.java | 54 -- src/Java/binnie/core/proxy/IProxyCore.java | 7 - src/Java/binnie/core/resource/BinnieIcon.java | 47 -- src/Java/binnie/core/resource/BinnieResource.java | 38 -- src/Java/binnie/core/resource/IBinnieTexture.java | 6 - src/Java/binnie/core/resource/ManagerResource.java | 48 -- src/Java/binnie/core/resource/ResourceType.java | 18 - .../binnie/core/texture/BinnieCoreTexture.java | 28 - src/Java/binnie/core/texture/TextureManager.java | 15 - src/Java/binnie/core/triggers/ActionProvider.java | 38 -- src/Java/binnie/core/triggers/BinnieAction.java | 88 --- src/Java/binnie/core/triggers/BinnieTrigger.java | 116 ---- src/Java/binnie/core/triggers/ModuleTrigger.java | 45 -- src/Java/binnie/core/triggers/TriggerData.java | 37 -- .../binnie/core/triggers/TriggerInventory.java | 11 - src/Java/binnie/core/triggers/TriggerPower.java | 48 -- src/Java/binnie/core/triggers/TriggerProvider.java | 57 -- src/Java/binnie/core/triggers/TriggerWorking.java | 47 -- src/Java/binnie/core/util/FluidStackSet.java | 128 ----- src/Java/binnie/core/util/IValidator.java | 6 - src/Java/binnie/core/util/ItemStackSet.java | 128 ----- src/Java/binnie/core/util/UniqueFluidStackSet.java | 28 - src/Java/binnie/core/util/UniqueItemStackSet.java | 28 - .../binnie/craftgui/binniecore/WindowFieldKit.java | 334 ------------ .../binnie/craftgui/binniecore/WindowGenesis.java | 264 --------- .../binnie/craftgui/controls/ControlCheckbox.java | 75 --- src/Java/binnie/craftgui/controls/ControlText.java | 50 -- .../craftgui/controls/ControlTextCentered.java | 15 - .../binnie/craftgui/controls/ControlTextEdit.java | 154 ------ .../craftgui/controls/IControlSelection.java | 10 - .../craftgui/controls/IControlSelectionOption.java | 6 - .../craftgui/controls/button/ControlButton.java | 70 --- .../controls/button/ControlEnumButton.java | 61 --- .../controls/button/ControlToggleButton.java | 21 - .../binnie/craftgui/controls/core/Control.java | 85 --- .../craftgui/controls/core/IControlIndexed.java | 8 - .../craftgui/controls/core/IControlValue.java | 11 - .../craftgui/controls/core/IControlValues.java | 11 - .../craftgui/controls/listbox/ControlList.java | 146 ----- .../craftgui/controls/listbox/ControlListBox.java | 76 --- .../craftgui/controls/listbox/ControlOption.java | 73 --- .../controls/listbox/ControlTextOption.java | 37 -- .../binnie/craftgui/controls/page/ControlPage.java | 36 -- .../craftgui/controls/page/ControlPages.java | 57 -- .../craftgui/controls/scroll/ControlScroll.java | 22 - .../craftgui/controls/scroll/ControlScrollBar.java | 94 ---- .../controls/scroll/ControlScrollableContent.java | 134 ----- .../controls/scroll/IControlScrollable.java | 17 - .../binnie/craftgui/controls/tab/ControlTab.java | 128 ----- .../craftgui/controls/tab/ControlTabBar.java | 86 --- src/Java/binnie/craftgui/core/Attribute.java | 9 - src/Java/binnie/craftgui/core/CraftGUI.java | 10 - src/Java/binnie/craftgui/core/ITooltip.java | 6 - src/Java/binnie/craftgui/core/ITooltipHelp.java | 6 - src/Java/binnie/craftgui/core/ITopLevelWidget.java | 29 - src/Java/binnie/craftgui/core/IWidget.java | 138 ----- .../binnie/craftgui/core/IWidgetAttribute.java | 3 - src/Java/binnie/craftgui/core/RenderStage.java | 8 - src/Java/binnie/craftgui/core/Tooltip.java | 84 --- src/Java/binnie/craftgui/core/TopLevelWidget.java | 248 --------- src/Java/binnie/craftgui/core/Widget.java | 499 ----------------- .../craftgui/core/geometry/CraftGUIUtil.java | 77 --- src/Java/binnie/craftgui/core/geometry/IArea.java | 143 ----- .../binnie/craftgui/core/geometry/IBorder.java | 126 ----- src/Java/binnie/craftgui/core/geometry/IPoint.java | 83 --- .../binnie/craftgui/core/geometry/Position.java | 41 -- .../craftgui/core/geometry/TextJustification.java | 25 - .../binnie/craftgui/core/renderer/Renderer.java | 252 --------- .../binnie/craftgui/core/renderer/TextureType.java | 8 - src/Java/binnie/craftgui/events/Event.java | 23 - .../binnie/craftgui/events/EventButtonClicked.java | 21 - .../binnie/craftgui/events/EventCycleChanged.java | 20 - src/Java/binnie/craftgui/events/EventHandler.java | 53 -- src/Java/binnie/craftgui/events/EventKey.java | 63 --- src/Java/binnie/craftgui/events/EventMouse.java | 156 ------ src/Java/binnie/craftgui/events/EventTextEdit.java | 21 - .../craftgui/events/EventToggleButtonClicked.java | 20 - .../binnie/craftgui/events/EventValueChanged.java | 29 - .../binnie/craftgui/events/EventValuesChanged.java | 20 - src/Java/binnie/craftgui/events/EventWidget.java | 272 --------- .../craftgui/minecraft/ContainerCraftGUI.java | 549 ------------------- src/Java/binnie/craftgui/minecraft/CustomSlot.java | 54 -- src/Java/binnie/craftgui/minecraft/Dialog.java | 53 -- src/Java/binnie/craftgui/minecraft/EnumColor.java | 32 -- src/Java/binnie/craftgui/minecraft/GUIIcon.java | 30 - .../binnie/craftgui/minecraft/GuiCraftGUI.java | 605 --------------------- .../craftgui/minecraft/IMachineInformation.java | 6 - .../craftgui/minecraft/IMinecraftTooltip.java | 9 - .../minecraft/IWindowAffectsShiftClick.java | 8 - .../binnie/craftgui/minecraft/InventoryType.java | 8 - src/Java/binnie/craftgui/minecraft/ListMap.java | 149 ----- .../binnie/craftgui/minecraft/MinecraftGUI.java | 14 - .../craftgui/minecraft/MinecraftTooltip.java | 63 --- .../binnie/craftgui/minecraft/ModuleCraftGUI.java | 18 - src/Java/binnie/craftgui/minecraft/Window.java | 338 ------------ .../binnie/craftgui/minecraft/WindowInventory.java | 144 ----- .../minecraft/control/ControlEnergyBar.java | 161 ------ .../minecraft/control/ControlErrorState.java | 113 ---- .../craftgui/minecraft/control/ControlHelp.java | 41 -- .../minecraft/control/ControlIconDisplay.java | 25 - .../craftgui/minecraft/control/ControlImage.java | 25 - .../craftgui/minecraft/control/ControlInfo.java | 38 -- .../minecraft/control/ControlItemDisplay.java | 98 ---- .../minecraft/control/ControlLiquidTank.java | 223 -------- .../minecraft/control/ControlMachineProgress.java | 14 - .../minecraft/control/ControlPlayerInventory.java | 108 ---- .../minecraft/control/ControlPowerSystem.java | 39 -- .../minecraft/control/ControlProgress.java | 30 - .../minecraft/control/ControlProgressBase.java | 100 ---- .../craftgui/minecraft/control/ControlSlide.java | 113 ---- .../craftgui/minecraft/control/ControlSlot.java | 221 -------- .../minecraft/control/ControlSlotArray.java | 76 --- .../minecraft/control/ControlSlotBase.java | 77 --- .../minecraft/control/ControlSlotCharge.java | 43 -- .../craftgui/minecraft/control/ControlTabIcon.java | 47 -- .../craftgui/minecraft/control/ControlUser.java | 41 -- .../minecraft/control/EnumHighlighting.java | 28 - .../minecraft/render/MinecraftTexture.java | 10 - .../craftgui/minecraft/render/RenderCommand.java | 16 - .../craftgui/mod/database/ControlBranchBox.java | 20 - .../mod/database/ControlBranchBoxOption.java | 14 - .../mod/database/ControlBreedingProgress.java | 41 -- .../database/ControlDatabaseIndividualDisplay.java | 120 ---- .../mod/database/ControlItemStackOption.java | 38 -- .../craftgui/mod/database/ControlMutationBox.java | 71 --- .../craftgui/mod/database/ControlMutationItem.java | 51 -- .../mod/database/ControlMutationSymbol.java | 80 --- .../craftgui/mod/database/ControlSpeciesBox.java | 55 -- .../mod/database/ControlSpeciexBoxOption.java | 42 -- .../binnie/craftgui/mod/database/DatabaseTab.java | 32 -- .../craftgui/mod/database/EnumDiscoveryState.java | 8 - .../craftgui/mod/database/IDatabaseMode.java | 6 - .../binnie/craftgui/mod/database/PageAbstract.java | 16 - .../binnie/craftgui/mod/database/PageBranch.java | 13 - .../craftgui/mod/database/PageBranchOverview.java | 67 --- .../craftgui/mod/database/PageBranchSpecies.java | 43 -- .../binnie/craftgui/mod/database/PageBreeder.java | 51 -- .../craftgui/mod/database/PageBreederStats.java | 23 - .../binnie/craftgui/mod/database/PageSpecies.java | 13 - .../mod/database/PageSpeciesClassification.java | 54 -- .../mod/database/PageSpeciesMutations.java | 27 - .../craftgui/mod/database/PageSpeciesOverview.java | 88 --- .../mod/database/PageSpeciesResultant.java | 27 - .../mod/database/WindowAbstractDatabase.java | 314 ----------- src/Java/binnie/craftgui/resource/IStyleSheet.java | 6 - src/Java/binnie/craftgui/resource/StyleSheet.java | 18 - .../craftgui/resource/StyleSheetManager.java | 28 - src/Java/binnie/craftgui/resource/Texture.java | 128 ----- .../minecraft/CraftGUIResourceManager.java | 155 ------ .../resource/minecraft/CraftGUITexture.java | 18 - .../resource/minecraft/CraftGUITextureSheet.java | 33 -- .../craftgui/resource/minecraft/PaddedTexture.java | 21 - .../resource/minecraft/ParsedTextureSheet.java | 25 - .../resource/minecraft/StandardTexture.java | 36 -- src/Java/binnie/craftgui/window/Panel.java | 58 -- src/Java/binnie/extrabees/ExtraBees.java | 123 ----- .../extrabees/apiary/ComponentBeeModifier.java | 88 --- .../extrabees/apiary/ComponentExtraBeeGUI.java | 28 - .../binnie/extrabees/apiary/EnumHiveFrame.java | 140 ----- .../binnie/extrabees/apiary/IndustrialFrame.java | 141 ----- .../binnie/extrabees/apiary/ItemHiveFrame.java | 100 ---- .../extrabees/apiary/ItemIndustrialFrame.java | 66 --- src/Java/binnie/extrabees/apiary/ModuleApiary.java | 96 ---- .../extrabees/apiary/TileExtraBeeAlveary.java | 355 ------------ .../extrabees/apiary/machine/AlvearyFrame.java | 125 ----- .../extrabees/apiary/machine/AlvearyHatchery.java | 106 ---- .../extrabees/apiary/machine/AlvearyLighting.java | 41 -- .../extrabees/apiary/machine/AlvearyMachine.java | 66 --- .../extrabees/apiary/machine/AlvearyMutator.java | 125 ----- .../apiary/machine/AlvearyRainShield.java | 41 -- .../apiary/machine/AlvearyStimulator.java | 430 --------------- .../apiary/machine/AlvearyTransmission.java | 81 --- .../extrabees/config/ConfigurationMachines.java | 17 - .../binnie/extrabees/config/ConfigurationMain.java | 26 - src/Java/binnie/extrabees/core/ExtraBeeGUID.java | 54 -- src/Java/binnie/extrabees/core/ExtraBeeItems.java | 172 ------ .../binnie/extrabees/core/ExtraBeeTexture.java | 28 - src/Java/binnie/extrabees/core/ModuleCore.java | 19 - .../binnie/extrabees/gui/WindowAlvearyFrame.java | 53 -- .../extrabees/gui/WindowAlvearyHatchery.java | 54 -- .../gui/WindowAlvearyIndustrialFrame.java | 53 -- .../binnie/extrabees/gui/WindowAlvearyMutator.java | 78 --- .../extrabees/gui/WindowAlvearyStimulator.java | 56 -- .../binnie/extrabees/liquids/ExtraBeeLiquid.java | 80 --- .../binnie/extrabees/liquids/ModuleLiquids.java | 19 - .../binnie/extrabees/proxy/ExtraBeesProxy.java | 13 - .../extrabees/proxy/ExtraBeesProxyClient.java | 5 - .../extrabees/proxy/ExtraBeesProxyServer.java | 5 - src/Java/miscutil/MiscUtils.java | 21 +- src/Java/miscutil/core/CommonProxy.java | 70 --- src/Java/miscutil/core/block/BasicBlock.java | 4 +- src/Java/miscutil/core/block/ModBlocks.java | 6 + src/Java/miscutil/core/commands/CommandMath.java | 8 +- .../core/creativetabs/AddToCreativeTab.java | 20 + .../miscutil/core/creativetabs/TMCreativeTabs.java | 20 - src/Java/miscutil/core/item/ModItems.java | 58 +- .../core/item/materials/MaterialHandler.java | 1 + src/Java/miscutil/core/lib/Strings.java | 5 + src/Java/miscutil/core/proxy/ClientProxy.java | 2 +- src/Java/miscutil/core/proxy/ServerProxy.java | 2 +- .../init/machines/GregtechEnergyBuffer.java | 4 +- 344 files changed, 87 insertions(+), 24207 deletions(-) delete mode 100644 src/Java/binnie/Binnie.java delete mode 100644 src/Java/binnie/Constants.java delete mode 100644 src/Java/binnie/core/AbstractMod.java delete mode 100644 src/Java/binnie/core/BinnieCore.java delete mode 100644 src/Java/binnie/core/IInitializable.java delete mode 100644 src/Java/binnie/core/ManagerBase.java delete mode 100644 src/Java/binnie/core/Mods.java delete mode 100644 src/Java/binnie/core/block/BlockMetadata.java delete mode 100644 src/Java/binnie/core/block/IBlockMetadata.java delete mode 100644 src/Java/binnie/core/block/IMultipassBlock.java delete mode 100644 src/Java/binnie/core/block/ItemMetadata.java delete mode 100644 src/Java/binnie/core/block/ItemMetadataRenderer.java delete mode 100644 src/Java/binnie/core/block/MultipassBlockRenderer.java delete mode 100644 src/Java/binnie/core/block/MultipassItemRenderer.java delete mode 100644 src/Java/binnie/core/block/TileEntityMetadata.java delete mode 100644 src/Java/binnie/core/circuits/BinnieCircuit.java delete mode 100644 src/Java/binnie/core/circuits/BinnieCircuitLayout.java delete mode 100644 src/Java/binnie/core/gui/BinnieCoreGUI.java delete mode 100644 src/Java/binnie/core/gui/BinnieGUIHandler.java delete mode 100644 src/Java/binnie/core/gui/IBinnieGUID.java delete mode 100644 src/Java/binnie/core/item/IItemEnum.java delete mode 100644 src/Java/binnie/core/item/IItemMisc.java delete mode 100644 src/Java/binnie/core/item/ItemFieldKit.java delete mode 100644 src/Java/binnie/core/item/ItemGenesis.java delete mode 100644 src/Java/binnie/core/item/ItemMisc.java delete mode 100644 src/Java/binnie/core/item/ManagerItem.java delete mode 100644 src/Java/binnie/core/language/ManagerLanguage.java delete mode 100644 src/Java/binnie/core/machines/BlockMachine.java delete mode 100644 src/Java/binnie/core/machines/IBlockMachine.java delete mode 100644 src/Java/binnie/core/machines/IMachine.java delete mode 100644 src/Java/binnie/core/machines/IMachineType.java delete mode 100644 src/Java/binnie/core/machines/IOwnable.java delete mode 100644 src/Java/binnie/core/machines/ItemMachine.java delete mode 100644 src/Java/binnie/core/machines/Machine.java delete mode 100644 src/Java/binnie/core/machines/MachineComponent.java delete mode 100644 src/Java/binnie/core/machines/MachineGroup.java delete mode 100644 src/Java/binnie/core/machines/MachinePackage.java delete mode 100644 src/Java/binnie/core/machines/MachineRendererBlock.java delete mode 100644 src/Java/binnie/core/machines/MachineUtil.java delete mode 100644 src/Java/binnie/core/machines/ManagerMachine.java delete mode 100644 src/Java/binnie/core/machines/ModelBlock.java delete mode 100644 src/Java/binnie/core/machines/RendererMachine.java delete mode 100644 src/Java/binnie/core/machines/TileEntityMachine.java delete mode 100644 src/Java/binnie/core/machines/base/DefaultInventory.java delete mode 100644 src/Java/binnie/core/machines/base/DefaultPower.java delete mode 100644 src/Java/binnie/core/machines/base/DefaultTankContainer.java delete mode 100644 src/Java/binnie/core/machines/base/TileEntityMachineBase.java delete mode 100644 src/Java/binnie/core/machines/component/ComponentRecipe.java delete mode 100644 src/Java/binnie/core/machines/component/IBuildcraft.java delete mode 100644 src/Java/binnie/core/machines/component/IComponentRecipe.java delete mode 100644 src/Java/binnie/core/machines/component/IInteraction.java delete mode 100644 src/Java/binnie/core/machines/component/IRender.java delete mode 100644 src/Java/binnie/core/machines/inventory/AccessDirection.java delete mode 100644 src/Java/binnie/core/machines/inventory/BaseSlot.java delete mode 100644 src/Java/binnie/core/machines/inventory/ComponentChargedSlots.java delete mode 100644 src/Java/binnie/core/machines/inventory/ComponentInventory.java delete mode 100644 src/Java/binnie/core/machines/inventory/ComponentInventorySlots.java delete mode 100644 src/Java/binnie/core/machines/inventory/ComponentInventoryTransfer.java delete mode 100644 src/Java/binnie/core/machines/inventory/ComponentTankContainer.java delete mode 100644 src/Java/binnie/core/machines/inventory/IChargedSlots.java delete mode 100644 src/Java/binnie/core/machines/inventory/IInventoryMachine.java delete mode 100644 src/Java/binnie/core/machines/inventory/IInventorySlots.java delete mode 100644 src/Java/binnie/core/machines/inventory/IValidatedInventory.java delete mode 100644 src/Java/binnie/core/machines/inventory/IValidatedTankContainer.java delete mode 100644 src/Java/binnie/core/machines/inventory/InventorySlot.java delete mode 100644 src/Java/binnie/core/machines/inventory/MachineSide.java delete mode 100644 src/Java/binnie/core/machines/inventory/SetList.java delete mode 100644 src/Java/binnie/core/machines/inventory/SidedAccess.java delete mode 100644 src/Java/binnie/core/machines/inventory/SlotValidator.java delete mode 100644 src/Java/binnie/core/machines/inventory/TankSlot.java delete mode 100644 src/Java/binnie/core/machines/inventory/TransferHandler.java delete mode 100644 src/Java/binnie/core/machines/inventory/Validator.java delete mode 100644 src/Java/binnie/core/machines/inventory/ValidatorIcon.java delete mode 100644 src/Java/binnie/core/machines/network/INetwork.java delete mode 100644 src/Java/binnie/core/machines/power/ComponentPowerReceptor.java delete mode 100644 src/Java/binnie/core/machines/power/ComponentProcess.java delete mode 100644 src/Java/binnie/core/machines/power/ComponentProcessIndefinate.java delete mode 100644 src/Java/binnie/core/machines/power/ComponentProcessSetCost.java delete mode 100644 src/Java/binnie/core/machines/power/ErrorState.java delete mode 100644 src/Java/binnie/core/machines/power/IErrorStateSource.java delete mode 100644 src/Java/binnie/core/machines/power/IPoweredMachine.java delete mode 100644 src/Java/binnie/core/machines/power/IProcess.java delete mode 100644 src/Java/binnie/core/machines/power/IProcessTimed.java delete mode 100644 src/Java/binnie/core/machines/power/ITankMachine.java delete mode 100644 src/Java/binnie/core/machines/power/PowerInfo.java delete mode 100644 src/Java/binnie/core/machines/power/PowerInterface.java delete mode 100644 src/Java/binnie/core/machines/power/PowerSystem.java delete mode 100644 src/Java/binnie/core/machines/power/ProcessInfo.java delete mode 100644 src/Java/binnie/core/machines/power/TankInfo.java delete mode 100644 src/Java/binnie/core/machines/storage/Compartment.java delete mode 100644 src/Java/binnie/core/machines/storage/CompartmentTab.java delete mode 100644 src/Java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java delete mode 100644 src/Java/binnie/core/machines/storage/ComponentCompartmentInventory.java delete mode 100644 src/Java/binnie/core/machines/storage/ControlColourSelector.java delete mode 100644 src/Java/binnie/core/machines/storage/MachineRendererCompartment.java delete mode 100644 src/Java/binnie/core/machines/storage/ModelCompartment.java delete mode 100644 src/Java/binnie/core/machines/storage/ModuleStorage.java delete mode 100644 src/Java/binnie/core/machines/storage/StandardCompartment.java delete mode 100644 src/Java/binnie/core/machines/storage/WindowCompartment.java delete mode 100644 src/Java/binnie/core/machines/storage/WindowTest.java delete mode 100644 src/Java/binnie/core/machines/transfer/TransferHandler.java delete mode 100644 src/Java/binnie/core/machines/transfer/TransferRequest.java delete mode 100644 src/Java/binnie/core/mod/config/BinnieConfiguration.java delete mode 100644 src/Java/binnie/core/mod/config/BinnieItemData.java delete mode 100644 src/Java/binnie/core/mod/config/ConfigFile.java delete mode 100644 src/Java/binnie/core/mod/config/ConfigProperty.java delete mode 100644 src/Java/binnie/core/mod/config/ConfigurationMain.java delete mode 100644 src/Java/binnie/core/mod/config/ConfigurationMods.java delete mode 100644 src/Java/binnie/core/mod/config/ManagerConfig.java delete mode 100644 src/Java/binnie/core/mod/config/PropBoolean.java delete mode 100644 src/Java/binnie/core/mod/config/PropDouble.java delete mode 100644 src/Java/binnie/core/mod/config/PropInteger.java delete mode 100644 src/Java/binnie/core/mod/config/PropPercentage.java delete mode 100644 src/Java/binnie/core/mod/config/PropertyBase.java delete mode 100644 src/Java/binnie/core/mod/parser/FieldParser.java delete mode 100644 src/Java/binnie/core/mod/parser/ItemParser.java delete mode 100644 src/Java/binnie/core/multiblock/BlockMultiblockMachine.java delete mode 100644 src/Java/binnie/core/multiblock/TileEntityMultiblockMachine.java delete mode 100644 src/Java/binnie/core/network/BinnieCorePacketID.java delete mode 100644 src/Java/binnie/core/network/BinniePacketHandler.java delete mode 100644 src/Java/binnie/core/network/INetworkedEntity.java delete mode 100644 src/Java/binnie/core/network/IOrdinaled.java delete mode 100644 src/Java/binnie/core/network/IPacketID.java delete mode 100644 src/Java/binnie/core/network/IPacketProvider.java delete mode 100644 src/Java/binnie/core/network/packet/IPacket.java delete mode 100644 src/Java/binnie/core/network/packet/IPacketLocation.java delete mode 100644 src/Java/binnie/core/network/packet/IndexInPayload.java delete mode 100644 src/Java/binnie/core/network/packet/MachinePayload.java delete mode 100644 src/Java/binnie/core/network/packet/MessageBase.java delete mode 100644 src/Java/binnie/core/network/packet/MessageBinnie.java delete mode 100644 src/Java/binnie/core/network/packet/MessageContainerUpdate.java delete mode 100644 src/Java/binnie/core/network/packet/MessageCoordinates.java delete mode 100644 src/Java/binnie/core/network/packet/MessageCraftGUI.java delete mode 100644 src/Java/binnie/core/network/packet/MessageMetadata.java delete mode 100644 src/Java/binnie/core/network/packet/MessageNBT.java delete mode 100644 src/Java/binnie/core/network/packet/MessageTileNBT.java delete mode 100644 src/Java/binnie/core/network/packet/MessageUpdate.java delete mode 100644 src/Java/binnie/core/network/packet/PacketPayload.java delete mode 100644 src/Java/binnie/core/proxy/BinnieModProxy.java delete mode 100644 src/Java/binnie/core/proxy/BinnieProxy.java delete mode 100644 src/Java/binnie/core/proxy/BinnieProxyClient.java delete mode 100644 src/Java/binnie/core/proxy/BinnieProxyServer.java delete mode 100644 src/Java/binnie/core/proxy/IBinnieModProxy.java delete mode 100644 src/Java/binnie/core/proxy/IBinnieProxy.java delete mode 100644 src/Java/binnie/core/proxy/IProxyCore.java delete mode 100644 src/Java/binnie/core/resource/BinnieIcon.java delete mode 100644 src/Java/binnie/core/resource/BinnieResource.java delete mode 100644 src/Java/binnie/core/resource/IBinnieTexture.java delete mode 100644 src/Java/binnie/core/resource/ManagerResource.java delete mode 100644 src/Java/binnie/core/resource/ResourceType.java delete mode 100644 src/Java/binnie/core/texture/BinnieCoreTexture.java delete mode 100644 src/Java/binnie/core/texture/TextureManager.java delete mode 100644 src/Java/binnie/core/triggers/ActionProvider.java delete mode 100644 src/Java/binnie/core/triggers/BinnieAction.java delete mode 100644 src/Java/binnie/core/triggers/BinnieTrigger.java delete mode 100644 src/Java/binnie/core/triggers/ModuleTrigger.java delete mode 100644 src/Java/binnie/core/triggers/TriggerData.java delete mode 100644 src/Java/binnie/core/triggers/TriggerInventory.java delete mode 100644 src/Java/binnie/core/triggers/TriggerPower.java delete mode 100644 src/Java/binnie/core/triggers/TriggerProvider.java delete mode 100644 src/Java/binnie/core/triggers/TriggerWorking.java delete mode 100644 src/Java/binnie/core/util/FluidStackSet.java delete mode 100644 src/Java/binnie/core/util/IValidator.java delete mode 100644 src/Java/binnie/core/util/ItemStackSet.java delete mode 100644 src/Java/binnie/core/util/UniqueFluidStackSet.java delete mode 100644 src/Java/binnie/core/util/UniqueItemStackSet.java delete mode 100644 src/Java/binnie/craftgui/binniecore/WindowFieldKit.java delete mode 100644 src/Java/binnie/craftgui/binniecore/WindowGenesis.java delete mode 100644 src/Java/binnie/craftgui/controls/ControlCheckbox.java delete mode 100644 src/Java/binnie/craftgui/controls/ControlText.java delete mode 100644 src/Java/binnie/craftgui/controls/ControlTextCentered.java delete mode 100644 src/Java/binnie/craftgui/controls/ControlTextEdit.java delete mode 100644 src/Java/binnie/craftgui/controls/IControlSelection.java delete mode 100644 src/Java/binnie/craftgui/controls/IControlSelectionOption.java delete mode 100644 src/Java/binnie/craftgui/controls/button/ControlButton.java delete mode 100644 src/Java/binnie/craftgui/controls/button/ControlEnumButton.java delete mode 100644 src/Java/binnie/craftgui/controls/button/ControlToggleButton.java delete mode 100644 src/Java/binnie/craftgui/controls/core/Control.java delete mode 100644 src/Java/binnie/craftgui/controls/core/IControlIndexed.java delete mode 100644 src/Java/binnie/craftgui/controls/core/IControlValue.java delete mode 100644 src/Java/binnie/craftgui/controls/core/IControlValues.java delete mode 100644 src/Java/binnie/craftgui/controls/listbox/ControlList.java delete mode 100644 src/Java/binnie/craftgui/controls/listbox/ControlListBox.java delete mode 100644 src/Java/binnie/craftgui/controls/listbox/ControlOption.java delete mode 100644 src/Java/binnie/craftgui/controls/listbox/ControlTextOption.java delete mode 100644 src/Java/binnie/craftgui/controls/page/ControlPage.java delete mode 100644 src/Java/binnie/craftgui/controls/page/ControlPages.java delete mode 100644 src/Java/binnie/craftgui/controls/scroll/ControlScroll.java delete mode 100644 src/Java/binnie/craftgui/controls/scroll/ControlScrollBar.java delete mode 100644 src/Java/binnie/craftgui/controls/scroll/ControlScrollableContent.java delete mode 100644 src/Java/binnie/craftgui/controls/scroll/IControlScrollable.java delete mode 100644 src/Java/binnie/craftgui/controls/tab/ControlTab.java delete mode 100644 src/Java/binnie/craftgui/controls/tab/ControlTabBar.java delete mode 100644 src/Java/binnie/craftgui/core/Attribute.java delete mode 100644 src/Java/binnie/craftgui/core/CraftGUI.java delete mode 100644 src/Java/binnie/craftgui/core/ITooltip.java delete mode 100644 src/Java/binnie/craftgui/core/ITooltipHelp.java delete mode 100644 src/Java/binnie/craftgui/core/ITopLevelWidget.java delete mode 100644 src/Java/binnie/craftgui/core/IWidget.java delete mode 100644 src/Java/binnie/craftgui/core/IWidgetAttribute.java delete mode 100644 src/Java/binnie/craftgui/core/RenderStage.java delete mode 100644 src/Java/binnie/craftgui/core/Tooltip.java delete mode 100644 src/Java/binnie/craftgui/core/TopLevelWidget.java delete mode 100644 src/Java/binnie/craftgui/core/Widget.java delete mode 100644 src/Java/binnie/craftgui/core/geometry/CraftGUIUtil.java delete mode 100644 src/Java/binnie/craftgui/core/geometry/IArea.java delete mode 100644 src/Java/binnie/craftgui/core/geometry/IBorder.java delete mode 100644 src/Java/binnie/craftgui/core/geometry/IPoint.java delete mode 100644 src/Java/binnie/craftgui/core/geometry/Position.java delete mode 100644 src/Java/binnie/craftgui/core/geometry/TextJustification.java delete mode 100644 src/Java/binnie/craftgui/core/renderer/Renderer.java delete mode 100644 src/Java/binnie/craftgui/core/renderer/TextureType.java delete mode 100644 src/Java/binnie/craftgui/events/Event.java delete mode 100644 src/Java/binnie/craftgui/events/EventButtonClicked.java delete mode 100644 src/Java/binnie/craftgui/events/EventCycleChanged.java delete mode 100644 src/Java/binnie/craftgui/events/EventHandler.java delete mode 100644 src/Java/binnie/craftgui/events/EventKey.java delete mode 100644 src/Java/binnie/craftgui/events/EventMouse.java delete mode 100644 src/Java/binnie/craftgui/events/EventTextEdit.java delete mode 100644 src/Java/binnie/craftgui/events/EventToggleButtonClicked.java delete mode 100644 src/Java/binnie/craftgui/events/EventValueChanged.java delete mode 100644 src/Java/binnie/craftgui/events/EventValuesChanged.java delete mode 100644 src/Java/binnie/craftgui/events/EventWidget.java delete mode 100644 src/Java/binnie/craftgui/minecraft/ContainerCraftGUI.java delete mode 100644 src/Java/binnie/craftgui/minecraft/CustomSlot.java delete mode 100644 src/Java/binnie/craftgui/minecraft/Dialog.java delete mode 100644 src/Java/binnie/craftgui/minecraft/EnumColor.java delete mode 100644 src/Java/binnie/craftgui/minecraft/GUIIcon.java delete mode 100644 src/Java/binnie/craftgui/minecraft/GuiCraftGUI.java delete mode 100644 src/Java/binnie/craftgui/minecraft/IMachineInformation.java delete mode 100644 src/Java/binnie/craftgui/minecraft/IMinecraftTooltip.java delete mode 100644 src/Java/binnie/craftgui/minecraft/IWindowAffectsShiftClick.java delete mode 100644 src/Java/binnie/craftgui/minecraft/InventoryType.java delete mode 100644 src/Java/binnie/craftgui/minecraft/ListMap.java delete mode 100644 src/Java/binnie/craftgui/minecraft/MinecraftGUI.java delete mode 100644 src/Java/binnie/craftgui/minecraft/MinecraftTooltip.java delete mode 100644 src/Java/binnie/craftgui/minecraft/ModuleCraftGUI.java delete mode 100644 src/Java/binnie/craftgui/minecraft/Window.java delete mode 100644 src/Java/binnie/craftgui/minecraft/WindowInventory.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlEnergyBar.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlErrorState.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlHelp.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlIconDisplay.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlImage.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlInfo.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlItemDisplay.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlLiquidTank.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlMachineProgress.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlPlayerInventory.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlPowerSystem.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlProgress.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlProgressBase.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlSlide.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlSlot.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlSlotArray.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlSlotBase.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlSlotCharge.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlTabIcon.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/ControlUser.java delete mode 100644 src/Java/binnie/craftgui/minecraft/control/EnumHighlighting.java delete mode 100644 src/Java/binnie/craftgui/minecraft/render/MinecraftTexture.java delete mode 100644 src/Java/binnie/craftgui/minecraft/render/RenderCommand.java delete mode 100644 src/Java/binnie/craftgui/mod/database/ControlBranchBox.java delete mode 100644 src/Java/binnie/craftgui/mod/database/ControlBranchBoxOption.java delete mode 100644 src/Java/binnie/craftgui/mod/database/ControlBreedingProgress.java delete mode 100644 src/Java/binnie/craftgui/mod/database/ControlDatabaseIndividualDisplay.java delete mode 100644 src/Java/binnie/craftgui/mod/database/ControlItemStackOption.java delete mode 100644 src/Java/binnie/craftgui/mod/database/ControlMutationBox.java delete mode 100644 src/Java/binnie/craftgui/mod/database/ControlMutationItem.java delete mode 100644 src/Java/binnie/craftgui/mod/database/ControlMutationSymbol.java delete mode 100644 src/Java/binnie/craftgui/mod/database/ControlSpeciesBox.java delete mode 100644 src/Java/binnie/craftgui/mod/database/ControlSpeciexBoxOption.java delete mode 100644 src/Java/binnie/craftgui/mod/database/DatabaseTab.java delete mode 100644 src/Java/binnie/craftgui/mod/database/EnumDiscoveryState.java delete mode 100644 src/Java/binnie/craftgui/mod/database/IDatabaseMode.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageAbstract.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageBranch.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageBranchOverview.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageBranchSpecies.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageBreeder.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageBreederStats.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageSpecies.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageSpeciesClassification.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageSpeciesMutations.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageSpeciesOverview.java delete mode 100644 src/Java/binnie/craftgui/mod/database/PageSpeciesResultant.java delete mode 100644 src/Java/binnie/craftgui/mod/database/WindowAbstractDatabase.java delete mode 100644 src/Java/binnie/craftgui/resource/IStyleSheet.java delete mode 100644 src/Java/binnie/craftgui/resource/StyleSheet.java delete mode 100644 src/Java/binnie/craftgui/resource/StyleSheetManager.java delete mode 100644 src/Java/binnie/craftgui/resource/Texture.java delete mode 100644 src/Java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java delete mode 100644 src/Java/binnie/craftgui/resource/minecraft/CraftGUITexture.java delete mode 100644 src/Java/binnie/craftgui/resource/minecraft/CraftGUITextureSheet.java delete mode 100644 src/Java/binnie/craftgui/resource/minecraft/PaddedTexture.java delete mode 100644 src/Java/binnie/craftgui/resource/minecraft/ParsedTextureSheet.java delete mode 100644 src/Java/binnie/craftgui/resource/minecraft/StandardTexture.java delete mode 100644 src/Java/binnie/craftgui/window/Panel.java delete mode 100644 src/Java/binnie/extrabees/ExtraBees.java delete mode 100644 src/Java/binnie/extrabees/apiary/ComponentBeeModifier.java delete mode 100644 src/Java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java delete mode 100644 src/Java/binnie/extrabees/apiary/EnumHiveFrame.java delete mode 100644 src/Java/binnie/extrabees/apiary/IndustrialFrame.java delete mode 100644 src/Java/binnie/extrabees/apiary/ItemHiveFrame.java delete mode 100644 src/Java/binnie/extrabees/apiary/ItemIndustrialFrame.java delete mode 100644 src/Java/binnie/extrabees/apiary/ModuleApiary.java delete mode 100644 src/Java/binnie/extrabees/apiary/TileExtraBeeAlveary.java delete mode 100644 src/Java/binnie/extrabees/apiary/machine/AlvearyFrame.java delete mode 100644 src/Java/binnie/extrabees/apiary/machine/AlvearyHatchery.java delete mode 100644 src/Java/binnie/extrabees/apiary/machine/AlvearyLighting.java delete mode 100644 src/Java/binnie/extrabees/apiary/machine/AlvearyMachine.java delete mode 100644 src/Java/binnie/extrabees/apiary/machine/AlvearyMutator.java delete mode 100644 src/Java/binnie/extrabees/apiary/machine/AlvearyRainShield.java delete mode 100644 src/Java/binnie/extrabees/apiary/machine/AlvearyStimulator.java delete mode 100644 src/Java/binnie/extrabees/apiary/machine/AlvearyTransmission.java delete mode 100644 src/Java/binnie/extrabees/config/ConfigurationMachines.java delete mode 100644 src/Java/binnie/extrabees/config/ConfigurationMain.java delete mode 100644 src/Java/binnie/extrabees/core/ExtraBeeGUID.java delete mode 100644 src/Java/binnie/extrabees/core/ExtraBeeItems.java delete mode 100644 src/Java/binnie/extrabees/core/ExtraBeeTexture.java delete mode 100644 src/Java/binnie/extrabees/core/ModuleCore.java delete mode 100644 src/Java/binnie/extrabees/gui/WindowAlvearyFrame.java delete mode 100644 src/Java/binnie/extrabees/gui/WindowAlvearyHatchery.java delete mode 100644 src/Java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java delete mode 100644 src/Java/binnie/extrabees/gui/WindowAlvearyMutator.java delete mode 100644 src/Java/binnie/extrabees/gui/WindowAlvearyStimulator.java delete mode 100644 src/Java/binnie/extrabees/liquids/ExtraBeeLiquid.java delete mode 100644 src/Java/binnie/extrabees/liquids/ModuleLiquids.java delete mode 100644 src/Java/binnie/extrabees/proxy/ExtraBeesProxy.java delete mode 100644 src/Java/binnie/extrabees/proxy/ExtraBeesProxyClient.java delete mode 100644 src/Java/binnie/extrabees/proxy/ExtraBeesProxyServer.java delete mode 100644 src/Java/miscutil/core/CommonProxy.java create mode 100644 src/Java/miscutil/core/creativetabs/AddToCreativeTab.java delete mode 100644 src/Java/miscutil/core/creativetabs/TMCreativeTabs.java (limited to 'src') diff --git a/src/Java/binnie/Binnie.java b/src/Java/binnie/Binnie.java deleted file mode 100644 index eb976368cd..0000000000 --- a/src/Java/binnie/Binnie.java +++ /dev/null @@ -1,23 +0,0 @@ -package binnie; - -import java.util.ArrayList; -import java.util.List; - -import binnie.core.ManagerBase; -import binnie.core.item.ManagerItem; -import binnie.core.language.ManagerLanguage; -import binnie.core.machines.ManagerMachine; -import binnie.core.mod.config.ManagerConfig; -import binnie.core.resource.ManagerResource; - -public final class Binnie -{ - public static final List Managers = new ArrayList(); - public static final ManagerLanguage Language = new ManagerLanguage(); - //public static final ManagerGenetics Genetics = new ManagerGenetics(); - public static final ManagerConfig Configuration = new ManagerConfig(); - //public static final ManagerLiquid Liquid = new ManagerLiquid(); - public static final ManagerMachine Machine = new ManagerMachine(); - public static final ManagerItem Item = new ManagerItem(); - public static final ManagerResource Resource = new ManagerResource(); -} diff --git a/src/Java/binnie/Constants.java b/src/Java/binnie/Constants.java deleted file mode 100644 index 30abf2c3c2..0000000000 --- a/src/Java/binnie/Constants.java +++ /dev/null @@ -1,11 +0,0 @@ -package binnie; - -public final class Constants -{ - public static final String LiquidJuice = "juice"; - public static final String LiquidWater = "water"; - public static final String LiquidSeedOil = "seedoil"; - public static final String LiquidCreosote = "Creosote Oil"; - public static final String LiquidEthanol = "bioethanol"; - public static final String LiquidHoney = "for.honey"; -} diff --git a/src/Java/binnie/core/AbstractMod.java b/src/Java/binnie/core/AbstractMod.java deleted file mode 100644 index 74f274cdb7..0000000000 --- a/src/Java/binnie/core/AbstractMod.java +++ /dev/null @@ -1,158 +0,0 @@ -package binnie.core; - -import binnie.Binnie; -import binnie.core.gui.IBinnieGUID; -import binnie.core.mod.config.ManagerConfig; -import binnie.core.mod.parser.FieldParser; -import binnie.core.network.BinniePacketHandler; -import binnie.core.network.IPacketID; -import binnie.core.network.IPacketProvider; -import binnie.core.network.packet.MessageBinnie; -import binnie.core.proxy.IProxyCore; -import cpw.mods.fml.common.eventhandler.EventBus; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import net.minecraftforge.common.MinecraftForge; - -public abstract class AbstractMod - implements IPacketProvider, IInitializable -{ - private SimpleNetworkWrapper wrapper; - - public AbstractMod() - { - BinnieCore.registerMod(this); - MinecraftForge.EVENT_BUS.register(this); - } - - public abstract boolean isActive(); - - public abstract String getChannel(); - - public IPacketID[] getPacketIDs() - { - return new IPacketID[0]; - } - - public IBinnieGUID[] getGUIDs() - { - return new IBinnieGUID[0]; - } - - public Class[] getConfigs() - { - return new Class[0]; - } - - public abstract IProxyCore getProxy(); - - public abstract String getModID(); - - public SimpleNetworkWrapper getNetworkWrapper() - { - return this.wrapper; - } - - protected abstract Class getPacketHandler(); - - public void preInit() - { - if (!isActive()) { - return; - } - if (getConfigs() != null) { - for (Class cls : getConfigs()) { - Binnie.Configuration.registerConfiguration(cls, this); - } - } - getProxy().preInit(); - for (IInitializable module : this.modules) { - module.preInit(); - } - for (Field field : getClass().getFields()) { - this.fields.add(field); - } - for (Class cls : getClass().getClasses()) { - for (Field field : getClass().getFields()) { - this.fields.add(field); - } - } - for (IInitializable module : this.modules) { - for (Field field : module.getClass().getFields()) { - this.fields.add(field); - } - } - for (Field field : this.fields) { - try - { - FieldParser.preInitParse(field, this); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } - } - - public void init() - { - if (!isActive()) { - return; - } - getProxy().init(); - - this.wrapper = NetworkRegistry.INSTANCE.newSimpleChannel(getChannel()); - - this.wrapper.registerMessage(getPacketHandler(), MessageBinnie.class, 1, Side.CLIENT); - this.wrapper.registerMessage(getPacketHandler(), MessageBinnie.class, 1, Side.SERVER); - for (IInitializable module : this.modules) { - module.init(); - } - for (Field field : this.fields) { - try - { - FieldParser.initParse(field, this); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } - } - - private LinkedHashSet fields = new LinkedHashSet(); - - public void postInit() - { - if (!isActive()) { - return; - } - getProxy().postInit(); - for (IInitializable module : this.modules) { - module.postInit(); - } - for (Field field : this.fields) { - try - { - FieldParser.postInitParse(field, this); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } - } - - protected final void addModule(IInitializable init) - { - this.modules.add(init); - MinecraftForge.EVENT_BUS.register(init); - } - - protected List modules = new ArrayList(); -} diff --git a/src/Java/binnie/core/BinnieCore.java b/src/Java/binnie/core/BinnieCore.java deleted file mode 100644 index e2dbc502e3..0000000000 --- a/src/Java/binnie/core/BinnieCore.java +++ /dev/null @@ -1,240 +0,0 @@ -package binnie.core; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import net.minecraftforge.client.event.TextureStitchEvent; -import binnie.Binnie; -import binnie.core.block.MultipassBlockRenderer; -import binnie.core.block.TileEntityMetadata; -import binnie.core.gui.BinnieCoreGUI; -import binnie.core.gui.BinnieGUIHandler; -import binnie.core.gui.IBinnieGUID; -import binnie.core.item.ItemFieldKit; -import binnie.core.item.ItemGenesis; -import binnie.core.machines.MachineGroup; -import binnie.core.machines.storage.ModuleStorage; -import binnie.core.mod.config.ConfigurationMain; -import binnie.core.mod.config.ConfigurationMods; -import binnie.core.mod.parser.FieldParser; -import binnie.core.mod.parser.ItemParser; -import binnie.core.network.BinnieCorePacketID; -import binnie.core.network.BinniePacketHandler; -import binnie.core.network.IPacketID; -import binnie.core.proxy.BinnieProxy; -import binnie.core.proxy.IBinnieProxy; -import binnie.core.triggers.ModuleTrigger; -import binnie.craftgui.minecraft.ModuleCraftGUI; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.ForestryEvent; -import forestry.plugins.PluginManager; - -@Mod(modid="BinnieCore", name="Binnie Core", useMetadata=true) -public final class BinnieCore - extends AbstractMod -{ - @Mod.Instance("BinnieCore") - public static BinnieCore instance; - @SidedProxy(clientSide="binnie.core.proxy.BinnieProxyClient", serverSide="binnie.core.proxy.BinnieProxyServer") - public static BinnieProxy proxy; - public static int multipassRenderID; - - @Mod.EventHandler - public void preInit(FMLPreInitializationEvent evt) - { - Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this); - for (ManagerBase baseManager : Binnie.Managers) { - addModule(baseManager); - } - addModule(new ModuleCraftGUI()); - addModule(new ModuleStorage()); - //addModule(new ModuleItems()); - if (Loader.isModLoaded("BuildCraft|Silicon")) { - addModule(new ModuleTrigger()); - } - preInit(); - } - - @Mod.EventHandler - public void init(FMLInitializationEvent evt) - { - init(); - } - - @Mod.EventHandler - public void postInit(FMLPostInitializationEvent evt) - { - postInit(); - } - - public IBinnieGUID[] getGUIDs() - { - return BinnieCoreGUI.values(); - } - - public void preInit() - { - instance = this; - FieldParser.parsers.add(new ItemParser()); - - super.preInit(); - } - - public void init() - { - super.init(); - for (AbstractMod mod : getActiveMods()) { - NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod)); - } - multipassRenderID = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer()); - - GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata"); - } - - public static boolean isLepidopteryActive() - { - return PluginManager.Module.LEPIDOPTEROLOGY.isEnabled(); - } - - public static boolean isApicultureActive() - { - return PluginManager.Module.APICULTURE.isEnabled(); - } - - public static boolean isArboricultureActive() - { - return PluginManager.Module.ARBORICULTURE.isEnabled(); - } - - public static boolean isBotanyActive() - { - return ConfigurationMods.botany; - } - - public static boolean isGeneticsActive() - { - return ConfigurationMods.genetics; - } - - public static boolean isExtraBeesActive() - { - return (ConfigurationMods.extraBees) && (isApicultureActive()); - } - - public static boolean isExtraTreesActive() - { - return (ConfigurationMods.extraTrees) && (isArboricultureActive()); - } - - public void postInit() - { - super.postInit(); - } - - private static List modList = new ArrayList(); - public static MachineGroup packageCompartment; - public static ItemGenesis genesis; - public static ItemFieldKit fieldKit; - - static void registerMod(AbstractMod mod) - { - modList.add(mod); - } - - private static List getActiveMods() - { - List list = new ArrayList(); - for (AbstractMod mod : modList) { - if (mod.isActive()) { - list.add(mod); - } - } - return list; - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) - { - try - { - EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(event.username.getName()); - if (player == null) { - return; - } - event.tracker.synchToPlayer(player); - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setString("species", event.species.getUID()); - } - catch (Exception e) {} - } - - public String getChannel() - { - return "BIN"; - } - - public IBinnieProxy getProxy() - { - return proxy; - } - - public String getModID() - { - return "binniecore"; - } - - public IPacketID[] getPacketIDs() - { - return BinnieCorePacketID.values(); - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void handleTextureRemap(TextureStitchEvent.Pre event) - { - if (event.map.getTextureType() == 0) { - //Binnie.Liquid.reloadIcons(event.map); - } - Binnie.Resource.registerIcons(event.map, event.map.getTextureType()); - } - - public Class[] getConfigs() - { - return new Class[] { ConfigurationMain.class }; - } - - protected Class getPacketHandler() - { - return PacketHandler.class; - } - - public static class PacketHandler - extends BinniePacketHandler - { - public PacketHandler() - { - super(instance); - } - } - - public boolean isActive() - { - return true; - } -} diff --git a/src/Java/binnie/core/IInitializable.java b/src/Java/binnie/core/IInitializable.java deleted file mode 100644 index 7a357faa12..0000000000 --- a/src/Java/binnie/core/IInitializable.java +++ /dev/null @@ -1,10 +0,0 @@ -package binnie.core; - -public abstract interface IInitializable -{ - public abstract void preInit(); - - public abstract void init(); - - public abstract void postInit(); -} diff --git a/src/Java/binnie/core/ManagerBase.java b/src/Java/binnie/core/ManagerBase.java deleted file mode 100644 index 9627ed20bd..0000000000 --- a/src/Java/binnie/core/ManagerBase.java +++ /dev/null @@ -1,19 +0,0 @@ -package binnie.core; - -import binnie.Binnie; -import java.util.List; - -public abstract class ManagerBase - implements IInitializable -{ - public ManagerBase() - { - Binnie.Managers.add(this); - } - - public void preInit() {} - - public void init() {} - - public void postInit() {} -} diff --git a/src/Java/binnie/core/Mods.java b/src/Java/binnie/core/Mods.java deleted file mode 100644 index 9c242aa712..0000000000 --- a/src/Java/binnie/core/Mods.java +++ /dev/null @@ -1 +0,0 @@ -// INTERNAL ERROR // \ No newline at end of file diff --git a/src/Java/binnie/core/block/BlockMetadata.java b/src/Java/binnie/core/block/BlockMetadata.java deleted file mode 100644 index 39b461d01d..0000000000 --- a/src/Java/binnie/core/block/BlockMetadata.java +++ /dev/null @@ -1,138 +0,0 @@ -package binnie.core.block; - -import binnie.core.BinnieCore; -import binnie.core.proxy.BinnieProxy; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.PlayerCapabilities; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -public class BlockMetadata - extends BlockContainer - implements IBlockMetadata -{ - public BlockMetadata(Material material) - { - super(material); - } - - public ArrayList getDrops(World world, int x, int y, int z, int blockMeta, int fortune) - { - return getBlockDropped(this, world, x, y, z, blockMeta); - } - - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) - { - return breakBlock(this, player, world, x, y, z); - } - - public TileEntity createNewTileEntity(World var1, int i) - { - return new TileEntityMetadata(); - } - - public boolean hasTileEntity(int meta) - { - return true; - } - - public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) - { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; - } - - public IIcon getIcon(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) - { - int metadata = TileEntityMetadata.getTileMetadata(par1IBlockAccess, par2, par3, par4); - return getIcon(par5, metadata); - } - - public String getBlockName(ItemStack par1ItemStack) - { - return getLocalizedName(); - } - - public void getBlockTooltip(ItemStack par1ItemStack, List par3List) {} - - public int getPlacedMeta(ItemStack item, World world, int x, int y, int z, ForgeDirection clickedBlock) - { - int damage = TileEntityMetadata.getItemDamage(item); - return damage; - } - - public int getDroppedMeta(int tileMeta, int blockMeta) - { - return tileMeta; - } - - public static ArrayList getBlockDropped(IBlockMetadata block, World world, int x, int y, int z, int blockMeta) - { - ArrayList array = new ArrayList(); - TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); - if ((tile != null) && (!tile.hasDroppedBlock())) - { - int meta = block.getDroppedMeta(world.getBlockMetadata(x, y, z), tile.getTileMetadata()); - array.add(TileEntityMetadata.getItemStack((Block)block, meta)); - } - return array; - } - - static int temporyMeta = -1; - - public static boolean breakBlock(IBlockMetadata block, EntityPlayer player, World world, int i, int j, int k) - { - List drops = new ArrayList(); - - Block block2 = (Block)block; - - TileEntityMetadata tile = TileEntityMetadata.getTile(world, i, j, k); - if ((tile != null) && (!tile.hasDroppedBlock())) - { - int tileMeta = TileEntityMetadata.getTileMetadata(world, i, j, k); - drops = block2.getDrops(world, i, j, k, world.getBlockMetadata(i, j, k), 0); - } - boolean hasBeenBroken = world.setBlockToAir(i, j, k); - if ((hasBeenBroken) && (BinnieCore.proxy.isSimulating(world)) && (drops.size() > 0) && ((player == null) || (!player.capabilities.isCreativeMode))) - { - for (ItemStack drop : drops) { - block.dropAsStack(world, i, j, k, drop); - } - tile.dropBlock(); - } - return hasBeenBroken; - } - - public void dropAsStack(World world, int x, int y, int z, ItemStack drop) - { - dropBlockAsItem(world, x, y, z, drop); - } - - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) - { - super.breakBlock(par1World, par2, par3, par4, par5, par6); - par1World.removeTileEntity(par2, par3, par4); - } - - public static ItemStack getPickBlock(World world, int x, int y, int z) - { - List list = getBlockDropped((IBlock