From a9a2db67f4d6d6f9665f0906625cfb5504e71db0 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 8 Aug 2017 21:52:58 -0700 Subject: [PATCH] Remove some dead code that is not related to unfinished features --- src/main/java/binnie/Constants.java | 6 - .../botany/api/genetics/IFlowerType.java | 2 - .../java/binnie/botany/blocks/PlantType.java | 4 - .../botany/genetics/EnumFlowerColor.java | 4 - .../botany/genetics/EnumFlowerType.java | 5 - .../botany/genetics/FlowerDefinition.java | 4 - .../gui/database/ControlColorMixSymbol.java | 5 - .../gui/database/WindowBotanistDatabase.java | 22 +- .../binnie/botany/modules/ModuleFlowers.java | 6 +- src/main/java/binnie/core/AbstractMod.java | 1 - src/main/java/binnie/core/BinnieCore.java | 1 - .../binnie/core/api/ICraftingManager.java | 10 - .../binnie/core/block/BaseBakedModel.java | 143 ---------- .../java/binnie/core/block/BlockMetadata.java | 2 - .../binnie/core/circuits/BinnieCircuit.java | 5 - .../binnie/core/genetics/BreedingSystem.java | 54 ---- src/main/java/binnie/core/genetics/Gene.java | 4 - .../binnie/core/genetics/IAlleleProvider.java | 7 - .../core/genetics/IBreedingMessage.java | 112 -------- .../binnie/core/genetics/ManagerGenetics.java | 9 - .../core/genetics/VirtualMothHousing.java | 42 --- src/main/java/binnie/core/gui/Attribute.java | 1 - .../java/binnie/core/gui/ITopLevelWidget.java | 13 - src/main/java/binnie/core/gui/IWidget.java | 76 +---- src/main/java/binnie/core/gui/Tooltip.java | 4 - .../java/binnie/core/gui/TopLevelWidget.java | 10 - src/main/java/binnie/core/gui/Widget.java | 159 +---------- .../core/gui/controls/ControlCheckbox.java | 6 - .../binnie/core/gui/controls/ControlText.java | 4 - .../core/gui/controls/IControlSelection.java | 9 - .../gui/controls/IControlSelectionOption.java | 5 - .../controls/button/ControlEnumButton.java | 56 ---- .../controls/button/ControlToggleButton.java | 18 -- .../core/gui/controls/core/Control.java | 5 - .../gui/controls/core/IControlIndexed.java | 7 - .../gui/controls/core/IControlValues.java | 2 - .../gui/controls/listbox/ControlList.java | 4 - .../gui/controls/listbox/ControlOption.java | 4 - .../core/gui/controls/page/ControlPages.java | 4 - .../core/gui/controls/tab/ControlTabBar.java | 4 +- .../core/gui/database/ControlMutationBox.java | 6 +- .../gui/database/ControlMutationItem.java | 4 +- .../core/gui/database/DatabaseConstants.java | 2 - .../binnie/core/gui/database/DatabaseTab.java | 4 +- .../binnie/core/gui/database/PageBreeder.java | 1 - .../core/gui/database/PageBreederStats.java | 21 -- .../gui/database/PageSpeciesOverview.java | 1 - .../gui/database/WindowAbstractDatabase.java | 11 +- .../core/gui/events/EventCycleChanged.java | 16 -- .../java/binnie/core/gui/events/EventKey.java | 6 - .../gui/events/EventToggleButtonClicked.java | 16 -- .../core/gui/events/EventValuesChanged.java | 16 -- .../binnie/core/gui/events/EventWidget.java | 12 - .../core/gui/minecraft/GuiCraftGUI.java | 4 - .../core/gui/minecraft/IMinecraftTooltip.java | 7 - .../binnie/core/gui/minecraft/Window.java | 7 - .../minecraft/control/ControlErrorState.java | 5 - .../minecraft/control/ControlIconDisplay.java | 5 - .../control/ControlPlayerInventory.java | 27 -- .../minecraft/control/ControlSlotBase.java | 4 +- .../gui/minecraft/control/ControlUser.java | 5 +- .../minecraft/render/MinecraftTexture.java | 13 - .../gui/minecraft/render/RenderCommand.java | 14 - .../gui/minecraft/render/package-info.java | 9 - .../core/gui/renderer/TextureRenderer.java | 3 - .../binnie/core/gui/renderer/TextureType.java | 6 - .../binnie/core/gui/resource/Texture.java | 20 -- .../core/liquid/FluidContainerType.java | 5 - .../binnie/core/liquid/ManagerLiquid.java | 9 - .../binnie/core/machines/BlockMachine.java | 3 +- .../binnie/core/machines/IBlockMachine.java | 5 - .../java/binnie/core/machines/IMachine.java | 2 - .../java/binnie/core/machines/Machine.java | 25 -- .../core/machines/MachineComponent.java | 8 - .../binnie/core/machines/MachineGroup.java | 14 - .../core/machines/MachineRendererBlock.java | 32 --- .../binnie/core/machines/ManagerMachine.java | 14 - .../java/binnie/core/machines/ModelBlock.java | 38 --- .../base/DefaultMachineInventory.java | 5 - .../machines/base/TileEntityMachineBase.java | 5 - .../core/machines/errors/ErrorState.java | 15 - .../core/machines/inventory/BaseSlot.java | 14 - .../inventory/ComponentInventorySlots.java | 22 +- .../machines/inventory/IInventoryMachine.java | 2 +- .../machines/inventory/IInventorySlots.java | 8 - .../inventory/IValidatedInventory.java | 7 - .../machines/inventory/InventorySlot.java | 14 - .../core/machines/inventory/TankSlot.java | 4 - .../binnie/core/machines/power/TankInfo.java | 4 - .../ComponentCompartmentInventory.java | 4 - .../machines/storage/ModelCompartment.java | 148 ---------- .../machines/storage/WindowCompartment.java | 4 - .../core/machines/storage/WindowTest.java | 40 --- .../core/mod/config/BinnieItemData.java | 13 - .../java/binnie/core/models/ModelManager.java | 9 - .../multiblock/BlockMultiblockMachine.java | 25 -- .../TileEntityMultiblockMachine.java | 36 --- .../binnie/core/multiblock/package-info.java | 9 - .../core/network/BinnieCorePacketID.java | 1 + .../binnie/core/network/IPacketProvider.java | 2 - .../binnie/core/network/packet/IPacket.java | 7 - .../core/network/packet/IPacketLocation.java | 17 -- .../core/network/packet/IndexInPayload.java | 16 -- .../core/network/packet/MachinePayload.java | 74 ----- .../packet/MessageContainerUpdate.java | 4 - .../core/network/packet/MessageSyncTile.java | 6 +- .../core/network/packet/MessageUpdate.java | 24 +- .../core/network/packet/PacketMetadata.java | 34 --- .../core/network/packet/PacketPayload.java | 38 +-- .../binnie/core/proxy/BinnieModProxy.java | 14 - .../java/binnie/core/proxy/BinnieProxy.java | 9 - .../binnie/core/proxy/BinnieProxyClient.java | 21 -- .../binnie/core/proxy/IBinnieModProxy.java | 2 - .../binnie/core/resource/BinnieResource.java | 8 - .../binnie/core/texture/TextureManager.java | 16 -- src/main/java/binnie/core/util/TileUtil.java | 10 +- .../TileEntityExtraBeesAlvearyPart.java | 11 - .../extrabees/genetics/ExtraBeesFlowers.java | 5 - .../genetics/effect/ExtraBeesEffect.java | 5 - .../extrabees/items/ItemBlockAlveary.java | 18 -- .../extrabees/items/types/EnumHiveFrame.java | 4 - .../java/binnie/extrabees/utils/Utils.java | 11 - .../extratrees/alcohol/drink/IAlcoholic.java | 5 - .../extratrees/api/ICarpentryInterface.java | 4 - .../binnie/extratrees/block/IWoodKind.java | 13 - .../binnie/extratrees/block/PlankType.java | 20 -- .../extratrees/block/decor/FenceRenderer.java | 265 ------------------ .../extratrees/block/wood/BlockETPlank.java | 2 - .../carpentry/CarpentryInterface.java | 12 - .../binnie/extratrees/carpentry/Layout.java | 4 - .../binnie/extratrees/gen/WorldGenWalnut.java | 1 + .../gui/database/WindowArboristDatabase.java | 26 +- .../database/WindowLepidopteristDatabase.java | 16 +- .../java/binnie/extratrees/item/Food.java | 4 - .../craftgui/ControlDropdownButton.java | 24 -- .../extratrees/machines/DummyManagers.java | 12 - .../machines/ExtraTreesErrorCode.java | 4 - .../brewery/recipes/BreweryRecipeManager.java | 16 -- .../brewery/window/DialogBreweryRecipe.java | 18 -- .../recipes/DistilleryRecipeManager.java | 24 -- .../recipes/FruitPressRecipeManager.java | 23 -- .../recipes/LumbermillRecipeManager.java | 25 -- .../window/ControlLumbermillProgress.java | 1 - .../lumbermill/window/SlotValidatorLog.java | 4 - .../binnie/extratrees/proxy/ProxyClient.java | 11 +- .../binnie/genetics/genetics/GeneProject.java | 62 ---- .../genetics/genetics/GeneProjectTracker.java | 121 -------- .../genetics/GeneticEngineeringSystem.java | 68 ----- .../gui/analyst/AnalystPageMutations.java | 6 - .../genetics/gui/analyst/ControlTooltip.java | 17 -- .../database/bee/WindowApiaristDatabase.java | 20 +- .../binnie/genetics/item/GeneticLiquid.java | 3 - .../binnie/genetics/item/ItemAnalyst.java | 6 - .../binnie/genetics/item/ItemRegistry.java | 6 - .../machine/MachineRendererGenetics.java | 39 --- .../genetics/machine/MachineRendererLab.java | 96 ------- .../SlotValidatorInoculatorCatalyst.java | 17 -- .../craftgui/ControlProcessTemporary.java | 27 -- .../machine/craftgui/WindowGeneProject.java | 31 -- .../craftgui/WindowGenomeAssembler.java | 35 --- .../indexer/ComponentIndexerInventory.java | 18 -- .../binnie/genetics/network/PacketID.java | 4 - .../binnie/genetics/network/package-info.java | 9 - .../binnie/modules/BlankModuleContainer.java | 5 - 164 files changed, 102 insertions(+), 3006 deletions(-) delete mode 100644 src/main/java/binnie/core/block/BaseBakedModel.java delete mode 100644 src/main/java/binnie/core/genetics/IAlleleProvider.java delete mode 100644 src/main/java/binnie/core/genetics/IBreedingMessage.java delete mode 100644 src/main/java/binnie/core/genetics/VirtualMothHousing.java delete mode 100644 src/main/java/binnie/core/gui/controls/IControlSelection.java delete mode 100644 src/main/java/binnie/core/gui/controls/IControlSelectionOption.java delete mode 100644 src/main/java/binnie/core/gui/controls/button/ControlEnumButton.java delete mode 100644 src/main/java/binnie/core/gui/controls/button/ControlToggleButton.java delete mode 100644 src/main/java/binnie/core/gui/controls/core/IControlIndexed.java delete mode 100644 src/main/java/binnie/core/gui/database/PageBreederStats.java delete mode 100644 src/main/java/binnie/core/gui/events/EventCycleChanged.java delete mode 100644 src/main/java/binnie/core/gui/events/EventToggleButtonClicked.java delete mode 100644 src/main/java/binnie/core/gui/events/EventValuesChanged.java delete mode 100644 src/main/java/binnie/core/gui/minecraft/IMinecraftTooltip.java delete mode 100644 src/main/java/binnie/core/gui/minecraft/render/MinecraftTexture.java delete mode 100644 src/main/java/binnie/core/gui/minecraft/render/RenderCommand.java delete mode 100644 src/main/java/binnie/core/gui/minecraft/render/package-info.java delete mode 100644 src/main/java/binnie/core/gui/renderer/TextureType.java delete mode 100644 src/main/java/binnie/core/machines/MachineRendererBlock.java delete mode 100644 src/main/java/binnie/core/machines/ModelBlock.java delete mode 100644 src/main/java/binnie/core/machines/inventory/IValidatedInventory.java delete mode 100644 src/main/java/binnie/core/machines/storage/ModelCompartment.java delete mode 100644 src/main/java/binnie/core/machines/storage/WindowTest.java delete mode 100644 src/main/java/binnie/core/mod/config/BinnieItemData.java delete mode 100644 src/main/java/binnie/core/multiblock/BlockMultiblockMachine.java delete mode 100644 src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java delete mode 100644 src/main/java/binnie/core/multiblock/package-info.java delete mode 100644 src/main/java/binnie/core/network/packet/IPacket.java delete mode 100644 src/main/java/binnie/core/network/packet/IPacketLocation.java delete mode 100644 src/main/java/binnie/core/network/packet/IndexInPayload.java delete mode 100644 src/main/java/binnie/core/network/packet/MachinePayload.java delete mode 100644 src/main/java/binnie/core/network/packet/PacketMetadata.java delete mode 100644 src/main/java/binnie/core/texture/TextureManager.java delete mode 100644 src/main/java/binnie/extratrees/alcohol/drink/IAlcoholic.java delete mode 100644 src/main/java/binnie/extratrees/block/IWoodKind.java delete mode 100644 src/main/java/binnie/extratrees/block/decor/FenceRenderer.java delete mode 100644 src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java delete mode 100644 src/main/java/binnie/extratrees/machines/brewery/window/DialogBreweryRecipe.java delete mode 100644 src/main/java/binnie/genetics/genetics/GeneProject.java delete mode 100644 src/main/java/binnie/genetics/genetics/GeneProjectTracker.java delete mode 100644 src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java delete mode 100644 src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java delete mode 100644 src/main/java/binnie/genetics/machine/MachineRendererGenetics.java delete mode 100644 src/main/java/binnie/genetics/machine/MachineRendererLab.java delete mode 100644 src/main/java/binnie/genetics/machine/SlotValidatorInoculatorCatalyst.java delete mode 100644 src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java delete mode 100644 src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java delete mode 100644 src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java delete mode 100644 src/main/java/binnie/genetics/network/PacketID.java delete mode 100644 src/main/java/binnie/genetics/network/package-info.java mode change 100644 => 100755 src/main/java/binnie/modules/BlankModuleContainer.java diff --git a/src/main/java/binnie/Constants.java b/src/main/java/binnie/Constants.java index befe139b..fa4a8b9f 100644 --- a/src/main/java/binnie/Constants.java +++ b/src/main/java/binnie/Constants.java @@ -7,10 +7,4 @@ public final class Constants { public static final String EXTRA_TREES_MOD_ID = "extratrees"; public static final String GENETICS_MOD_ID = "genetics"; - public static final String LIQUID_JUICE = "juice"; - public static final String LIQUID_WATER = "water"; - public static final String LIQUID_SEED_OIL = "seedoil"; - public static final String LIQUID_CREOSOTE = "Creosote Oil"; - public static final String LIQUID_BIO_ETHANOL = "bioethanol"; - public static final String LIQUID_FOR_HONEY = "for.honey"; } diff --git a/src/main/java/binnie/botany/api/genetics/IFlowerType.java b/src/main/java/binnie/botany/api/genetics/IFlowerType.java index 7670f08e..f3d5ca03 100644 --- a/src/main/java/binnie/botany/api/genetics/IFlowerType.java +++ b/src/main/java/binnie/botany/api/genetics/IFlowerType.java @@ -17,8 +17,6 @@ public interface IFlowerType> extends Comparable { String getName(); - int getID(); - int getSections(); int ordinal(); diff --git a/src/main/java/binnie/botany/blocks/PlantType.java b/src/main/java/binnie/botany/blocks/PlantType.java index 84ab39d6..cce5d643 100644 --- a/src/main/java/binnie/botany/blocks/PlantType.java +++ b/src/main/java/binnie/botany/blocks/PlantType.java @@ -31,10 +31,6 @@ public enum PlantType implements IStringSerializable { return values()[meta]; } - public static PlantType get(int id) { - return values()[id % values().length]; - } - public ItemStack get() { return new ItemStack(ModuleGardening.plant, 1, ordinal()); } diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java index 14bf6f87..bd5f795f 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java @@ -2954,10 +2954,6 @@ public enum EnumFlowerColor implements IStringSerializable { return name().toLowerCase(); } - public String getHTMLName() { - return name(); - } - public AlleleFlowerColor getFlowerColorAllele() { return allele; } diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerType.java b/src/main/java/binnie/botany/genetics/EnumFlowerType.java index cf3be606..8870a754 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerType.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerType.java @@ -101,11 +101,6 @@ public enum EnumFlowerType implements IFlowerType { return flower; } - @Override - public int getID() { - return ordinal(); - } - @Override public int getSections() { return sections; diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index 443aad24..62f8f621 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -962,10 +962,6 @@ public enum FlowerDefinition implements IFlowerDefinition { this(name, branch, binomial, type, true, primaryColor, secondaryColor); } - FlowerDefinition(String name, String branch, String binomial, IFlowerType type, boolean isDominant, EnumFlowerColor colour) { - this(name, branch, binomial, type, isDominant, colour, colour); - } - FlowerDefinition(String name, String branch, String binomial, IFlowerType flowerType, boolean isDominant, EnumFlowerColor primaryColor, EnumFlowerColor secondaryColor) { String uid = Constants.BOTANY_MOD_ID + ".flower" + this; String unlocalizedDescription = "botany.description.flower" + this; diff --git a/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java b/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java index 876a4f58..b744999a 100644 --- a/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java +++ b/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java @@ -42,11 +42,6 @@ public class ControlColorMixSymbol extends Control implements ITooltip { } } - public void setValue(IColorMix value) { - this.value = value; - setColor(0xffffff); - } - @Override public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { if (type == 1) { diff --git a/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java b/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java index ef4db5dc..89220caa 100644 --- a/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java @@ -32,8 +32,6 @@ import binnie.core.gui.minecraft.Window; import binnie.core.util.I18N; public class WindowBotanistDatabase extends WindowAbstractDatabase { - private ControlListBox selectionBoxColors; - public WindowBotanistDatabase(EntityPlayer player, Side side, boolean nei) { super(player, side, nei, Binnie.GENETICS.flowerBreedingSystem, 130); } @@ -45,17 +43,17 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { @Override @SideOnly(Side.CLIENT) protected void addTabs() { - new PageSpeciesOverview(getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.overview", 0)); - new PageSpeciesFlowerGenome(getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "genome.title", 0)); - new PageSpeciesClassification(getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.classification", 0)); - new PageSpeciesResultant(getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.resultant", 0)); - new PageSpeciesMutations(getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.further", 0)); - new PageBranchOverview(getInfoPages(Mode.BRANCHES), new DatabaseTab(Botany.instance, "branches.overview", 0)); - new PageBranchSpecies(getInfoPages(Mode.BRANCHES), new DatabaseTab(Botany.instance, "branches.species", 0)); + new PageSpeciesOverview(getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.overview")); + new PageSpeciesFlowerGenome(getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "genome.title")); + new PageSpeciesClassification(getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.classification")); + new PageSpeciesResultant(getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.resultant")); + new PageSpeciesMutations(getInfoPages(Mode.SPECIES), new DatabaseTab(Botany.instance, "species.further")); + new PageBranchOverview(getInfoPages(Mode.BRANCHES), new DatabaseTab(Botany.instance, "branches.overview")); + new PageBranchSpecies(getInfoPages(Mode.BRANCHES), new DatabaseTab(Botany.instance, "branches.species")); createMode(FlowerMode.Color, new FlowerColorModeWidgets()); - new PageColorMixResultant(getInfoPages(FlowerMode.Color), new DatabaseTab(Botany.instance, "color.resultant", 0)); - new PageColorMix(getInfoPages(FlowerMode.Color), new DatabaseTab(Botany.instance, "color.further", 0)); - new PageBreeder(getInfoPages(Mode.BREEDER), getUsername(), new DatabaseTab(Botany.instance, "breeder", 0)); + new PageColorMixResultant(getInfoPages(FlowerMode.Color), new DatabaseTab(Botany.instance, "color.resultant")); + new PageColorMix(getInfoPages(FlowerMode.Color), new DatabaseTab(Botany.instance, "color.further")); + new PageBreeder(getInfoPages(Mode.BREEDER), getUsername(), new DatabaseTab(Botany.instance, "breeder")); } @Override diff --git a/src/main/java/binnie/botany/modules/ModuleFlowers.java b/src/main/java/binnie/botany/modules/ModuleFlowers.java index 246f3647..cd610a96 100644 --- a/src/main/java/binnie/botany/modules/ModuleFlowers.java +++ b/src/main/java/binnie/botany/modules/ModuleFlowers.java @@ -1,5 +1,6 @@ package binnie.botany.modules; +import binnie.core.util.TileUtil; import com.google.common.collect.ImmutableSet; import javax.annotation.Nullable; @@ -212,10 +213,9 @@ public class ModuleFlowers extends Module { @SubscribeEvent public void onBonemeal(BonemealEvent event) { BlockPos pos = event.getPos(); - Block block = event.getBlock().getBlock(); - TileEntity tile = event.getWorld().getTileEntity(pos); - if (tile instanceof TileEntityFlower && ((TileEntityFlower) tile).onBonemeal()) { + TileEntityFlower tile = TileUtil.getTile(event.getWorld(), pos, TileEntityFlower.class); + if (tile != null && tile.onBonemeal()) { event.setResult(Event.Result.ALLOW); } } diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 8448e305..da7ad965 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -37,7 +37,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { public abstract boolean isAvailable(); - @Override public abstract String getChannel(); @Override diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 8adf71fe..04c6a89e 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -64,7 +64,6 @@ import binnie.modules.ModuleManager; public final class BinnieCore extends AbstractMod { private static final List modList = new ArrayList<>(); - public static int multipassRenderID; @SuppressWarnings("NullableProblems") @Mod.Instance(Constants.CORE_MOD_ID) private static BinnieCore instance; diff --git a/src/main/java/binnie/core/api/ICraftingManager.java b/src/main/java/binnie/core/api/ICraftingManager.java index c9ffa8b6..a3673417 100644 --- a/src/main/java/binnie/core/api/ICraftingManager.java +++ b/src/main/java/binnie/core/api/ICraftingManager.java @@ -1,6 +1,5 @@ package binnie.core.api; -import javax.annotation.Nullable; import java.util.Collection; public interface ICraftingManager { @@ -22,13 +21,4 @@ public interface ICraftingManager { * @return an unmodifiable collection of all recipes registered to the crafting provider. */ Collection recipes(); - - /** - * @return null if this type of recipe has no jei integration - */ - @Nullable - String getJEICategory(); - - @Nullable - Object getJeiWrapper(T recipe); } diff --git a/src/main/java/binnie/core/block/BaseBakedModel.java b/src/main/java/binnie/core/block/BaseBakedModel.java deleted file mode 100644 index d8d6b9a8..00000000 --- a/src/main/java/binnie/core/block/BaseBakedModel.java +++ /dev/null @@ -1,143 +0,0 @@ -package binnie.core.block; - -/* - * Copyright (c) 2015-2016 Adrian Siekierka - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import javax.annotation.Nullable; -import javax.vecmath.Matrix4f; -import javax.vecmath.Vector3f; -import java.util.EnumMap; - -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.block.model.ItemOverrideList; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.ResourceLocation; - -import net.minecraftforge.common.model.TRSRTransformation; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public abstract class BaseBakedModel implements IBakedModel { - private static final TRSRTransformation flipX = new TRSRTransformation(null, null, new Vector3f(-1, 1, 1), null); - private final EnumMap transformMap = new EnumMap<>(ItemCameraTransforms.TransformType.class); - private final ResourceLocation particle; - - public BaseBakedModel() { - this(null); - } - - public BaseBakedModel(@Nullable ResourceLocation particle) { - this.particle = particle != null ? particle : TextureMap.LOCATION_MISSING_TEXTURE; - } - - protected static TRSRTransformation toLeftHand(TRSRTransformation transform) { - return TRSRTransformation.blockCenterToCorner(flipX.compose(TRSRTransformation.blockCornerToCenter(transform)).compose(flipX)); - } - - protected static TRSRTransformation getTransformation(float tx, float ty, float tz, float ax, float ay, float az, float s) { - return TRSRTransformation.blockCenterToCorner(new TRSRTransformation( - new Vector3f(tx / 16, ty / 16, tz / 16), - TRSRTransformation.quatFromXYZDegrees(new Vector3f(ax, ay, az)), - new Vector3f(s, s, s), - null - )); - } - - @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - return ImmutablePair.of(this, - transformMap.containsKey(cameraTransformType) ? transformMap.get(cameraTransformType).getMatrix() : null - ); - } - - @Override - public boolean isAmbientOcclusion() { - return true; - } - - @Override - public boolean isGui3d() { - return true; - } - - @Override - public boolean isBuiltInRenderer() { - return false; - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(particle.toString()); - } - - @Override - public ItemOverrideList getOverrides() { - return ItemOverrideList.NONE; - } - - // ForgeBlockStateV1 transforms - - public void addTransformation(ItemCameraTransforms.TransformType type, TRSRTransformation transformation) { - transformMap.put(type, TRSRTransformation.blockCornerToCenter(transformation)); - } - - public void addThirdPersonTransformation(TRSRTransformation transformation) { - addTransformation(ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, transformation); - addTransformation(ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND, toLeftHand(transformation)); - } - - public void addFirstPersonTransformation(TRSRTransformation transformation) { - addTransformation(ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, transformation); - addTransformation(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, toLeftHand(transformation)); - } - - public BaseBakedModel addDefaultBlockTransforms() { - TRSRTransformation thirdperson = getTransformation(0, 2.5f, 0, 75, 45, 0, 0.375f); - addTransformation(ItemCameraTransforms.TransformType.GUI, getTransformation(0, 0, 0, 30, 225, 0, 0.625f)); - addTransformation(ItemCameraTransforms.TransformType.GROUND, getTransformation(0, 3, 0, 0, 0, 0, 0.25f)); - addTransformation(ItemCameraTransforms.TransformType.FIXED, getTransformation(0, 0, 0, 0, 0, 0, 0.5f)); - addThirdPersonTransformation(thirdperson); - addTransformation(ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, getTransformation(0, 0, 0, 0, 45, 0, 0.4f)); - addTransformation(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, getTransformation(0, 0, 0, 0, 255, 0, 0.4f)); - return this; - } - - public BaseBakedModel addDefaultItemTransforms() { - TRSRTransformation thirdperson = getTransformation(0, 3, 1, 0, 0, 0, 0.55f); - TRSRTransformation firstperson = getTransformation(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f); - addTransformation(ItemCameraTransforms.TransformType.GROUND, getTransformation(0, 2, 0, 0, 0, 0, 0.5f)); - addTransformation(ItemCameraTransforms.TransformType.HEAD, getTransformation(0, 13, 7, 0, 180, 0, 1)); - addThirdPersonTransformation(thirdperson); - addFirstPersonTransformation(firstperson); - return this; - } - - public BaseBakedModel addDefaultToolTransforms() { - addTransformation(ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, getTransformation(0, 4, 0.5f, 0, -90, 55, 0.85f)); - addTransformation(ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND, getTransformation(0, 4, 0.5f, 0, 90, -55, 0.85f)); - addTransformation(ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, getTransformation(1.13f, 3.2f, 1.13f, 0, -90, 25, 0.68f)); - addTransformation(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, getTransformation(1.13f, 3.2f, 1.13f, 0, 90, -25, 0.68f)); - return this; - } -} diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index b3ebc6b4..be6f603c 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -21,8 +21,6 @@ import net.minecraft.world.World; import binnie.core.BinnieCore; public class BlockMetadata extends BlockContainer implements IBlockMetadata { - static int temporyMeta = -1; - public BlockMetadata(final Material material) { super(material); } diff --git a/src/main/java/binnie/core/circuits/BinnieCircuit.java b/src/main/java/binnie/core/circuits/BinnieCircuit.java index 28db4073..feaffd42 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuit.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuit.java @@ -3,7 +3,6 @@ package binnie.core.circuits; import java.util.ArrayList; import java.util.List; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import forestry.api.circuits.ChipsetManager; @@ -25,10 +24,6 @@ public class BinnieCircuit implements ICircuit { } } - public BinnieCircuit(final String uid, final int limit, final ICircuitLayout layout, final Item item, final int itemMeta) { - this(uid, limit, layout, new ItemStack(item, 1, itemMeta)); - } - public void addTooltipString(final String string) { this.tooltips.add(string); } diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index 6672b53c..7b64f4cc 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -32,7 +32,6 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IClassification; -import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; @@ -209,13 +208,6 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return AlleleManager.alleleRegistry.isBlacklisted(allele.getUID()); } - public final List getResultantMutations(final IAlleleSpecies species, final boolean includeInactive) { - if (this.resultantMutations.isEmpty()) { - this.calculateArrays(); - } - return includeInactive ? this.allResultantMutations.get(species) : this.resultantMutations.get(species); - } - public final List getResultantMutations(final IAlleleSpecies species) { if (this.resultantMutations.isEmpty()) { this.calculateArrays(); @@ -223,13 +215,6 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return this.resultantMutations.get(species); } - public final List getFurtherMutations(final IAlleleSpecies species, final boolean includeInactive) { - if (this.furtherMutations.isEmpty()) { - this.calculateArrays(); - } - return includeInactive ? this.allFurtherMutations.get(species) : this.furtherMutations.get(species); - } - public final List getFurtherMutations(final IAlleleSpecies species) { if (this.furtherMutations.isEmpty()) { this.calculateArrays(); @@ -328,26 +313,6 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return speciesList; } - public final List getDiscoveredMutations(final IBreedingTracker tracker) { - final List speciesList = new ArrayList<>(); - for (final IMutation species : this.getAllMutations()) { - if (this.isMutationDiscovered(species, tracker)) { - speciesList.add(species); - } - } - return speciesList; - } - - public final int getDiscoveredBranchMembers(final IClassification branch, final IBreedingTracker tracker) { - int discoveredSpecies = 0; - for (final IAlleleSpecies species : branch.getMemberSpecies()) { - if (this.isSpeciesDiscovered(species, tracker)) { - ++discoveredSpecies; - } - } - return discoveredSpecies; - } - @SideOnly(Side.CLIENT) public TextureAtlasSprite getUndiscoveredIcon() { return this.iconUndiscovered.getSprite(); @@ -438,16 +403,6 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { return this.getSpeciesRoot().getUID(); } - @Nullable - public final IChromosomeType getChromosome(int index) { - for (IChromosomeType chromosome : this.getSpeciesRoot().getKaryotype()) { - if (index == chromosome.ordinal()) { - return chromosome; - } - } - return null; - } - public abstract int getColour(); public String getAlleleName(final IChromosomeType chromosome, final IAllele allele) { @@ -525,13 +480,4 @@ public abstract class BreedingSystem implements IItemStackRepresentitive { } return this.getSpeciesRoot().templateAsIndividual(template); } - - @Nullable - public IGenome getGenome(String uid) { - IAllele[] template = this.getSpeciesRoot().getTemplate(uid); - if (template == null) { - return null; - } - return this.getSpeciesRoot().templateAsGenome(template); - } } diff --git a/src/main/java/binnie/core/genetics/Gene.java b/src/main/java/binnie/core/genetics/Gene.java index 1cf98074..29efec3a 100644 --- a/src/main/java/binnie/core/genetics/Gene.java +++ b/src/main/java/binnie/core/genetics/Gene.java @@ -111,10 +111,6 @@ public class Gene implements IGene { return this.getSystem().getAlleleName(this.chromosome, this.allele); } - public String getChromosomeName() { - return this.getSystem().getChromosomeName(this.chromosome); - } - public String getShortChromosomeName() { return this.getSystem().getChromosomeShortName(this.chromosome); } diff --git a/src/main/java/binnie/core/genetics/IAlleleProvider.java b/src/main/java/binnie/core/genetics/IAlleleProvider.java deleted file mode 100644 index 2db1378b..00000000 --- a/src/main/java/binnie/core/genetics/IAlleleProvider.java +++ /dev/null @@ -1,7 +0,0 @@ -package binnie.core.genetics; - -import forestry.api.genetics.IAllele; - -public interface IAlleleProvider { - IAllele getAllele(); -} diff --git a/src/main/java/binnie/core/genetics/IBreedingMessage.java b/src/main/java/binnie/core/genetics/IBreedingMessage.java deleted file mode 100644 index a4e533e4..00000000 --- a/src/main/java/binnie/core/genetics/IBreedingMessage.java +++ /dev/null @@ -1,112 +0,0 @@ -package binnie.core.genetics; - -import net.minecraft.item.ItemStack; - -import forestry.api.apiculture.EnumBeeType; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IClassification; -import forestry.api.genetics.ISpeciesRoot; - -import binnie.core.util.I18N; - -interface IBreedingMessage { - String getTitle(); - - String getBody(); - - ItemStack getIcon(); - - class MessageSpeciesDiscovered implements IBreedingMessage { - IAlleleSpecies species; - ItemStack stack; - - public MessageSpeciesDiscovered(final IAlleleSpecies species) { - this.species = species; - ISpeciesRoot root = null; - for (final ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - if (sRoot.getKaryotype()[0].getAlleleClass().isInstance(species)) { - root = sRoot; - } - } - if (root != null) { - this.stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species)), EnumBeeType.DRONE); - } - } - - @Override - public String getTitle() { - return I18N.localise("binniecore.gui.breedingmessage.species"); - } - - @Override - public String getBody() { - return this.species.getAlleleName(); - } - - @Override - public ItemStack getIcon() { - return this.stack; - } - } - - class BranchDiscovered implements IBreedingMessage { - IAlleleSpecies species; - IClassification classification; - ItemStack stack; - - public BranchDiscovered(final IAlleleSpecies species, final IClassification classification) { - this.species = species; - this.classification = classification; - ISpeciesRoot root = null; - for (final ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - if (sRoot.getKaryotype()[0].getAlleleClass().isInstance(species)) { - root = sRoot; - } - } - if (root != null) { - this.stack = root.getMemberStack(root.templateAsIndividual(root.getTemplate(species)), EnumBeeType.DRONE); - } - } - - @Override - public String getTitle() { - return I18N.localise("binniecore.gui.breedingmessage.branch"); - } - - @Override - public String getBody() { - return this.classification.getScientific(); - } - - @Override - public ItemStack getIcon() { - return this.stack; - } - } - - class EpithetGained implements IBreedingMessage { - String epithet; - ItemStack stack; - - public EpithetGained(final String epithet, final ISpeciesRoot root) { - this.epithet = epithet; - this.stack = root.getMemberStack(root.templateAsIndividual(root.getDefaultTemplate()), EnumBeeType.DRONE); - } - - @Override - public String getTitle() { - return I18N.localise("binniecore.gui.breedingmessage.epithet"); - } - - @Override - public String getBody() { - return this.epithet; - } - - @Override - public ItemStack getIcon() { - return this.stack; - } - } -} diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index ad18c1ca..f08ecab7 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -12,7 +12,6 @@ import java.util.Map; import java.util.TreeSet; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import net.minecraftforge.event.world.WorldEvent; @@ -80,10 +79,6 @@ public class ManagerGenetics extends ManagerBase { this.refreshData(); } - public boolean isSpeciesDiscovered(final IAlleleSpecies species, final World world, final boolean nei) { - return true; - } - public ITreeRoot getTreeRoot() { return TreeManager.treeRoot; } @@ -121,10 +116,6 @@ public class ManagerGenetics extends ManagerBase { return species.getRoot(); } - public IAllele getToleranceAllele(final forestry.api.genetics.EnumTolerance tol) { - return AlleleManager.alleleRegistry.getAllele(Tolerance.values()[tol.ordinal()].getUID()); - } - public int[] getTolerance(final forestry.api.genetics.EnumTolerance tol) { return Tolerance.values()[tol.ordinal()].getBounds(); } diff --git a/src/main/java/binnie/core/genetics/VirtualMothHousing.java b/src/main/java/binnie/core/genetics/VirtualMothHousing.java deleted file mode 100644 index a69de6b8..00000000 --- a/src/main/java/binnie/core/genetics/VirtualMothHousing.java +++ /dev/null @@ -1,42 +0,0 @@ -package binnie.core.genetics; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -import forestry.api.genetics.IIndividual; -import forestry.api.lepidopterology.IButterfly; -import forestry.api.lepidopterology.IButterflyNursery; - -public class VirtualMothHousing extends VirtualHousing implements IButterflyNursery { - public VirtualMothHousing(final EntityPlayer player) { - super(player); - } - - @Override - @Nullable - public IButterfly getCaterpillar() { - return null; - } - - @Override - public void setCaterpillar(@Nullable final IButterfly butterfly) { - } - - @Override - @Nullable - public IIndividual getNanny() { - return null; - } - - @Override - public boolean canNurse(final IButterfly butterfly) { - return false; - } - - @Override - public World getWorldObj() { - return getWorld(); - } -} diff --git a/src/main/java/binnie/core/gui/Attribute.java b/src/main/java/binnie/core/gui/Attribute.java index 5a823d70..04cb4a84 100644 --- a/src/main/java/binnie/core/gui/Attribute.java +++ b/src/main/java/binnie/core/gui/Attribute.java @@ -3,7 +3,6 @@ package binnie.core.gui; public enum Attribute implements IWidgetAttribute { MOUSE_OVER, CAN_FOCUS, - NEEDS_DELETION, ALWAYS_ON_TOP, BLOCK_TOOLTIP } diff --git a/src/main/java/binnie/core/gui/ITopLevelWidget.java b/src/main/java/binnie/core/gui/ITopLevelWidget.java index 6c228335..c50bec7e 100644 --- a/src/main/java/binnie/core/gui/ITopLevelWidget.java +++ b/src/main/java/binnie/core/gui/ITopLevelWidget.java @@ -5,28 +5,15 @@ import javax.annotation.Nullable; import binnie.core.gui.geometry.Point; public interface ITopLevelWidget extends IWidget { - void setMousePosition(final int p0, final int p1); - Point getAbsoluteMousePosition(); - @Nullable - IWidget getFocusedWidget(); - @Nullable IWidget getMousedOverWidget(); - @Nullable - IWidget getDraggedWidget(); - - boolean isFocused(final IWidget p0); - boolean isMouseOver(final IWidget p0); - boolean isDragged(final IWidget p0); - void updateTopLevel(); void widgetDeleted(final IWidget p0); - Point getDragDistance(); } diff --git a/src/main/java/binnie/core/gui/IWidget.java b/src/main/java/binnie/core/gui/IWidget.java index f44b4c18..72cf4fe5 100644 --- a/src/main/java/binnie/core/gui/IWidget.java +++ b/src/main/java/binnie/core/gui/IWidget.java @@ -21,22 +21,13 @@ public interface IWidget { ITopLevelWidget getTopParent(); - /** - * @return true if this widget is the {@link #getTopParent()} - */ - boolean isTopLevel(); - /** * @return the position of this widget */ Point getPosition(); - Point getOriginalPosition(); - Point getAbsolutePosition(); - Point getOriginalAbsolutePosition(); - void setPosition(Point position); /** @@ -44,13 +35,6 @@ public interface IWidget { */ Point getSize(); - void setSize(Point size); - - /** - * @return the offset of this widget - */ - Point getOffset(); - void setOffset(final Point p0); /** @@ -58,15 +42,8 @@ public interface IWidget { */ Area getArea(); - /** - * @return the position of the mouse - */ - Point getMousePosition(); - Point getRelativeMousePosition(); - int getXPos(); - int getYPos(); int getWidth(); @@ -83,10 +60,6 @@ public interface IWidget { @SideOnly(Side.CLIENT) void updateClient(); - void enable(); - - void disable(); - void show(); void hide(); @@ -97,12 +70,6 @@ public interface IWidget { boolean isVisible(); - boolean isFocused(); - - boolean isMouseOver(); - - boolean isDragged(); - boolean canMouseOver(); boolean canFocus(); @@ -110,27 +77,17 @@ public interface IWidget { /* CHILDREN */ boolean isChildVisible(IWidget child); - boolean isChildEnabled(IWidget child); - - @Nullable - IWidget addChild(IWidget child); + void addChild(IWidget child); List getChildren(); @Nullable - IWidget deleteChild(IWidget child); + W getWidget(Class widgetClass); - void deleteAllChildren(); - - IWidget getTopChild(); + void deleteChild(IWidget child); /* EVENTS*/ - /** - * Calls an event - */ - void callEvent(Event event); - /** * Called if this widget receives an event */ @@ -145,16 +102,8 @@ public interface IWidget { */ void addSelfEventHandler(Class eventClass, EventHandler.OnEventHandler handler); - @SideOnly(Side.CLIENT) - void onUpdateClient(); - void delete(); - void onDelete(); - - @Nullable - T getWidget(final Class widgetClass); - @Nullable Area getCroppedZone(); @@ -164,33 +113,14 @@ public interface IWidget { IWidget getCropWidget(); - boolean isMouseOverWidget(final Point p0); - - int getLevel(); - - boolean isDescendant(final IWidget p0); - /* ATTRIBUTES */ - /** - * @return a list with all attributes that this widget has. - */ - List getAttributes(); - /** * * @return true if this widget has this attribute */ boolean hasAttribute(IWidgetAttribute attribute); - /** - * Adds an attribute to this widget - */ - boolean addAttribute(IWidgetAttribute attribute); - - boolean contains(Point point); - - @SideOnly(Side.CLIENT) void onRender(RenderStage stage, int guiWidth, int guiHeight); } diff --git a/src/main/java/binnie/core/gui/Tooltip.java b/src/main/java/binnie/core/gui/Tooltip.java index 81d4f34e..1814a881 100644 --- a/src/main/java/binnie/core/gui/Tooltip.java +++ b/src/main/java/binnie/core/gui/Tooltip.java @@ -43,10 +43,6 @@ public class Tooltip { this.tooltip.add(string); } - public String getLine(final int index) { - return this.getList().get(index); - } - public void add(final List list) { this.tooltip.addAll(list); } diff --git a/src/main/java/binnie/core/gui/TopLevelWidget.java b/src/main/java/binnie/core/gui/TopLevelWidget.java index ebd3095e..4641054b 100644 --- a/src/main/java/binnie/core/gui/TopLevelWidget.java +++ b/src/main/java/binnie/core/gui/TopLevelWidget.java @@ -74,7 +74,6 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { } } - @Override @Nullable public IWidget getDraggedWidget() { return this.draggedWidget; @@ -84,7 +83,6 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { this.setDraggedWidget(widget, -1); } - @Override @Nullable public IWidget getFocusedWidget() { return this.focusedWidget; @@ -112,12 +110,10 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { return this.getMousedOverWidget() == widget; } - @Override public boolean isDragged(final IWidget widget) { return this.getDraggedWidget() == widget; } - @Override public boolean isFocused(final IWidget widget) { return this.getFocusedWidget() == widget; } @@ -175,7 +171,6 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { return widgets; } - @Override public void setMousePosition(final int x, final int y) { final float dx = x - this.mousePosition.xPos(); final float dy = y - this.mousePosition.yPos(); @@ -209,9 +204,4 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { this.setFocusedWidget(null); } } - - @Override - public Point getDragDistance() { - return this.getRelativeMousePosition().sub(this.dragStart); - } } diff --git a/src/main/java/binnie/core/gui/Widget.java b/src/main/java/binnie/core/gui/Widget.java index dd245bff..7cfd3835 100644 --- a/src/main/java/binnie/core/gui/Widget.java +++ b/src/main/java/binnie/core/gui/Widget.java @@ -30,7 +30,6 @@ public class Widget implements IWidget { private Point size; private Point offset; private Collection> eventHandlers; - private boolean enabled; private boolean visible; public Widget(@Nullable final IWidget parent) { @@ -42,7 +41,6 @@ public class Widget implements IWidget { this.cropped = false; this.colour = 0xffffff; this.eventHandlers = new ArrayList<>(); - this.enabled = true; this.visible = true; this.parent = parent; if (parent != null) { @@ -51,34 +49,25 @@ public class Widget implements IWidget { } /* ATTRIBUTES */ - @Override - public List getAttributes() { - return this.attributes; - } - @Override public boolean hasAttribute(final IWidgetAttribute attribute) { return this.attributes.contains(attribute); } - @Override public boolean addAttribute(final IWidgetAttribute attribute) { return this.attributes.add(attribute); } /* CHILDREN */ @Override - @Nullable - public IWidget deleteChild(IWidget child) { + public void deleteChild(IWidget child) { if (child == null) { - return null; + return; } child.delete(); this.children.remove(child); - return child; } - @Override public final void deleteAllChildren() { while (!this.children.isEmpty()) { this.deleteChild(this.children.get(0)); @@ -86,10 +75,9 @@ public class Widget implements IWidget { } @Override - @Nullable - public IWidget addChild(IWidget child) { + public void addChild(IWidget child) { if(child == null){ - return null; + return; } IWidget topWidget = getTopChild(); if (topWidget != null && topWidget.hasAttribute(Attribute.ALWAYS_ON_TOP)) { @@ -97,23 +85,11 @@ public class Widget implements IWidget { } else { this.children.add(child); } - this.onAddChild(child); - return child; - } - - protected void onAddChild(IWidget widget) { - } - - protected void onDeleteChild(IWidget widget) { - } - - protected boolean hasChildren(){ - return !children.isEmpty(); } @Nullable protected IWidget getFirstChild(){ - if(!hasChildren()){ + if(children.isEmpty()){ return null; } return children.get(0); @@ -139,10 +115,9 @@ public class Widget implements IWidget { return null; } - @Override @Nullable public IWidget getTopChild() { - if(!hasChildren()){ + if(children.isEmpty()){ return null; } int childrenCount = getChildren().size(); @@ -165,18 +140,6 @@ public class Widget implements IWidget { } } - @Override - public boolean isDescendant(final IWidget widget) { - IWidget parentWidget = this; - while (parentWidget != widget) { - parentWidget = parentWidget.getParent(); - if (parentWidget == null) { - return false; - } - } - return true; - } - /* GEOMETRY */ @Override public final void setPosition(Point position) { @@ -191,11 +154,6 @@ public class Widget implements IWidget { return this.position.add(this.offset); } - @Override - public final boolean isTopLevel() { - return this instanceof ITopLevelWidget; - } - @Override public final Point getSize() { return this.size; @@ -206,11 +164,6 @@ public class Widget implements IWidget { return new Area(Point.ZERO, this.getSize()); } - @Override - public final Point getOriginalPosition() { - return this.position; - } - @Override @Nullable public final Area getCroppedZone() { @@ -230,13 +183,6 @@ public class Widget implements IWidget { return parent == null ? this.getPosition() : parent.getAbsolutePosition().add(this.getPosition()); } - @Override - public final Point getOriginalAbsolutePosition() { - IWidget parent = this.getParent(); - return parent == null ? this.getOriginalPosition() : parent.getOriginalPosition().sub(this.getOriginalPosition()); - } - - @Override public final void setSize(final Point vector) { if (!vector.equals(this.size)) { this.size = new Point(vector); @@ -244,11 +190,6 @@ public class Widget implements IWidget { } } - @Override - public final Point getOffset() { - return this.offset; - } - @Override public final void setOffset(final Point vector) { if (vector != this.offset) { @@ -257,7 +198,6 @@ public class Widget implements IWidget { } } - @Override public final int getXPos() { return this.getPosition().xPos(); } @@ -289,23 +229,6 @@ public class Widget implements IWidget { this.callEvent(new EventWidget.ChangeColour(this)); } } - @Override - public final boolean contains(final Point position) { - return this.getArea().contains(position); - } - - @Override - public int getLevel() { - IWidget parent = getParent(); - int level = 0; - int index = 0; - if(parent != null){ - List widgets = parent.getChildren(); - level = parent.getLevel(); - index = widgets.indexOf(this); - } - return level + index; - } /* EVENTS */ @Override @@ -315,20 +238,19 @@ public class Widget implements IWidget { @Override public void addEventHandler(Class eventClass, EventHandler.OnEventHandler handler) { - this.eventHandlers.add(new EventHandler(eventClass, handler)); + this.eventHandlers.add(new EventHandler<>(eventClass, handler)); } @Override public void addEventHandler(Class eventClass, EventHandler.Origin origin, IWidget relative, EventHandler.OnEventHandler handler) { - this.eventHandlers.add(new EventHandler(eventClass, origin, relative, handler)); + this.eventHandlers.add(new EventHandler<>(eventClass, origin, relative, handler)); } @Override public void addSelfEventHandler(Class eventClass, EventHandler.OnEventHandler handler) { - this.eventHandlers.add(new EventHandler(eventClass, EventHandler.Origin.SELF, this, handler)); + this.eventHandlers.add(new EventHandler<>(eventClass, EventHandler.Origin.SELF, this, handler)); } - @Override public void callEvent(final Event event) { this.getTopParent().receiveEvent(event); } @@ -355,7 +277,6 @@ public class Widget implements IWidget { return this.hasAttribute(Attribute.MOUSE_OVER); } - @Override public Point getMousePosition() { return this.getTopParent().getAbsoluteMousePosition(); } @@ -379,12 +300,10 @@ public class Widget implements IWidget { return inCrop && this.isMouseOverWidget(mouse); } - @Override public boolean isMouseOverWidget(final Point relativeMouse) { return this.getArea().contains(relativeMouse); } - @Override public final boolean isMouseOver() { return this.getTopParent().isMouseOver(this); } @@ -448,30 +367,15 @@ public class Widget implements IWidget { } /* STATES*/ - @Override - public final void enable() { - this.enabled = true; - this.callEvent(new EventWidget.Enable(this)); - } - - @Override - public final void disable() { - this.enabled = false; - this.callEvent(new EventWidget.Disable(this)); - } - @Override public boolean isEnabled() { - if (this.enabled) { - IWidget parent = this.getParent(); - if (parent != null) { - if (!parent.isEnabled() || !parent.isChildEnabled(this)) { - return false; - } + IWidget parent = this.getParent(); + if (parent != null) { + if (!parent.isEnabled()) { + return false; } - return true; } - return false; + return true; } @Override @@ -500,28 +404,12 @@ public class Widget implements IWidget { return false; } - @Override - public final boolean isFocused() { - return this.getTopParent().isFocused(this); - } - - @Override - public final boolean isDragged() { - return this.getTopParent().isDragged(this); - } - @Override public boolean isChildVisible(final IWidget child) { return true; } - @Override - public boolean isChildEnabled(final IWidget child) { - return true; - } - /* UPDATE */ - @Override @SideOnly(Side.CLIENT) public void onUpdateClient() { } @@ -536,16 +424,8 @@ public class Widget implements IWidget { ((ITopLevelWidget) this).updateTopLevel(); } this.onUpdateClient(); - final List deletedWidgets = new ArrayList<>(); for (final IWidget widget : this.getChildren()) { - if (widget.hasAttribute(Attribute.NEEDS_DELETION)) { - deletedWidgets.add(widget); - } else { - widget.updateClient(); - } - } - for (final IWidget widget : deletedWidgets) { - this.deleteChild(widget); + widget.updateClient(); } } @@ -553,15 +433,6 @@ public class Widget implements IWidget { @Override public final void delete() { this.getTopParent().widgetDeleted(this); - this.onDelete(); - } - - @Override - public void onDelete() { - } - - public void scheduleDeletion() { - this.addAttribute(Attribute.NEEDS_DELETION); } public IWidget getWidget() { diff --git a/src/main/java/binnie/core/gui/controls/ControlCheckbox.java b/src/main/java/binnie/core/gui/controls/ControlCheckbox.java index 4d1b9139..4e7fe490 100644 --- a/src/main/java/binnie/core/gui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/core/gui/controls/ControlCheckbox.java @@ -17,15 +17,9 @@ import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlCheckbox extends Control implements IControlValue { private boolean value; - private String text; - - public ControlCheckbox(final IWidget parent, final int x, final int y, final boolean bool) { - this(parent, x, y, 0, "", bool); - } public ControlCheckbox(final IWidget parent, final int x, final int y, final int w, final String text, final boolean bool) { super(parent, x, y, (w > 16) ? w : 16, 16); - this.text = text; this.value = bool; if (w > 16) { new ControlText(this, new Area(16, 1, w - 16, 16), text, TextJustification.MIDDLE_CENTER).setColor(4473924); diff --git a/src/main/java/binnie/core/gui/controls/ControlText.java b/src/main/java/binnie/core/gui/controls/ControlText.java index b99a3751..03bea37b 100644 --- a/src/main/java/binnie/core/gui/controls/ControlText.java +++ b/src/main/java/binnie/core/gui/controls/ControlText.java @@ -19,10 +19,6 @@ public class ControlText extends Control implements IControlValue { this(parent, new Area(pos, new Point(500, 0)), text, TextJustification.TOP_LEFT); } - public ControlText(final IWidget parent, final String text, final TextJustification align) { - this(parent, parent.getArea(), text, align); - } - public ControlText(final IWidget parent, final Area area, final String text, final TextJustification align) { super(parent, area.pos().xPos(), area.pos().yPos(), area.size().xPos(), area.size().yPos()); this.text = text; diff --git a/src/main/java/binnie/core/gui/controls/IControlSelection.java b/src/main/java/binnie/core/gui/controls/IControlSelection.java deleted file mode 100644 index ed0ff66f..00000000 --- a/src/main/java/binnie/core/gui/controls/IControlSelection.java +++ /dev/null @@ -1,9 +0,0 @@ -package binnie.core.gui.controls; - -public interface IControlSelection { - T getSelectedValue(); - - void setSelectedValue(T value); - - boolean isSelected(IControlSelectionOption option); -} diff --git a/src/main/java/binnie/core/gui/controls/IControlSelectionOption.java b/src/main/java/binnie/core/gui/controls/IControlSelectionOption.java deleted file mode 100644 index dcae935a..00000000 --- a/src/main/java/binnie/core/gui/controls/IControlSelectionOption.java +++ /dev/null @@ -1,5 +0,0 @@ -package binnie.core.gui.controls; - -public interface IControlSelectionOption { - T getValue(); -} diff --git a/src/main/java/binnie/core/gui/controls/button/ControlEnumButton.java b/src/main/java/binnie/core/gui/controls/button/ControlEnumButton.java deleted file mode 100644 index 4a563be0..00000000 --- a/src/main/java/binnie/core/gui/controls/button/ControlEnumButton.java +++ /dev/null @@ -1,56 +0,0 @@ -package binnie.core.gui.controls.button; - -import com.google.common.base.Preconditions; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import binnie.core.gui.IWidget; -import binnie.core.gui.controls.core.IControlValue; -import binnie.core.gui.events.EventMouse; -import binnie.core.gui.events.EventValueChanged; - -public class ControlEnumButton extends ControlButton implements IControlValue { - public static final String eventEnumChanged = "eventEnumButtonChanged"; - private T currentSelection; - private List enumConstants; - - public ControlEnumButton(final IWidget parent, final int x, final int y, final int width, final int height, final T[] values) { - super(parent, x, y, width, height, ""); - Preconditions.checkArgument(values.length > 0, "Tried to create ControlEnumButton with no values."); - this.enumConstants = new ArrayList<>(); - Collections.addAll(this.enumConstants, values); - this.currentSelection = values[0]; - } - - @Override - public String getText() { - return this.currentSelection.toString(); - } - - @Override - public void onMouseClick(final EventMouse.Down event) { - int index = this.enumConstants.indexOf(this.currentSelection); - if (index < this.enumConstants.size() - 1) { - ++index; - } else { - index = 0; - } - final T newEnum = this.enumConstants.get(index); - this.setValue(newEnum); - } - - @Override - public T getValue() { - return this.currentSelection; - } - - @Override - public void setValue(final T selection) { - if (this.currentSelection != selection) { - this.currentSelection = selection; - this.callEvent(new EventValueChanged(this, this.getValue())); - } - } -} diff --git a/src/main/java/binnie/core/gui/controls/button/ControlToggleButton.java b/src/main/java/binnie/core/gui/controls/button/ControlToggleButton.java deleted file mode 100644 index 923f9d91..00000000 --- a/src/main/java/binnie/core/gui/controls/button/ControlToggleButton.java +++ /dev/null @@ -1,18 +0,0 @@ -package binnie.core.gui.controls.button; - -import binnie.core.gui.IWidget; -import binnie.core.gui.events.EventMouse; -import binnie.core.gui.events.EventToggleButtonClicked; - -public class ControlToggleButton extends ControlButton { - boolean toggled; - - public ControlToggleButton(final IWidget parent, final int x, final int y, final int width, final int height) { - super(parent, x, y, width, height); - } - - @Override - public void onMouseClick(final EventMouse.Down event) { - this.callEvent(new EventToggleButtonClicked(this, this.toggled)); - } -} diff --git a/src/main/java/binnie/core/gui/controls/core/Control.java b/src/main/java/binnie/core/gui/controls/core/Control.java index d596a363..2cfc9c0a 100644 --- a/src/main/java/binnie/core/gui/controls/core/Control.java +++ b/src/main/java/binnie/core/gui/controls/core/Control.java @@ -73,11 +73,6 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { } } - @Override - public int getLevel() { - return this.extraLevel + super.getLevel(); - } - @Override public void getHelpTooltip(final Tooltip tooltip) { tooltip.add(this.helpStrings); diff --git a/src/main/java/binnie/core/gui/controls/core/IControlIndexed.java b/src/main/java/binnie/core/gui/controls/core/IControlIndexed.java deleted file mode 100644 index 1351ef76..00000000 --- a/src/main/java/binnie/core/gui/controls/core/IControlIndexed.java +++ /dev/null @@ -1,7 +0,0 @@ -package binnie.core.gui.controls.core; - -public interface IControlIndexed { - int getIndex(); - - void setIndex(final int p0); -} diff --git a/src/main/java/binnie/core/gui/controls/core/IControlValues.java b/src/main/java/binnie/core/gui/controls/core/IControlValues.java index 6a217dca..9d99d69b 100644 --- a/src/main/java/binnie/core/gui/controls/core/IControlValues.java +++ b/src/main/java/binnie/core/gui/controls/core/IControlValues.java @@ -4,6 +4,4 @@ import java.util.Collection; public interface IControlValues extends IControlValue { Collection getValues(); - - void setValues(final Collection p0); } diff --git a/src/main/java/binnie/core/gui/controls/listbox/ControlList.java b/src/main/java/binnie/core/gui/controls/listbox/ControlList.java index 00be7cd3..100505c8 100644 --- a/src/main/java/binnie/core/gui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/core/gui/controls/listbox/ControlList.java @@ -90,10 +90,6 @@ public class ControlList extends Control implements IControlValue { this.filterOptions(); } - public Collection getAllOptions() { - return this.allOptions.keySet(); - } - public int getIndexOf(final T value) { int index = 0; for (final T option : this.getOptions()) { diff --git a/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java b/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java index 32285da5..674d89ba 100644 --- a/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/core/gui/controls/listbox/ControlOption.java @@ -13,10 +13,6 @@ import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlOption extends Control implements IControlValue { private T value; - public ControlOption(final ControlList controlList, final T option) { - this(controlList, option, 16); - } - public ControlOption(final ControlList controlList, final T option, final int height) { super(controlList, 0, height, controlList.getSize().xPos(), 20); this.value = option; diff --git a/src/main/java/binnie/core/gui/controls/page/ControlPages.java b/src/main/java/binnie/core/gui/controls/page/ControlPages.java index 0e4f18bb..9d439561 100644 --- a/src/main/java/binnie/core/gui/controls/page/ControlPages.java +++ b/src/main/java/binnie/core/gui/controls/page/ControlPages.java @@ -44,8 +44,4 @@ public class ControlPages extends Control implements IControlValues, ICont } return list; } - - @Override - public void setValues(final Collection values) { - } } diff --git a/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java b/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java index 64099f64..75ea8080 100644 --- a/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java +++ b/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java @@ -39,9 +39,9 @@ public class ControlTabBar extends Control implements IControlValue { int j = 0; for (final T value : values) { if (this.position == Position.Top || this.position == Position.BOTTOM) { - final IWidget tab = this.createTab(j * tabDimension, 0, tabDimension, this.getSize().yPos(), value); + this.createTab(j * tabDimension, 0, tabDimension, this.getSize().yPos(), value); } else { - final IWidget tab = this.createTab(0, j * tabDimension, this.getSize().xPos(), tabDimension, value); + this.createTab(0, j * tabDimension, this.getSize().xPos(), tabDimension, value); } ++j; } diff --git a/src/main/java/binnie/core/gui/database/ControlMutationBox.java b/src/main/java/binnie/core/gui/database/ControlMutationBox.java index 61e44817..417f25ed 100644 --- a/src/main/java/binnie/core/gui/database/ControlMutationBox.java +++ b/src/main/java/binnie/core/gui/database/ControlMutationBox.java @@ -1,5 +1,6 @@ package binnie.core.gui.database; +import javax.annotation.Nullable; import java.util.List; import forestry.api.genetics.IAlleleSpecies; @@ -11,8 +12,8 @@ import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.minecraft.Window; class ControlMutationBox extends ControlListBox { - private int index; private Type type; + @Nullable private IAlleleSpecies species; public ControlMutationBox(final IWidget parent, final int x, final int y, final int width, final int height, final Type type) { @@ -26,10 +27,9 @@ class ControlMutationBox extends ControlListBox { return new ControlMutationItem(this.getContent(), value, this.species, y); } - public void setSpecies(final IAlleleSpecies species) { + public void setSpecies(@Nullable final IAlleleSpecies species) { if (species != this.species) { this.species = species; - this.index = 0; this.movePercentage(-100.0f); final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); final List discovered = system.getDiscoveredMutations(Window.get(this).getWorld(), Window.get(this).getUsername()); diff --git a/src/main/java/binnie/core/gui/database/ControlMutationItem.java b/src/main/java/binnie/core/gui/database/ControlMutationItem.java index e627595b..3110b33f 100644 --- a/src/main/java/binnie/core/gui/database/ControlMutationItem.java +++ b/src/main/java/binnie/core/gui/database/ControlMutationItem.java @@ -1,5 +1,7 @@ package binnie.core.gui.database; +import javax.annotation.Nullable; + import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; @@ -15,7 +17,7 @@ class ControlMutationItem extends ControlOption { private ControlMutationSymbol addSymbol; private ControlMutationSymbol arrowSymbol; - public ControlMutationItem(final ControlList controlList, final IMutation option, final IAlleleSpecies species, final int y) { + public ControlMutationItem(final ControlList controlList, final IMutation option, @Nullable final IAlleleSpecies species, final int y) { super(controlList, option, y); this.itemWidget1 = new ControlDatabaseIndividualDisplay(this, 4, 4); this.itemWidget2 = new ControlDatabaseIndividualDisplay(this, 44, 4); diff --git a/src/main/java/binnie/core/gui/database/DatabaseConstants.java b/src/main/java/binnie/core/gui/database/DatabaseConstants.java index bbecb221..14af372f 100644 --- a/src/main/java/binnie/core/gui/database/DatabaseConstants.java +++ b/src/main/java/binnie/core/gui/database/DatabaseConstants.java @@ -28,6 +28,4 @@ public class DatabaseConstants { public static final String BOTANY_TAB_KEY = BOTANY_KEY + TAB_PRE_FIX; public static final String BOTANY_GENOME_KEY = BOTANY_TAB_KEY + ".genome"; - public static final String TIME_KEY = KEY + ".time"; - } diff --git a/src/main/java/binnie/core/gui/database/DatabaseTab.java b/src/main/java/binnie/core/gui/database/DatabaseTab.java index a179d7b5..0ef202eb 100644 --- a/src/main/java/binnie/core/gui/database/DatabaseTab.java +++ b/src/main/java/binnie/core/gui/database/DatabaseTab.java @@ -8,12 +8,10 @@ import binnie.core.util.I18N; public class DatabaseTab implements ITooltipHelp { private AbstractMod mod; private String unloc; - private int colour; - public DatabaseTab(final AbstractMod mod, final String unloc, final int colour) { + public DatabaseTab(final AbstractMod mod, final String unloc) { this.mod = mod; this.unloc = unloc; - this.colour = colour; } @Override diff --git a/src/main/java/binnie/core/gui/database/PageBreeder.java b/src/main/java/binnie/core/gui/database/PageBreeder.java index 063eeea0..bfb51bf2 100644 --- a/src/main/java/binnie/core/gui/database/PageBreeder.java +++ b/src/main/java/binnie/core/gui/database/PageBreeder.java @@ -23,7 +23,6 @@ public class PageBreeder extends ControlPage { public void onPageRefresh() { this.deleteAllChildren(); final BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem(); - final String descriptor = system.getDescriptor(); new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + system.getDescriptor() + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".profile")); new ControlTextCentered(this, 75, "" + system.discoveredSpeciesCount + "/" + system.totalSpeciesCount + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".species")); new ControlBreedingProgress(this, 20, 87, 102, 14, system, system.discoveredSpeciesPercentage); diff --git a/src/main/java/binnie/core/gui/database/PageBreederStats.java b/src/main/java/binnie/core/gui/database/PageBreederStats.java deleted file mode 100644 index ce39f3ed..00000000 --- a/src/main/java/binnie/core/gui/database/PageBreederStats.java +++ /dev/null @@ -1,21 +0,0 @@ -package binnie.core.gui.database; - -import net.minecraft.util.text.TextFormatting; - -import binnie.core.genetics.BreedingSystem; -import binnie.core.gui.IWidget; -import binnie.core.gui.controls.ControlText; -import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.controls.core.Control; -import binnie.core.util.I18N; - -public class PageBreederStats extends Control { - String player; - - public PageBreederStats(final IWidget parent, final int w, final int h, final String player) { - super(parent, 0, 0, w, h); - this.player = player; - final ControlText pageBranchOverview_branchName = new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + I18N.localise(DatabaseConstants.BREEDER_KEY + ".stats")); - final BreedingSystem system = ((WindowAbstractDatabase) this.getTopParent()).getBreedingSystem(); - } -} diff --git a/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java b/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java index 22ffe3f6..c166f39f 100644 --- a/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java @@ -46,7 +46,6 @@ public class PageSpeciesOverview extends PageSpecies { this.controlInd1.setSpecies(species, EnumDiscoveryState.Show); this.controlInd2.setSpecies(species, EnumDiscoveryState.Show); final String branchBinomial = species.getBranch().getScientific(); - final String branchName = species.getBranch().getName(); this.controlName.setValue(TextFormatting.UNDERLINE + species.getAlleleName()); this.controlScientific.setValue(TextFormatting.ITALIC + branchBinomial + " " + species.getBinomial()); this.controlAuthority.setValue(I18N.localise(DatabaseConstants.KEY + ".discovered") + ": " + TextFormatting.BOLD + species.getAuthority()); diff --git a/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java index d5d28ca9..71674e74 100644 --- a/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java @@ -40,11 +40,6 @@ import binnie.core.gui.window.Panel; import binnie.core.util.I18N; public abstract class WindowAbstractDatabase extends Window { - private final int infoBoxWidth = 144; - private final int infoBoxHeight = 176; - private final int infoTabWidth = 16; - private final int modeTabWidth = 22; - private final int searchBoxHeight = 16; boolean isNEI; private int selectionBoxWidth; private Map modes; @@ -71,10 +66,6 @@ public abstract class WindowAbstractDatabase extends Window { this.selectionBoxWidth = wid; } - public WindowAbstractDatabase(final EntityPlayer player, final Side side, final boolean nei, final BreedingSystem system) { - this(player, side, nei, system, 95); - } - public void changeMode(final IDatabaseMode mode) { this.modePages.setValue(mode); } @@ -252,7 +243,7 @@ public abstract class WindowAbstractDatabase extends Window { @Override public void createListBox(final Area area) { final EntityPlayer player = this.database.getPlayer(); - final GameProfile playerName = WindowAbstractDatabase.this.getUsername(); + final GameProfile playerName = player.getGameProfile(); final Collection speciesList = this.database.isNEI ? this.database.system.getAllBranches() : this.database.system.getDiscoveredBranches(this.database.getWorld(), playerName); ControlBranchBox controlBranchBox = new ControlBranchBox(this.modePage, area.xPos(), area.yPos(), area.width(), area.height()); controlBranchBox.setOptions(speciesList); diff --git a/src/main/java/binnie/core/gui/events/EventCycleChanged.java b/src/main/java/binnie/core/gui/events/EventCycleChanged.java deleted file mode 100644 index 8d55428c..00000000 --- a/src/main/java/binnie/core/gui/events/EventCycleChanged.java +++ /dev/null @@ -1,16 +0,0 @@ -package binnie.core.gui.events; - -import binnie.core.gui.IWidget; - -public class EventCycleChanged extends Event { - public int value; - - public EventCycleChanged(final IWidget origin, final int value) { - super(origin); - this.value = value; - } - - public int getValue() { - return this.value; - } -} diff --git a/src/main/java/binnie/core/gui/events/EventKey.java b/src/main/java/binnie/core/gui/events/EventKey.java index f283bca0..c4040e75 100644 --- a/src/main/java/binnie/core/gui/events/EventKey.java +++ b/src/main/java/binnie/core/gui/events/EventKey.java @@ -25,10 +25,4 @@ public abstract class EventKey extends Event { super(origin, character, key); } } - - public static class Up extends EventKey { - public Up(final IWidget origin, final char character, final int key) { - super(origin, character, key); - } - } } diff --git a/src/main/java/binnie/core/gui/events/EventToggleButtonClicked.java b/src/main/java/binnie/core/gui/events/EventToggleButtonClicked.java deleted file mode 100644 index 51cfab0c..00000000 --- a/src/main/java/binnie/core/gui/events/EventToggleButtonClicked.java +++ /dev/null @@ -1,16 +0,0 @@ -package binnie.core.gui.events; - -import binnie.core.gui.IWidget; - -public class EventToggleButtonClicked extends Event { - boolean toggled; - - public EventToggleButtonClicked(final IWidget origin, final boolean toggled) { - super(origin); - this.toggled = toggled; - } - - public boolean isActive() { - return this.toggled; - } -} diff --git a/src/main/java/binnie/core/gui/events/EventValuesChanged.java b/src/main/java/binnie/core/gui/events/EventValuesChanged.java deleted file mode 100644 index e3352b97..00000000 --- a/src/main/java/binnie/core/gui/events/EventValuesChanged.java +++ /dev/null @@ -1,16 +0,0 @@ -package binnie.core.gui.events; - -import binnie.core.gui.IWidget; - -public class EventValuesChanged extends Event { - public T[] values; - - public EventValuesChanged(final IWidget origin, final T[] values) { - super(origin); - this.values = values; - } - - public T[] getValues() { - return this.values; - } -} diff --git a/src/main/java/binnie/core/gui/events/EventWidget.java b/src/main/java/binnie/core/gui/events/EventWidget.java index e2d959ec..468aa9b4 100644 --- a/src/main/java/binnie/core/gui/events/EventWidget.java +++ b/src/main/java/binnie/core/gui/events/EventWidget.java @@ -7,18 +7,6 @@ public class EventWidget extends Event { super(origin); } - public static class Enable extends EventWidget { - public Enable(final IWidget origin) { - super(origin); - } - } - - public static class Disable extends EventWidget { - public Disable(final IWidget origin) { - super(origin); - } - } - public static class Show extends EventWidget { public Show(final IWidget origin) { super(origin); diff --git a/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java index 215d0207..e2216c7e 100644 --- a/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java @@ -229,10 +229,6 @@ public class GuiCraftGUI extends GuiContainer { this.window.callEvent(new EventMouse.Down(origin, x, y, button)); } - public boolean isShiftDown() { - return Keyboard.isKeyDown(this.mc.gameSettings.keyBindSneak.getKeyCode()); - } - @Override protected void keyTyped(final char c, final int key) { if (key == 1 || (key == this.mc.gameSettings.keyBindInventory.getKeyCode() && this.window.getFocusedWidget() == null)) { diff --git a/src/main/java/binnie/core/gui/minecraft/IMinecraftTooltip.java b/src/main/java/binnie/core/gui/minecraft/IMinecraftTooltip.java deleted file mode 100644 index 39ceba3d..00000000 --- a/src/main/java/binnie/core/gui/minecraft/IMinecraftTooltip.java +++ /dev/null @@ -1,7 +0,0 @@ -package binnie.core.gui.minecraft; - -import binnie.core.gui.ITooltip; - -public interface IMinecraftTooltip extends ITooltip { - void getTooltip(final MinecraftTooltip p0); -} diff --git a/src/main/java/binnie/core/gui/minecraft/Window.java b/src/main/java/binnie/core/gui/minecraft/Window.java index cefd7005..58857670 100644 --- a/src/main/java/binnie/core/gui/minecraft/Window.java +++ b/src/main/java/binnie/core/gui/minecraft/Window.java @@ -252,10 +252,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG return this.player.inventory.getItemStack(); } - public void setHeldItemStack(final ItemStack stack) { - this.player.inventory.setItemStack(stack); - } - @Nullable public IInventory getInventory() { return this.entityInventory; @@ -276,9 +272,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG return this.getPlayer().world; } - public void onInventoryUpdate() { - } - public void sendClientAction(final String name, final NBTTagCompound action) { action.setString("type", name); final MessageCraftGUI packet = new MessageCraftGUI(action); diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java index 10c21abb..36eeba70 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java @@ -101,9 +101,4 @@ public class ControlErrorState extends Control implements ITooltip { } } } - - @Nullable - public ErrorState getErrorState() { - return this.errorState; - } } diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java index 1638f09a..f666cbed 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java @@ -32,11 +32,6 @@ public class ControlIconDisplay extends Control { this.sprite = sprite.getSprite(); } - public ControlIconDisplay(final IWidget parent, final int x, final int y, TextureAtlasSprite sprite) { - super(parent, x, y, 16, 16); - this.sprite = sprite; - } - @Override @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java index 7bed4d9b..bb397dc0 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java @@ -1,12 +1,8 @@ package binnie.core.gui.minecraft.control; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - import binnie.core.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.minecraft.InventoryType; @@ -51,29 +47,6 @@ public class ControlPlayerInventory extends Control { } } - public void addItem(final ItemStack item) { - for (final ControlSlot slot : this.slots) { - if (!slot.slot.getHasStack()) { - slot.slot.putStack(item); - } - } - } - - public void addInventory(final IInventory inventory) { - for (int i = 0; i < inventory.getSizeInventory(); ++i) { - ItemStack stackInSlot = inventory.getStackInSlot(i); - this.addItem(stackInSlot); - } - } - - @Nullable - public ControlSlot getSlot(final int i) { - if (i < 0 || i >= this.slots.size()) { - return null; - } - return this.slots.get(i); - } - @Override public void onUpdateClient() { } diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java index 8873344a..7cd48fb3 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java @@ -45,10 +45,10 @@ public abstract class ControlSlotBase extends Control implements ITooltip { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - final int size = this.getSize().xPos(); CraftGUI.RENDER.texture(CraftGUITexture.SLOT, this.getArea()); if (this.getTopParent().getMousedOverWidget() == this) { - RenderUtil.drawGradientRect(new Area(new Point(1, 1), this.getArea().size().sub(new Point(2, 2))), -2130706433, -2130706433); + Area area = new Area(new Point(1, 1), this.getArea().size().sub(new Point(2, 2))); + RenderUtil.drawGradientRect(area, -2130706433, -2130706433); } } diff --git a/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java index 3fed3a92..5334d05a 100644 --- a/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java @@ -15,13 +15,10 @@ import binnie.core.gui.controls.core.Control; import binnie.core.gui.resource.minecraft.CraftGUITexture; public class ControlUser extends Control implements ITooltip { - String team; - private String username; + private final String username; public ControlUser(final IWidget parent, final int x, final int y, final String username) { super(parent, x, y, 16, 16); - this.username = ""; - this.team = ""; this.addAttribute(Attribute.MOUSE_OVER); this.username = username; } diff --git a/src/main/java/binnie/core/gui/minecraft/render/MinecraftTexture.java b/src/main/java/binnie/core/gui/minecraft/render/MinecraftTexture.java deleted file mode 100644 index 1554d83f..00000000 --- a/src/main/java/binnie/core/gui/minecraft/render/MinecraftTexture.java +++ /dev/null @@ -1,13 +0,0 @@ -package binnie.core.gui.minecraft.render; - -import binnie.core.gui.geometry.Area; -import binnie.core.resource.IBinnieTexture; - -public class MinecraftTexture { - Area textureArea; - IBinnieTexture texture; - - public MinecraftTexture() { - this.textureArea = new Area(0, 0, 0, 0); - } -} diff --git a/src/main/java/binnie/core/gui/minecraft/render/RenderCommand.java b/src/main/java/binnie/core/gui/minecraft/render/RenderCommand.java deleted file mode 100644 index b8dc75e7..00000000 --- a/src/main/java/binnie/core/gui/minecraft/render/RenderCommand.java +++ /dev/null @@ -1,14 +0,0 @@ -package binnie.core.gui.minecraft.render; - -import binnie.core.gui.IWidget; -import binnie.core.gui.minecraft.GuiCraftGUI; - -public abstract class RenderCommand { - IWidget widget; - - public RenderCommand(final IWidget widget) { - this.widget = widget; - } - - public abstract void render(final GuiCraftGUI p0); -} diff --git a/src/main/java/binnie/core/gui/minecraft/render/package-info.java b/src/main/java/binnie/core/gui/minecraft/render/package-info.java deleted file mode 100644 index 12fe3464..00000000 --- a/src/main/java/binnie/core/gui/minecraft/render/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.gui.minecraft.render; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/gui/renderer/TextureRenderer.java b/src/main/java/binnie/core/gui/renderer/TextureRenderer.java index 0dbb8c81..93297803 100644 --- a/src/main/java/binnie/core/gui/renderer/TextureRenderer.java +++ b/src/main/java/binnie/core/gui/renderer/TextureRenderer.java @@ -214,7 +214,4 @@ public class TextureRenderer { } this.texture(texture.crop(direction, dim - dist), new Area(x, y, w, h)); } - - public void test(final IWidget widget) { - } } diff --git a/src/main/java/binnie/core/gui/renderer/TextureType.java b/src/main/java/binnie/core/gui/renderer/TextureType.java deleted file mode 100644 index eb3c25cf..00000000 --- a/src/main/java/binnie/core/gui/renderer/TextureType.java +++ /dev/null @@ -1,6 +0,0 @@ -package binnie.core.gui.renderer; - -public enum TextureType { - Stretched, - Tiled -} diff --git a/src/main/java/binnie/core/gui/resource/Texture.java b/src/main/java/binnie/core/gui/resource/Texture.java index ac25f776..ecc0bb2d 100644 --- a/src/main/java/binnie/core/gui/resource/Texture.java +++ b/src/main/java/binnie/core/gui/resource/Texture.java @@ -15,14 +15,6 @@ public class Texture { private final Border border; private final IBinnieTexture binnieTexture; - public Texture(final Area area, final IBinnieTexture binnieTexture) { - this(area, Border.ZERO, Border.ZERO, binnieTexture); - } - - public Texture(final Area area, final Border padding, final IBinnieTexture binnieTexture) { - this(area, padding, Border.ZERO, binnieTexture); - } - public Texture(final Area area, final Border padding, final Border border, final IBinnieTexture binnieTexture) { this.area = new Area(area); this.padding = new Border(padding); @@ -34,10 +26,6 @@ public class Texture { return this.area; } - public Border getPadding() { - return this.padding; - } - public Border getBorder() { return this.border; } @@ -59,14 +47,6 @@ public class Texture { return this.getArea().height(); } - public int u() { - return this.getArea().xPos(); - } - - public int v() { - return this.getArea().yPos(); - } - public Texture crop(final Position anchor, final int dist) { return this.crop(new Border(anchor.opposite(), dist)); } diff --git a/src/main/java/binnie/core/liquid/FluidContainerType.java b/src/main/java/binnie/core/liquid/FluidContainerType.java index c4044b16..8281452a 100644 --- a/src/main/java/binnie/core/liquid/FluidContainerType.java +++ b/src/main/java/binnie/core/liquid/FluidContainerType.java @@ -38,11 +38,6 @@ public enum FluidContainerType { return I18N.localise("binniecore.item.container." + this.name().toLowerCase()); } - @Nullable - public ItemFluidContainer getItem() { - return item; - } - public void setItem(ItemFluidContainer item) { this.item = item; } diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 1e93897b..39e9fa28 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -1,7 +1,6 @@ package binnie.core.liquid; import javax.annotation.Nullable; -import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; @@ -35,10 +34,6 @@ public class ManagerLiquid extends ManagerBase { this.fluids = new LinkedHashMap<>(); } - public Collection getFluidTypes() { - return this.fluids.values(); - } - public void createLiquids(final IFluidType[] liquids) { for (final IFluidType liquid : liquids) { final BinnieFluid fluid = this.createLiquid(liquid); @@ -76,10 +71,6 @@ public class ManagerLiquid extends ManagerBase { ); } - public IFluidType getFluidType(final String liquid) { - return this.fluids.get(liquid.toLowerCase()); - } - @SubscribeEvent @SideOnly(Side.CLIENT) public void registerSprites(TextureStitchEvent event) { diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index cb89d872..bc6a477e 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -96,9 +96,8 @@ class BlockMachine extends Block implements IBlockMachine, ITileEntityProvider { return new BlockStateContainer(this, MACHINE_TYPE); } - @Override @Nullable - public MachinePackage getPackage(final int meta) { + private MachinePackage getPackage(final int meta) { return this.group.getPackage(meta); } diff --git a/src/main/java/binnie/core/machines/IBlockMachine.java b/src/main/java/binnie/core/machines/IBlockMachine.java index c0fac824..0c04f554 100644 --- a/src/main/java/binnie/core/machines/IBlockMachine.java +++ b/src/main/java/binnie/core/machines/IBlockMachine.java @@ -1,10 +1,5 @@ package binnie.core.machines; -import javax.annotation.Nullable; - interface IBlockMachine { - @Nullable - MachinePackage getPackage(int meta); - String getMachineName(int meta); } diff --git a/src/main/java/binnie/core/machines/IMachine.java b/src/main/java/binnie/core/machines/IMachine.java index cb6ec6c3..4daebf6b 100644 --- a/src/main/java/binnie/core/machines/IMachine.java +++ b/src/main/java/binnie/core/machines/IMachine.java @@ -23,6 +23,4 @@ public interface IMachine extends IOwnable { Collection getInterfaces(Class Interface); MachinePackage getPackage(); - - void sendRefreshPacket(); } diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index 54fa75db..f70c7705 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -10,7 +10,6 @@ import java.util.List; import java.util.Map; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; @@ -29,7 +28,6 @@ import binnie.core.BinnieCore; import binnie.core.machines.component.IInteraction; import binnie.core.machines.component.IRender; import binnie.core.machines.network.INetwork; -import binnie.core.machines.power.ITankMachine; import binnie.core.network.BinnieCorePacketID; import binnie.core.network.INetworkedEntity; import binnie.core.network.packet.MessageBase; @@ -147,21 +145,6 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN return this.tile; } - public void sendRefreshPacket() { - if (!BinnieCore.getBinnieProxy().isSimulating(this.getTileEntity().getWorld())) { - return; - } - MessageBase message = getRefreshPacket(); - if(message == null){ - return; - } - BinnieCore.getBinnieProxy().sendToAll(message); - } - - public Side getSide() { - return BinnieCore.getBinnieProxy().isSimulating(this.getTileEntity().getWorld()) ? Side.SERVER : Side.CLIENT; - } - @Override public void writeToPacket(final PacketPayload payload) { for (final MachineComponent component : this.getComponents()) { @@ -216,14 +199,6 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN } } - public IInventory getInventory() { - return this.getInterface(IInventory.class); - } - - public ITankMachine getTankContainer() { - return this.getInterface(ITankMachine.class); - } - @Override public void readFromNBT(final NBTTagCompound nbttagcompound) { for (final MachineComponent component : this.getComponents()) { diff --git a/src/main/java/binnie/core/machines/MachineComponent.java b/src/main/java/binnie/core/machines/MachineComponent.java index cf3b4993..dec01e07 100644 --- a/src/main/java/binnie/core/machines/MachineComponent.java +++ b/src/main/java/binnie/core/machines/MachineComponent.java @@ -7,7 +7,6 @@ import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; import binnie.Binnie; -import binnie.core.network.packet.MachinePayload; public class MachineComponent implements INbtReadable, INbtWritable { private IMachine machine; @@ -44,13 +43,6 @@ public class MachineComponent implements INbtReadable, INbtWritable { public void onInventoryUpdate() { } - public final MachinePayload getPayload() { - return new MachinePayload(Binnie.MACHINE.getNetworkID(this.getClass())); - } - - public void recieveData(final MachinePayload payload) { - } - public MachineUtil getUtil() { return this.getMachine().getMachineUtil(); } diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index a7ff8c64..bfcb69ef 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -14,23 +14,17 @@ import binnie.core.AbstractMod; import binnie.core.BinnieCore; public class MachineGroup { - public boolean customRenderer; private AbstractMod mod; - private String blockName; private String uid; private Map packages; private Map packagesID; private BlockMachine block; - private boolean renderedTileEntity; public MachineGroup(final AbstractMod mod, final String uid, final String blockName, final IMachineType[] types) { this.packages = new LinkedHashMap<>(); this.packagesID = new LinkedHashMap<>(); - this.customRenderer = true; - this.renderedTileEntity = true; this.mod = mod; this.uid = uid; - this.blockName = blockName; createPackages(types); Binnie.MACHINE.registerMachineGroup(this); this.block = new BlockMachine(this, blockName); @@ -93,14 +87,6 @@ public class MachineGroup { return this.uid; } - boolean isTileEntityRenderered() { - return this.renderedTileEntity; - } - - public void renderAsBlock() { - this.renderedTileEntity = false; - } - public void setCreativeTab(final CreativeTabs tab) { this.block.setCreativeTab(tab); } diff --git a/src/main/java/binnie/core/machines/MachineRendererBlock.java b/src/main/java/binnie/core/machines/MachineRendererBlock.java deleted file mode 100644 index 3ace60e5..00000000 --- a/src/main/java/binnie/core/machines/MachineRendererBlock.java +++ /dev/null @@ -1,32 +0,0 @@ -package binnie.core.machines; - -import net.minecraft.client.renderer.GlStateManager; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import binnie.core.BinnieCore; -import binnie.core.resource.BinnieResource; - -@SideOnly(Side.CLIENT) -public class MachineRendererBlock { - public static MachineRendererBlock instance = new MachineRendererBlock(); - private BinnieResource texture; - private ModelBlock model; - - public MachineRendererBlock() { - this.model = new ModelBlock(); - } - - public void renderMachine(final BinnieResource texture, final double x, final double y, final double z, final float partialTicks) { - this.texture = texture; - GlStateManager.pushMatrix(); - GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5); - GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); - - BinnieCore.getBinnieProxy().bindTexture(texture); - this.model.render((float) x, (float) y, (float) z, 0.0625f, 0.0625f, 0.0625f); - - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index 97670ea3..6a1135d1 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -17,15 +17,11 @@ import binnie.core.machines.inventory.ValidatorSprite; public class ManagerMachine extends ManagerBase { private Map, Class[]> componentInterfaceMap; private Map machineGroups; - private Map> networkIDToComponent; - private Map, Integer> componentToNetworkID; private int nextNetworkID; public ManagerMachine() { this.componentInterfaceMap = new HashMap<>(); this.machineGroups = new HashMap<>(); - this.networkIDToComponent = new HashMap<>(); - this.componentToNetworkID = new HashMap<>(); this.nextNetworkID = 0; } @@ -55,16 +51,6 @@ public class ManagerMachine extends ManagerBase { interfaces.remove(INbtReadable.class); this.componentInterfaceMap.put(component, interfaces.toArray(new Class[0])); final int networkID = this.nextNetworkID++; - this.networkIDToComponent.put(networkID, component); - this.componentToNetworkID.put(component, networkID); - } - - public int getNetworkID(final Class component) { - return this.componentToNetworkID.get(component); - } - - public Class getComponentClass(final int networkID) { - return this.networkIDToComponent.get(networkID); } @Override diff --git a/src/main/java/binnie/core/machines/ModelBlock.java b/src/main/java/binnie/core/machines/ModelBlock.java deleted file mode 100644 index 4ededba1..00000000 --- a/src/main/java/binnie/core/machines/ModelBlock.java +++ /dev/null @@ -1,38 +0,0 @@ -package binnie.core.machines; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -class ModelBlock extends ModelBase { - private ModelRenderer Block; - - public ModelBlock() { - this.textureWidth = 64; - this.textureHeight = 32; - (this.Block = new ModelRenderer(this, 0, 0)).addBox(0.0f, 0.0f, 0.0f, 16, 16, 16); - this.Block.setRotationPoint(-8.0f, 8.0f, -8.0f); - this.Block.setTextureSize(64, 32); - this.Block.mirror = true; - this.setRotation(this.Block, 0.0f, 0.0f, 0.0f); - } - - @SideOnly(Side.CLIENT) - public void render(final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { - super.render(null, f, f1, f2, f3, f4, f5); - this.setRotationAngles(f, f1, f2, f3, f4, f5); - this.Block.render(f5); - } - - private void setRotation(final ModelRenderer model, final float x, final float y, final float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - public void setRotationAngles(final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { - super.setRotationAngles(f, f1, f2, f3, f4, f5, null); - } -} diff --git a/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java b/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java index 2db5444d..126a87a2 100644 --- a/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java +++ b/src/main/java/binnie/core/machines/base/DefaultMachineInventory.java @@ -26,11 +26,6 @@ class DefaultMachineInventory implements IInventoryMachine { return false; } - @Override - public boolean isReadOnly(final int slot) { - return false; - } - @Override public void markDirty() { } diff --git a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java index 8385a190..e192218b 100644 --- a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java +++ b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java @@ -83,11 +83,6 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi return this.getInventory().canExtractItem(i, itemstack, j); } - @Override - public boolean isReadOnly(final int slot) { - return this.getInventory().isReadOnly(slot); - } - @Override public PowerInfo getPowerInfo() { return this.getPower().getPowerInfo(); diff --git a/src/main/java/binnie/core/machines/errors/ErrorState.java b/src/main/java/binnie/core/machines/errors/ErrorState.java index c406294d..fd759af0 100644 --- a/src/main/java/binnie/core/machines/errors/ErrorState.java +++ b/src/main/java/binnie/core/machines/errors/ErrorState.java @@ -11,7 +11,6 @@ public class ErrorState implements INbtReadable, INbtWritable { private IErrorStateDefinition nameDefinition; private IErrorStateDefinition definition; private int[] data; - private boolean progress; private boolean itemError; private boolean tankError; private boolean powerError; @@ -32,14 +31,9 @@ public class ErrorState implements INbtReadable, INbtWritable { this(nameDefinition, definition, new int[0]); } - public ErrorState(IErrorStateDefinition nameDefinition, IErrorStateDefinition definition, int data) { - this(nameDefinition, definition, new int[]{data}); - } - public ErrorState(IErrorStateDefinition nameDefinition, IErrorStateDefinition definition, int[] data) { EnumErrorType type = definition.getType(); this.data = data; - this.progress = false; this.itemError = type.isItemError(); this.tankError = type.isTankError(); this.powerError = type.isPowerError(); @@ -49,7 +43,6 @@ public class ErrorState implements INbtReadable, INbtWritable { public ErrorState(NBTTagCompound nbtTagCompound) { this.data = new int[0]; - this.progress = false; this.itemError = false; this.tankError = false; this.powerError = false; @@ -71,14 +64,6 @@ public class ErrorState implements INbtReadable, INbtWritable { return this.data; } - public boolean isProgress() { - return this.progress; - } - - public void setIsProgress() { - this.progress = true; - } - @Override public void readFromNBT(final NBTTagCompound nbt) { this.nameDefinition = ErrorStateRegistry.getErrorState(nbt.getString("name")); diff --git a/src/main/java/binnie/core/machines/inventory/BaseSlot.java b/src/main/java/binnie/core/machines/inventory/BaseSlot.java index f9f6a208..5b78568b 100644 --- a/src/main/java/binnie/core/machines/inventory/BaseSlot.java +++ b/src/main/java/binnie/core/machines/inventory/BaseSlot.java @@ -41,12 +41,6 @@ public abstract class BaseSlot implements INbtWritable, INbtReadable, IValida @Nullable public abstract T getContent(); - public abstract void setContent(final T content); - - public boolean isEmpty() { - return this.getContent() == null; - } - public boolean isReadOnly() { return this.readOnly; } @@ -94,14 +88,6 @@ public abstract class BaseSlot implements INbtWritable, INbtReadable, IValida return this.access.getInsertionSides(); } - public void setInputSides(final EnumSet sides) { - for (final EnumFacing side : EnumSet.complementOf(sides)) { - //if (side != ForgeDirection.UNKNOWN) { - this.access.setInsert(side, false); - //} - } - } - public Collection getOutputSides() { return this.access.getExtractionSides(); } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index e02d47cf..6eae2104 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -95,17 +95,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve this.markDirty(); } - protected void transferItem(final int indexFrom, final int indexTo) { - if (this.inventory.containsKey(indexFrom) && this.inventory.containsKey(indexTo)) { - final InventorySlot slotFrom = this.inventory.get(indexFrom); - final ItemStack oldStack = slotFrom.getItemStack(); - final ItemStack newStack = oldStack.isEmpty() ? ItemStack.EMPTY : oldStack.copy(); - slotFrom.setContent(ItemStack.EMPTY); - this.inventory.get(indexTo).setContent(newStack); - } - this.markDirty(); - } - @Override public boolean isEmpty() { return this.inventory.isEmpty(); @@ -169,14 +158,12 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve return nbttagcompound; } - @Override public final InventorySlot addSlot(final int index, final String unlocName) { InventorySlot slot = new InventorySlot(index, unlocName); this.inventory.put(index, slot); return slot; } - @Override public final InventorySlot[] addSlotArray(final int[] indexes, final String unlocName) { for (final int k : indexes) { this.addSlot(k, unlocName); @@ -193,12 +180,6 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve return null; } - @Override - public InventorySlot[] getAllSlots() { - return this.inventory.values().toArray(new InventorySlot[0]); - } - - @Override public InventorySlot[] getSlots(final int[] indexes) { final List list = new ArrayList<>(); for (final int i : indexes) { @@ -209,8 +190,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve return list.toArray(new InventorySlot[0]); } - @Override - public boolean isReadOnly(final int slot) { + private boolean isReadOnly(final int slot) { final InventorySlot iSlot = this.getSlot(slot); return iSlot == null || iSlot.isReadOnly(); } diff --git a/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java b/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java index 073cbac9..1360b9f6 100644 --- a/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java +++ b/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -public interface IInventoryMachine extends IInventory, ISidedInventory, IValidatedInventory { +public interface IInventoryMachine extends IInventory, ISidedInventory { IInventory getInventory(); @Override diff --git a/src/main/java/binnie/core/machines/inventory/IInventorySlots.java b/src/main/java/binnie/core/machines/inventory/IInventorySlots.java index 793b6de3..9f8f5a80 100644 --- a/src/main/java/binnie/core/machines/inventory/IInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/IInventorySlots.java @@ -3,14 +3,6 @@ package binnie.core.machines.inventory; import javax.annotation.Nullable; public interface IInventorySlots { - InventorySlot addSlot(final int p0, final String p1); - - InventorySlot[] addSlotArray(final int[] p0, final String p1); - @Nullable InventorySlot getSlot(final int index); - - InventorySlot[] getSlots(final int[] p0); - - InventorySlot[] getAllSlots(); } diff --git a/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java b/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java deleted file mode 100644 index e084526d..00000000 --- a/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java +++ /dev/null @@ -1,7 +0,0 @@ -package binnie.core.machines.inventory; - -import net.minecraft.inventory.IInventory; - -interface IValidatedInventory extends IInventory { - boolean isReadOnly(final int p0); -} diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 4885c03f..777b9150 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -23,7 +23,6 @@ public class InventorySlot extends BaseSlot { return this.itemStack.isEmpty() ? null : this.itemStack; } - @Override public void setContent(final ItemStack itemStack) { this.itemStack = itemStack; } @@ -32,15 +31,6 @@ public class InventorySlot extends BaseSlot { return this.itemStack; } - public void setItemStack(final ItemStack duplicate) { - this.setContent(duplicate); - } - - @Override - public boolean isEmpty() { - return this.itemStack.isEmpty(); - } - public ItemStack decrStackSize(final int amount) { if (this.itemStack.isEmpty()) { return ItemStack.EMPTY; @@ -82,10 +72,6 @@ public class InventorySlot extends BaseSlot { return (SlotValidator) this.validator; } - public Type getType() { - return this.type; - } - public void setType(final Type type) { this.type = type; if (type == Type.Recipe) { diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index db939e92..2b1a4437 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -9,9 +9,6 @@ import net.minecraftforge.fluids.IFluidTank; import binnie.core.util.I18N; public class TankSlot extends BaseSlot { - public static final String NameJuice = "Juice Tank"; - public static final String NameWater = "Water Tank"; - public static String NameCupboard = "Cupboard Slot"; private FluidTank tank; public TankSlot(final int index, final String name, final int capacity) { @@ -38,7 +35,6 @@ public class TankSlot extends BaseSlot { return this.tank.getFluid(); } - @Override public void setContent(final FluidStack itemStack) { this.tank.setFluid(itemStack); } diff --git a/src/main/java/binnie/core/machines/power/TankInfo.java b/src/main/java/binnie/core/machines/power/TankInfo.java index fead5e6a..80c523b5 100644 --- a/src/main/java/binnie/core/machines/power/TankInfo.java +++ b/src/main/java/binnie/core/machines/power/TankInfo.java @@ -41,10 +41,6 @@ public class TankInfo implements INbtReadable, INbtWritable { return this.capacity; } - /*public IIcon getIcon() { - return this.liquid.getFluid().getStillIcon(); - }*/ - public boolean isEmpty() { return this.liquid == null; } diff --git a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java index d661927b..0b4a982f 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java +++ b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java @@ -16,10 +16,6 @@ class ComponentCompartmentInventory extends ComponentInventorySlots implements I private int slotsPerPage; private Map tabs; - public ComponentCompartmentInventory(final IMachine machine, final int sections) { - this(machine, sections, 4); - } - public ComponentCompartmentInventory(final IMachine machine, final int tabs, final int pageSize) { super(machine); this.tabs = new HashMap<>(); diff --git a/src/main/java/binnie/core/machines/storage/ModelCompartment.java b/src/main/java/binnie/core/machines/storage/ModelCompartment.java deleted file mode 100644 index 87022f26..00000000 --- a/src/main/java/binnie/core/machines/storage/ModelCompartment.java +++ /dev/null @@ -1,148 +0,0 @@ -package binnie.core.machines.storage; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -class ModelCompartment extends ModelBase { - private ModelRenderer Column1; - private ModelRenderer Column4; - private ModelRenderer Column2; - private ModelRenderer Column3; - private ModelRenderer Lid_1; - private ModelRenderer Body_1; - private ModelRenderer Lock_1; - private ModelRenderer Lid_2; - private ModelRenderer Body_2; - private ModelRenderer Lock_2; - private ModelRenderer Body; - private ModelRenderer Lid_3; - private ModelRenderer Body_3; - private ModelRenderer Lock_3; - private ModelRenderer Lid_4; - private ModelRenderer Body_4; - private ModelRenderer Lock_4; - - public ModelCompartment() { - this.textureWidth = 128; - this.textureHeight = 128; - (this.Column1 = new ModelRenderer(this, 0, 0)).addBox(-8.0f, 8.0f, -8.0f, 4, 16, 4); - this.Column1.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Column1.setTextureSize(128, 128); - this.Column1.mirror = true; - this.setRotation(this.Column1, 0.0f, 0.0f, 0.0f); - (this.Column4 = new ModelRenderer(this, 0, 0)).addBox(4.0f, 8.0f, -8.0f, 4, 16, 4); - this.Column4.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Column4.setTextureSize(128, 128); - this.Column4.mirror = true; - this.setRotation(this.Column4, 0.0f, 0.0f, 0.0f); - (this.Column2 = new ModelRenderer(this, 0, 0)).addBox(-8.0f, 8.0f, 4.0f, 4, 16, 4); - this.Column2.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Column2.setTextureSize(128, 128); - this.Column2.mirror = true; - this.setRotation(this.Column2, 0.0f, 0.0f, 0.0f); - (this.Column3 = new ModelRenderer(this, 0, 0)).addBox(4.0f, 8.0f, 4.0f, 4, 16, 4); - this.Column3.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Column3.setTextureSize(128, 128); - this.Column3.mirror = true; - this.setRotation(this.Column3, 0.0f, 0.0f, 0.0f); - (this.Lid_1 = new ModelRenderer(this, 48, 0)).addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); - this.Lid_1.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lid_1.setTextureSize(128, 128); - this.Lid_1.mirror = true; - this.setRotation(this.Lid_1, 0.0f, 0.0f, 0.0f); - (this.Body_1 = new ModelRenderer(this, 0, 24)).addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); - this.Body_1.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Body_1.setTextureSize(128, 128); - this.Body_1.mirror = true; - this.setRotation(this.Body_1, 0.0f, 0.0f, 0.0f); - (this.Lock_1 = new ModelRenderer(this, 22, 24)).addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); - this.Lock_1.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lock_1.setTextureSize(128, 128); - this.Lock_1.mirror = true; - this.setRotation(this.Lock_1, 0.0f, 0.0f, 0.0f); - (this.Lid_2 = new ModelRenderer(this, 48, 0)).addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); - this.Lid_2.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lid_2.setTextureSize(128, 128); - this.Lid_2.mirror = true; - this.setRotation(this.Lid_2, 0.0f, 1.570796f, 0.0f); - (this.Body_2 = new ModelRenderer(this, 0, 24)).addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); - this.Body_2.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Body_2.setTextureSize(128, 128); - this.Body_2.mirror = true; - this.setRotation(this.Body_2, 0.0f, 1.570796f, 0.0f); - (this.Lock_2 = new ModelRenderer(this, 22, 24)).addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); - this.Lock_2.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lock_2.setTextureSize(128, 128); - this.Lock_2.mirror = true; - this.setRotation(this.Lock_2, 0.0f, 1.570796f, 0.0f); - (this.Body = new ModelRenderer(this, 16, 0)).addBox(-4.0f, 8.0f, -4.0f, 8, 16, 8); - this.Body.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Body.setTextureSize(128, 128); - this.Body.mirror = true; - this.setRotation(this.Body, 0.0f, 0.0f, 0.0f); - (this.Lid_3 = new ModelRenderer(this, 48, 0)).addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); - this.Lid_3.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lid_3.setTextureSize(128, 128); - this.Lid_3.mirror = true; - this.setRotation(this.Lid_3, 0.0f, 3.141593f, 0.0f); - (this.Body_3 = new ModelRenderer(this, 0, 24)).addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); - this.Body_3.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Body_3.setTextureSize(128, 128); - this.Body_3.mirror = true; - this.setRotation(this.Body_3, 0.0f, 3.141593f, 0.0f); - (this.Lock_3 = new ModelRenderer(this, 22, 24)).addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); - this.Lock_3.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lock_3.setTextureSize(128, 128); - this.Lock_3.mirror = true; - this.setRotation(this.Lock_3, 0.0f, 3.141593f, 0.0f); - (this.Lid_4 = new ModelRenderer(this, 48, 0)).addBox(-4.0f, 9.0f, -7.0f, 8, 5, 3); - this.Lid_4.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lid_4.setTextureSize(128, 128); - this.Lid_4.mirror = true; - this.setRotation(this.Lid_4, 0.0f, -1.570796f, 0.0f); - (this.Body_4 = new ModelRenderer(this, 0, 24)).addBox(-4.0f, 14.0f, -7.0f, 8, 10, 3); - this.Body_4.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Body_4.setTextureSize(128, 128); - this.Body_4.mirror = true; - this.setRotation(this.Body_4, 0.0f, -1.570796f, 0.0f); - (this.Lock_4 = new ModelRenderer(this, 22, 24)).addBox(-1.0f, 12.0f, -8.0f, 2, 4, 1); - this.Lock_4.setRotationPoint(0.0f, 0.0f, 0.0f); - this.Lock_4.setTextureSize(128, 128); - this.Lock_4.mirror = true; - this.setRotation(this.Lock_4, 0.0f, -1.570796f, 0.0f); - } - - @Override - public void render(final Entity entity, final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { - /*super.render(entity, f, f1, f2, f3, f4, f5); - this.setRotationAngles(f, f1, f2, f3, f4, f5); - this.Column1.render(f5); - this.Column4.render(f5); - this.Column2.render(f5); - this.Column3.render(f5); - this.Lid_1.render(f5); - this.Body_1.render(f5); - this.Lock_1.render(f5); - this.Lid_2.render(f5); - this.Body_2.render(f5); - this.Lock_2.render(f5); - this.Body.render(f5); - this.Lid_3.render(f5); - this.Body_3.render(f5); - this.Lock_3.render(f5); - this.Lid_4.render(f5); - this.Body_4.render(f5); - this.Lock_4.render(f5);*/ - } - - private void setRotation(final ModelRenderer model, final float x, final float y, final float z) { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - public void setRotationAngles(final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { - super.setRotationAngles(f, f1, f2, f3, f4, f5, null); - } -} diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 0f22d498..2309ec6e 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -76,10 +76,6 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh this.currentTab = 0; } - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowCompartment(player, inventory, side); - } - @Override @SideOnly(Side.CLIENT) public void initialiseClient() { diff --git a/src/main/java/binnie/core/machines/storage/WindowTest.java b/src/main/java/binnie/core/machines/storage/WindowTest.java deleted file mode 100644 index 8cc7efe1..00000000 --- a/src/main/java/binnie/core/machines/storage/WindowTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package binnie.core.machines.storage; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; - -import net.minecraftforge.fml.relauncher.Side; - -import binnie.core.AbstractMod; -import binnie.core.BinnieCore; -import binnie.core.gui.minecraft.Window; -import binnie.genetics.machine.craftgui.WindowMachine; - -public class WindowTest extends WindowMachine { - public WindowTest(final EntityPlayer player, final IInventory inventory, final Side side) { - super(320, 240, player, inventory, side); - } - - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowCompartment(player, inventory, side); - } - - @Override - public void initialiseClient() { - } - - @Override - public String getTitle() { - return "Test"; - } - - @Override - protected AbstractMod getMod() { - return BinnieCore.getInstance(); - } - - @Override - protected String getBackgroundTextureName() { - return "Test"; - } -} diff --git a/src/main/java/binnie/core/mod/config/BinnieItemData.java b/src/main/java/binnie/core/mod/config/BinnieItemData.java deleted file mode 100644 index 9febda2a..00000000 --- a/src/main/java/binnie/core/mod/config/BinnieItemData.java +++ /dev/null @@ -1,13 +0,0 @@ -package binnie.core.mod.config; - -class BinnieItemData { - private int item; - private BinnieConfiguration configFile; - private String configKey; - - public BinnieItemData(final int item, final BinnieConfiguration configFile, final String configKey) { - this.item = item; - this.configFile = configFile; - this.configKey = configKey; - } -} diff --git a/src/main/java/binnie/core/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java index 69c8f9c0..7656a661 100644 --- a/src/main/java/binnie/core/models/ModelManager.java +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -45,14 +45,12 @@ import forestry.api.core.IStateMapperRegister; import forestry.core.blocks.IColoredBlock; import forestry.core.items.IColoredItem; import forestry.core.models.BlockModelEntry; -import forestry.core.models.ModelEntry; import forestry.core.utils.ModelUtil; @SideOnly(Side.CLIENT) public class ModelManager implements IModelManager { private final static List customBlockModels = new ArrayList<>(); - private final static List customModels = new ArrayList<>(); private final static List spriteRegister = new ArrayList<>(); public static IModelState defaultFenceState; private final String modID; @@ -87,9 +85,6 @@ public class ModelManager implements IModelManager { } } - for (final ModelEntry entry : customModels) { - registry.putObject(entry.modelLocation, entry.model); - } IModelState defaultBlockState = ModelUtil.loadModelState(new ResourceLocation("minecraft:models/block/block")); IModelState defaultFenceState = ModelUtil.loadModelState(new ResourceLocation("minecraft:models/block/fence_inventory")); ModelManager.defaultFenceState = mergeStates(defaultBlockState, defaultFenceState); @@ -107,10 +102,6 @@ public class ModelManager implements IModelManager { customBlockModels.add(index); } - public static void registerCustomModel(ModelEntry index) { - customModels.add(index); - } - @Override public void registerItemModel(Item item, int meta, String identifier) { ModelLoader.setCustomModelResourceLocation(item, meta, getModelLocation(identifier)); diff --git a/src/main/java/binnie/core/multiblock/BlockMultiblockMachine.java b/src/main/java/binnie/core/multiblock/BlockMultiblockMachine.java deleted file mode 100644 index 7a83c62e..00000000 --- a/src/main/java/binnie/core/multiblock/BlockMultiblockMachine.java +++ /dev/null @@ -1,25 +0,0 @@ -package binnie.core.multiblock; - -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class BlockMultiblockMachine extends BlockContainer { - public BlockMultiblockMachine(final String blockName) { - super(Material.IRON); - this.setHardness(1.5f); - this.setRegistryName(blockName); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) { - return new TileEntityMultiblockMachine(); - } - - @Override - public TileEntity createNewTileEntity(final World var1, final int i) { - return new TileEntityMultiblockMachine(); - } -} diff --git a/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java b/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java deleted file mode 100644 index 32b88116..00000000 --- a/src/main/java/binnie/core/multiblock/TileEntityMultiblockMachine.java +++ /dev/null @@ -1,36 +0,0 @@ -package binnie.core.multiblock; - -import javax.annotation.Nullable; - -import net.minecraft.tileentity.TileEntity; - -import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; - -class TileEntityMultiblockMachine extends TileEntity { - private boolean inStructure; - private int tileX; - private int tileY; - private int tileZ; - - boolean inStructure() { - return this.inStructure; - } - - @Nullable - public Machine getMachine() { - return this.getMasterMachine(); - } - - @Nullable - private Machine getMasterMachine() { - if (!this.inStructure) { - return null; - } - final TileEntity tile = this.world.getTileEntity(this.getPos().add(this.tileX, this.tileY, this.tileZ)); - if (tile instanceof TileEntityMachine) { - return ((TileEntityMachine) tile).getMachine(); - } - return null; - } -} diff --git a/src/main/java/binnie/core/multiblock/package-info.java b/src/main/java/binnie/core/multiblock/package-info.java deleted file mode 100644 index 50062ab2..00000000 --- a/src/main/java/binnie/core/multiblock/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.core.multiblock; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index 093dfd2b..9b519edf 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -34,6 +34,7 @@ public enum BinnieCorePacketID implements IPacketID { ((INetworkedEntity) tile).readFromPacket(packet.payload); } } else if (this == BinnieCorePacketID.TILE_METADATA) { + // TODO: why doesn't this store any metadata to the packet ? final MessageMetadata packet2 = new MessageMetadata(message); final TileEntity tile = packet2.getTileEntity(BinnieCore.getBinnieProxy().getWorld()); if (tile instanceof TileEntityMetadata) { diff --git a/src/main/java/binnie/core/network/IPacketProvider.java b/src/main/java/binnie/core/network/IPacketProvider.java index 67594e32..b830ed13 100644 --- a/src/main/java/binnie/core/network/IPacketProvider.java +++ b/src/main/java/binnie/core/network/IPacketProvider.java @@ -1,7 +1,5 @@ package binnie.core.network; public interface IPacketProvider { - String getChannel(); - IPacketID[] getPacketIDs(); } diff --git a/src/main/java/binnie/core/network/packet/IPacket.java b/src/main/java/binnie/core/network/packet/IPacket.java deleted file mode 100644 index 905c892b..00000000 --- a/src/main/java/binnie/core/network/packet/IPacket.java +++ /dev/null @@ -1,7 +0,0 @@ -package binnie.core.network.packet; - -import net.minecraft.network.Packet; - -public interface IPacket { - Packet getPacket(); -} diff --git a/src/main/java/binnie/core/network/packet/IPacketLocation.java b/src/main/java/binnie/core/network/packet/IPacketLocation.java deleted file mode 100644 index 40216bbf..00000000 --- a/src/main/java/binnie/core/network/packet/IPacketLocation.java +++ /dev/null @@ -1,17 +0,0 @@ -package binnie.core.network.packet; - -import javax.annotation.Nullable; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -interface IPacketLocation { - @Nullable - TileEntity getTarget(final World world); - - int getX(); - - int getY(); - - int getZ(); -} diff --git a/src/main/java/binnie/core/network/packet/IndexInPayload.java b/src/main/java/binnie/core/network/packet/IndexInPayload.java deleted file mode 100644 index 7badb92b..00000000 --- a/src/main/java/binnie/core/network/packet/IndexInPayload.java +++ /dev/null @@ -1,16 +0,0 @@ -package binnie.core.network.packet; - -public class IndexInPayload { - public int intIndex; - public int floatIndex; - public int stringIndex; - - public IndexInPayload(final int intIndex, final int floatIndex, final int stringIndex) { - this.intIndex = 0; - this.floatIndex = 0; - this.stringIndex = 0; - this.intIndex = intIndex; - this.floatIndex = floatIndex; - this.stringIndex = stringIndex; - } -} diff --git a/src/main/java/binnie/core/network/packet/MachinePayload.java b/src/main/java/binnie/core/network/packet/MachinePayload.java deleted file mode 100644 index 8a8ba009..00000000 --- a/src/main/java/binnie/core/network/packet/MachinePayload.java +++ /dev/null @@ -1,74 +0,0 @@ -package binnie.core.network.packet; - -import java.util.ArrayList; -import java.util.List; - -public class MachinePayload { - private List intPayload; - private List floatPayload; - private List stringPayload; - private int id; - - public MachinePayload(final int id) { - this.intPayload = new ArrayList<>(); - this.floatPayload = new ArrayList<>(); - this.stringPayload = new ArrayList<>(); - this.id = 0; - this.id = id; - this.intPayload.clear(); - this.floatPayload.clear(); - this.stringPayload.clear(); - } - - public MachinePayload() { - this.intPayload = new ArrayList<>(); - this.floatPayload = new ArrayList<>(); - this.stringPayload = new ArrayList<>(); - this.id = 0; - } - - public void addInteger(final int a) { - this.intPayload.add(a); - } - - public void addFloat(final float a) { - this.floatPayload.add(a); - } - - public void addString(final String a) { - this.stringPayload.add(a); - } - - public int getInteger() { - return this.intPayload.remove(0); - } - - public float getFloat() { - return this.floatPayload.remove(0); - } - - public String getString() { - return this.stringPayload.remove(0); - } - - public void append(final MachinePayload other) { - if (other == null) { - return; - } - this.intPayload.addAll(other.intPayload); - this.floatPayload.addAll(other.floatPayload); - this.stringPayload.addAll(other.stringPayload); - } - - public boolean isEmpty() { - return this.intPayload.isEmpty() && this.floatPayload.isEmpty() && this.stringPayload.isEmpty(); - } - - public int getID() { - return this.id; - } - - public void setID(final int readInt) { - this.id = readInt; - } -} diff --git a/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java b/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java index 722d600e..c3f188f1 100644 --- a/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java @@ -6,8 +6,4 @@ public class MessageContainerUpdate extends MessageCraftGUI { public MessageContainerUpdate(final NBTTagCompound nbt) { super(nbt); } - - public MessageContainerUpdate(final MessageBinnie message) { - super(message); - } } diff --git a/src/main/java/binnie/core/network/packet/MessageSyncTile.java b/src/main/java/binnie/core/network/packet/MessageSyncTile.java index 65637837..83fba72e 100644 --- a/src/main/java/binnie/core/network/packet/MessageSyncTile.java +++ b/src/main/java/binnie/core/network/packet/MessageSyncTile.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; import io.netty.buffer.ByteBuf; -public class MessageSyncTile extends MessageNBT implements IPacketLocation { +public class MessageSyncTile extends MessageNBT { private int posX; private int posY; private int posZ; @@ -43,23 +43,19 @@ public class MessageSyncTile extends MessageNBT implements IPacketLocation { super.readData(data); } - @Override @Nullable public TileEntity getTarget(final World world) { return world.getTileEntity(new BlockPos(this.posX, this.posY, this.posZ)); } - @Override public int getX() { return this.posX; } - @Override public int getY() { return this.posY; } - @Override public int getZ() { return this.posZ; } diff --git a/src/main/java/binnie/core/network/packet/MessageUpdate.java b/src/main/java/binnie/core/network/packet/MessageUpdate.java index d1e92e90..2d077532 100644 --- a/src/main/java/binnie/core/network/packet/MessageUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageUpdate.java @@ -4,7 +4,6 @@ import javax.annotation.Nullable; import java.io.IOException; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import binnie.core.network.INetworkedEntity; import io.netty.buffer.ByteBuf; @@ -31,16 +30,16 @@ public class MessageUpdate extends MessageCoordinates { data.writeInt(0); return; } - data.writeInt(this.payload.intPayload.size()); - data.writeInt(this.payload.floatPayload.size()); - data.writeInt(this.payload.stringPayload.size()); - for (final int intData : this.payload.intPayload) { + data.writeInt(this.payload.getIntPayload().size()); + data.writeInt(this.payload.getFloatPayload().size()); + data.writeInt(this.payload.getStringPayload().size()); + for (final int intData : this.payload.getIntPayload()) { data.writeInt(intData); } - for (final float floatData : this.payload.floatPayload) { + for (final float floatData : this.payload.getFloatPayload()) { data.writeFloat(floatData); } - for (final String stringData : this.payload.stringPayload) { + for (final String stringData : this.payload.getStringPayload()) { final byte[] bytes = stringData.getBytes("UTF-8"); data.writeShort(bytes.length); data.writeBytes(bytes); @@ -54,9 +53,9 @@ public class MessageUpdate extends MessageCoordinates { final int intLength = data.readInt(); final int floatLength = data.readInt(); final int stringLength = data.readInt(); - this.payload.intPayload.clear(); - this.payload.floatPayload.clear(); - this.payload.stringPayload.clear(); + this.payload.getIntPayload().clear(); + this.payload.getFloatPayload().clear(); + this.payload.getStringPayload().clear(); for (int i = 0; i < intLength; ++i) { this.payload.addInteger(data.readInt()); } @@ -69,9 +68,4 @@ public class MessageUpdate extends MessageCoordinates { this.payload.addString(new String(string, "UTF-8")); } } - - @Nullable - public TileEntity getTarget(final World world) { - return world.getTileEntity(getCoordinates()); - } } diff --git a/src/main/java/binnie/core/network/packet/PacketMetadata.java b/src/main/java/binnie/core/network/packet/PacketMetadata.java deleted file mode 100644 index ddee7bf4..00000000 --- a/src/main/java/binnie/core/network/packet/PacketMetadata.java +++ /dev/null @@ -1,34 +0,0 @@ -package binnie.core.network.packet; - -import java.io.IOException; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.PacketBuffer; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.util.math.BlockPos; - -public class PacketMetadata extends SPacketUpdateTileEntity { - - public int metadata; - - public PacketMetadata(BlockPos blockPos, int metadata, NBTTagCompound compound) { - super(blockPos, 0, compound); - this.metadata = metadata; - } - - @Override - public void writePacketData(PacketBuffer buf) throws IOException { - super.writePacketData(buf); - buf.writeInt(metadata); - } - - @Override - public void readPacketData(PacketBuffer buf) throws IOException { - super.readPacketData(buf); - metadata = buf.readInt(); - } - - public int getMetadata() { - return metadata; - } -} diff --git a/src/main/java/binnie/core/network/packet/PacketPayload.java b/src/main/java/binnie/core/network/packet/PacketPayload.java index bc594194..58b689f0 100644 --- a/src/main/java/binnie/core/network/packet/PacketPayload.java +++ b/src/main/java/binnie/core/network/packet/PacketPayload.java @@ -3,12 +3,10 @@ package binnie.core.network.packet; import java.util.ArrayList; import java.util.List; -import binnie.core.network.INetworkedEntity; - public class PacketPayload { - public List intPayload; - public List floatPayload; - public List stringPayload; + private List intPayload; + private List floatPayload; + private List stringPayload; public PacketPayload() { this.intPayload = new ArrayList<>(); @@ -19,11 +17,6 @@ public class PacketPayload { this.stringPayload.clear(); } - public PacketPayload(final INetworkedEntity tile) { - this(); - tile.writeToPacket(this); - } - public void addInteger(final int a) { this.intPayload.add(a); } @@ -36,28 +29,15 @@ public class PacketPayload { this.stringPayload.add(a); } - public int getInteger() { - return this.intPayload.remove(0); + public List getIntPayload() { + return intPayload; } - public float getFloat() { - return this.floatPayload.remove(0); + public List getFloatPayload() { + return floatPayload; } - public String getString() { - return this.stringPayload.remove(0); - } - - public void append(final PacketPayload other) { - if (other == null) { - return; - } - this.intPayload.addAll(other.intPayload); - this.floatPayload.addAll(other.floatPayload); - this.stringPayload.addAll(other.stringPayload); - } - - public boolean isEmpty() { - return this.intPayload.isEmpty() && this.floatPayload.isEmpty() && this.stringPayload.isEmpty(); + public List getStringPayload() { + return stringPayload; } } diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index e7edb797..c5d90d47 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -14,9 +14,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import forestry.core.models.BlockModelEntry; -import forestry.core.models.ModelEntry; - import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; @@ -91,21 +88,10 @@ public class BinnieModProxy implements IBinnieModProxy { this.getMod().getNetworkWrapper().sendToServer(packet.GetMessage()); } - public void registerModel(Item item, int meta) { - - } - public void registerModel(Item item, int meta, ModelResourceLocation modelResourceLocation) { } - public void registerBlockModel(final BlockModelEntry index) { - } - - public void registerModel(ModelEntry index) { - } - - /*@Override public IIcon getIcon(final IIconRegister register, final String string) { return BinnieCore.proxy.getIcon(register, this.mod.getModID(), string); diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index b803ae06..9e7b0f91 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -49,11 +49,6 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { return false; } - /*@Override - public int getUniqueRenderID() { - return RenderingRegistry.getNextAvailableRenderId(); - }*/ - @Override public void openGui(final AbstractMod mod, final int id, final EntityPlayer player, final BlockPos pos) { player.openGui(mod.getMod(), id, player.world, pos.getX(), pos.getY(), pos.getZ()); @@ -64,10 +59,6 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { return true; } - /*@Override - public void registerCustomItemRenderer(final Item item, final IItemRenderer itemRenderer) { - }*/ - public TextureAtlasSprite getTextureAtlasSprite(ResourceLocation location) { throw new UnsupportedOperationException("Cannot call getTextureAtlasSprite on server side"); } diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 633e38a3..39a8e657 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -71,11 +71,6 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy Minecraft.getMinecraft().getTextureMapBlocks().registerSprite(location); } - @Override - public void registerModel(Item item, int meta) { - registerModel(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory")); - } - @Override public void registerModel(Item item, int meta, ModelResourceLocation modelResourceLocation) { ModelLoader.setCustomModelResourceLocation(item, meta, modelResourceLocation); @@ -107,11 +102,6 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy return !world.isRemote; } - /*@Override - public void registerCustomItemRenderer(final Item item, final IItemRenderer itemRenderer) { - MinecraftForgeClient.registerItemRenderer(item, itemRenderer); - }*/ - @Override public World getWorld() { return this.getMinecraftInstance().world; @@ -157,11 +147,6 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy public void createPipe(final Item pipe) { } - /*@Override - public IIcon getIcon(final IIconRegister register, final String mod, final String name) { - return register.registerIcon(mod + ":" + name); - }*/ - @Override public TextureAtlasSprite getTextureAtlasSprite(ResourceLocation location) { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); @@ -172,12 +157,6 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy return Minecraft.getMinecraft().player; } - /*public void handlePreTextureRefresh(final IIconRegister register, final int type) { - if (type == 0) { - Binnie.Liquid.reloadIcons(register); - } - }*/ - @Override public void preInit() { final IResourceManager manager = Minecraft.getMinecraft().getResourceManager(); diff --git a/src/main/java/binnie/core/proxy/IBinnieModProxy.java b/src/main/java/binnie/core/proxy/IBinnieModProxy.java index f97bddd3..ee0f8e84 100644 --- a/src/main/java/binnie/core/proxy/IBinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieModProxy.java @@ -14,6 +14,4 @@ public interface IBinnieModProxy extends IProxyCore { void sendToPlayer(final MessageBase p0, final EntityPlayer p1); void sendToServer(final MessageBase p0); - - //IIcon getIcon(final IIconRegister p0, final String p1); } diff --git a/src/main/java/binnie/core/resource/BinnieResource.java b/src/main/java/binnie/core/resource/BinnieResource.java index 2ca26b07..94508d6d 100644 --- a/src/main/java/binnie/core/resource/BinnieResource.java +++ b/src/main/java/binnie/core/resource/BinnieResource.java @@ -19,15 +19,7 @@ public class BinnieResource { this.path = path; } - /*public String getFullPath() { - return "/assets/" + this.mod + "/textures/" + this.type.toString() + "/" + this.path; - }*/ - public ResourceLocation getResourceLocation() { return this.path.endsWith(".png") ? new ResourceLocation(this.mod, "textures/" + this.type.toString() + "/" + this.path) : new ResourceLocation(this.mod, this.type.toString() + "/" + this.path); } - - public String getShortPath() { - return "textures/" + this.type.toString() + "/" + this.path; - } } diff --git a/src/main/java/binnie/core/texture/TextureManager.java b/src/main/java/binnie/core/texture/TextureManager.java deleted file mode 100644 index 446db34c..00000000 --- a/src/main/java/binnie/core/texture/TextureManager.java +++ /dev/null @@ -1,16 +0,0 @@ -package binnie.core.texture; - -import javax.swing.*; -import java.util.ArrayList; -import java.util.List; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class TextureManager { - static List textures = new ArrayList<>(); - - public static void init() { - } -} diff --git a/src/main/java/binnie/core/util/TileUtil.java b/src/main/java/binnie/core/util/TileUtil.java index 61ec7375..1258067c 100644 --- a/src/main/java/binnie/core/util/TileUtil.java +++ b/src/main/java/binnie/core/util/TileUtil.java @@ -5,23 +5,15 @@ import javax.annotation.Nullable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.capabilities.Capability; public class TileUtil { @Nullable public static T getTile(IBlockAccess world, BlockPos pos, Class tileClass) { - TileEntity tileEntity; - if (world instanceof ChunkCache) { - ChunkCache chunkCache = (ChunkCache) world; - tileEntity = chunkCache.getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK); - } else { - tileEntity = world.getTileEntity(pos); - } + TileEntity tileEntity = world.getTileEntity(pos); if (tileClass.isInstance(tileEntity)) { return tileClass.cast(tileEntity); } else { diff --git a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java b/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java index 7f646539..7eb54312 100644 --- a/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java +++ b/src/main/java/binnie/extrabees/alveary/TileEntityExtraBeesAlvearyPart.java @@ -3,8 +3,6 @@ package binnie.extrabees.alveary; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Collection; -import java.util.Set; -import java.util.stream.Collectors; import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.inventory.GuiContainer; @@ -60,11 +58,6 @@ public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry return alvearyLogic.hasGui(); } - @Nonnull - public AbstractAlvearyLogic getAlvearyLogic() { - return alvearyLogic; - } - @Override public void readFromNBT(NBTTagCompound data) { type = EnumAlvearyLogicType.VALUES[data.getByte("avType")]; @@ -152,8 +145,4 @@ public class TileEntityExtraBeesAlvearyPart extends MultiblockTileEntityForestry public Collection getConnectedComponents() { return getMultiblockLogic().getController().getComponents(); } - - public Set getExtraBeesParts() { - return getConnectedComponents().stream().filter(p -> p instanceof TileEntityExtraBeesAlvearyPart).map(p -> (TileEntityExtraBeesAlvearyPart) p).collect(Collectors.toSet()); - } } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index 59f125ec..9d6b612b 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -191,11 +191,6 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers { return this.getUID(); } - /*@Override - public Set getFlowers() { - return new HashSet(); - }*/ - @Override public boolean isAcceptedPollinatable(World world, ICheckPollinatable pollinatable) { return pollinatable.getPlantType() != EnumPlantType.Nether; diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index d5e020bd..d2c68ffd 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -404,7 +404,6 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { private String fx; private boolean combinable; private boolean dominant; - private int id; private String uid; ExtraBeesEffect() { @@ -551,10 +550,6 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return storedData; } - public String getFX() { - return this.fx; - } - private void setFX(String string) { this.fx = "particles/" + string; } diff --git a/src/main/java/binnie/extrabees/items/ItemBlockAlveary.java b/src/main/java/binnie/extrabees/items/ItemBlockAlveary.java index 11cb8425..2752f788 100644 --- a/src/main/java/binnie/extrabees/items/ItemBlockAlveary.java +++ b/src/main/java/binnie/extrabees/items/ItemBlockAlveary.java @@ -1,21 +1,3 @@ -/* - * Minecraft Forge - * Copyright (c) 2016. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ package binnie.extrabees.items; import net.minecraft.block.Block; diff --git a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java index 1d92fe4b..76e5d437 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java @@ -105,10 +105,6 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { } } - public int getIconIndex() { - return 55 + this.ordinal(); - } - public int getMaxDamage() { return maxDamage; } diff --git a/src/main/java/binnie/extrabees/utils/Utils.java b/src/main/java/binnie/extrabees/utils/Utils.java index 773ef991..6573ce87 100644 --- a/src/main/java/binnie/extrabees/utils/Utils.java +++ b/src/main/java/binnie/extrabees/utils/Utils.java @@ -8,7 +8,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; @@ -53,16 +52,6 @@ public class Utils { return ForgeRegistries.ITEMS.containsKey(key) ? ForgeRegistries.ITEMS.getValue(key) : null; } - @Nullable - public static T getTile(IBlockAccess world, BlockPos pos, Class tileClass) { - TileEntity tileEntity = world.getTileEntity(pos); - if (tileClass.isInstance(tileEntity)) { - return tileClass.cast(tileEntity); - } else { - return null; - } - } - @Nullable public static T getCapability(World world, BlockPos pos, Capability capability, EnumFacing facing) { TileEntity tileEntity = world.getTileEntity(pos); diff --git a/src/main/java/binnie/extratrees/alcohol/drink/IAlcoholic.java b/src/main/java/binnie/extratrees/alcohol/drink/IAlcoholic.java deleted file mode 100644 index 8cea8ef2..00000000 --- a/src/main/java/binnie/extratrees/alcohol/drink/IAlcoholic.java +++ /dev/null @@ -1,5 +0,0 @@ -package binnie.extratrees.alcohol.drink; - -public interface IAlcoholic { - float getABV(); -} diff --git a/src/main/java/binnie/extratrees/api/ICarpentryInterface.java b/src/main/java/binnie/extratrees/api/ICarpentryInterface.java index 8ae911f2..2ccf0cb9 100644 --- a/src/main/java/binnie/extratrees/api/ICarpentryInterface.java +++ b/src/main/java/binnie/extratrees/api/ICarpentryInterface.java @@ -19,15 +19,11 @@ public interface ICarpentryInterface { IDesign getDesign(final int p0); - ILayout getLayout(final IPattern p0, final boolean p1); - @Nullable IDesignMaterial getWoodMaterial(final ItemStack stack); boolean registerDesignCategory(final IDesignCategory p0); - IDesignCategory getDesignCategory(final String p0); - Collection getAllDesignCategories(); List getSortedDesigns(); diff --git a/src/main/java/binnie/extratrees/block/IWoodKind.java b/src/main/java/binnie/extratrees/block/IWoodKind.java deleted file mode 100644 index dfa6a583..00000000 --- a/src/main/java/binnie/extratrees/block/IWoodKind.java +++ /dev/null @@ -1,13 +0,0 @@ -package binnie.extratrees.block; - -import net.minecraft.block.properties.PropertyEnum; - -import forestry.api.arboriculture.WoodBlockKind; - -public interface IWoodKind { - PropertyEnum getVariant(); - - EnumETLog getWoodType(int meta); - - WoodBlockKind getWoodKind(); -} diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index df6b7e98..2238ce04 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -250,16 +250,6 @@ public class PlankType { public ItemStack getStack(boolean fireproof) { return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof); } - - /*@Override - public IIcon getIcon() { - if (this.getStack() != null) { - final int meta = this.getStack().getItemDamage(); - final Block block = Blocks.planks; - return block.getIcon(2, meta); - } - return null; - }*/ } public enum ForestryPlanks implements IPlankType, IFenceProvider { @@ -350,16 +340,6 @@ public class PlankType { return getStack(true); } - /*@Override - public IIcon getIcon() { - if (this.getStack() != null) { - final int meta = this.getStack().getItemDamage(); - final Block block = ((ItemBlock) this.getStack().getItem()).field_150939_a; - return block.getIcon(2, meta); - } - return null; - }*/ - @Override public ItemStack getFence() { return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.FENCE, false); diff --git a/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java b/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java deleted file mode 100644 index b1ec2016..00000000 --- a/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java +++ /dev/null @@ -1,265 +0,0 @@ -package binnie.extratrees.block.decor; - -public class FenceRenderer //implements ISimpleBlockRenderingHandler -{ - /*public static int layer; - - @Override - public void renderInventoryBlock(final Block block, final int metadata, final int modelID, final RenderBlocks renderer) { - final Tessellator tess = Tessellator.instance; - for (int i = 0; i < 5; ++i) { - final float thickness = 0.125f; - FenceRenderer.layer = 0; - if (i == 0) { - block.setBlockBounds(0.5f - thickness, 0.0f, 0.0f, 0.5f + thickness, 1.0f, thickness * 2.0f); - } - if (i == 1) { - block.setBlockBounds(0.5f - thickness, 0.0f, 1.0f - thickness * 2.0f, 0.5f + thickness, 1.0f, 1.0f); - } - final float s = 0.0625f; - final FenceType fenceType = (block == ExtraTrees.blockMultiFence) ? WoodManager.getFenceType(metadata) : new FenceType(0); - final boolean bottomBar = !fenceType.solid; - float topBarMaxY = 1.0f - s; - float topBarMinY = 1.0f - s * 3.0f; - float bottomBarMaxY = 0.5f - s; - float bottomBarMinY = 0.5f - s * 3.0f; - if (fenceType.size == 2) { - bottomBarMinY -= 4.0f * s; - bottomBarMaxY -= 4.0f * s; - topBarMinY -= 4.0f * s; - topBarMaxY -= 4.0f * s; - } - if (fenceType.size == 1) { - bottomBarMinY -= 4.0f * s; - bottomBarMaxY -= 4.0f * s; - } - if (fenceType.solid) { - topBarMinY = bottomBarMinY; - } - float minX = 0.5f - s; - float maxX = 0.5f + s; - float minZ = -s * 2.0f; - float maxZ = 1.0f + s * 2.0f; - if (i == 2) { - block.setBlockBounds(minX, topBarMinY, minZ, maxX, topBarMaxY, maxZ); - FenceRenderer.layer = 1; - } - if (i == 3) { - if (!bottomBar) { - continue; - } - block.setBlockBounds(minX, bottomBarMinY, minZ, maxX, bottomBarMaxY, maxZ); - FenceRenderer.layer = 1; - } - if (i == 4) { - if (fenceType.embossed) { - minX -= s * 0.9f; - maxX += s * 0.9f; - minZ -= s; - maxZ += s; - float minY = 0.0f; - float maxY = 1.0f; - if (fenceType.size != 1 && !fenceType.solid) { - minY = bottomBarMinY + 2.0f * s; - maxY = topBarMaxY - 2.0f * s; - } - else if (fenceType.size == 1 && fenceType.solid) { - minY = bottomBarMinY + 2.0f * s; - maxY = topBarMaxY - 2.0f * s; - } - else { - minY = 0.5f - 2.0f * s; - maxY = 0.5f + 2.0f * s; - } - if (fenceType.solid && fenceType.size == 0) { - minY -= s; - maxY -= s; - } - if (fenceType.solid && fenceType.size == 2) { - minY += s; - maxY += s; - } - block.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ); - FenceRenderer.layer = 0; - } - else { - if (fenceType.size != 1 || fenceType.solid) { - continue; - } - block.setBlockBounds(minX, 0.5f - s, minZ, maxX, 0.5f + s, maxZ); - FenceRenderer.layer = 1; - } - } - renderer.setRenderBoundsFromBlock(block); - GlStateManager.translate(-0.5f, -0.5f, -0.5f); - tess.startDrawingQuads(); - tess.setNormal(0.0f, -1.0f, 0.0f); - renderer.renderFaceYNeg(block, 0.0, 0.0, 0.0, block.getIcon(0, metadata)); - tess.draw(); - tess.startDrawingQuads(); - tess.setNormal(0.0f, 1.0f, 0.0f); - renderer.renderFaceYPos(block, 0.0, 0.0, 0.0, block.getIcon(1, metadata)); - tess.draw(); - tess.startDrawingQuads(); - tess.setNormal(0.0f, 0.0f, -1.0f); - renderer.renderFaceXPos(block, 0.0, 0.0, 0.0, block.getIcon(2, metadata)); - tess.draw(); - tess.startDrawingQuads(); - tess.setNormal(0.0f, 0.0f, 1.0f); - renderer.renderFaceXNeg(block, 0.0, 0.0, 0.0, block.getIcon(3, metadata)); - tess.draw(); - tess.startDrawingQuads(); - tess.setNormal(-1.0f, 0.0f, 0.0f); - renderer.renderFaceZNeg(block, 0.0, 0.0, 0.0, block.getIcon(4, metadata)); - tess.draw(); - tess.startDrawingQuads(); - tess.setNormal(1.0f, 0.0f, 0.0f); - renderer.renderFaceZPos(block, 0.0, 0.0, 0.0, block.getIcon(5, metadata)); - tess.draw(); - GlStateManager.translate(0.5f, 0.5f, 0.5f); - } - block.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f); - renderer.setRenderBoundsFromBlock(block); - } - - @Override - public boolean renderWorldBlock(final IBlockAccess world, final int par2, final int par3, final int par4, final Block block, final int modelId, final RenderBlocks renderer) { - FenceRenderer.layer = 0; - final BlockFence blockFence = (BlockFence) block; - final float i = 0.0625f; - FenceType fenceType = new FenceType(0); - final TileEntity tile = world.getTileEntity(par2, par3, par4); - if (tile != null && tile instanceof TileEntityMetadata && block instanceof BlockMultiFence) { - fenceType = WoodManager.getFenceType(((TileEntityMetadata) tile).getTileMetadata()); - } - boolean rendered = false; - final float postWidth = 0.25f; - final float postHeight = 1.0f; - float minPostPos = 0.5f - postWidth / 2.0f; - float maxPostPos = 0.5f + postWidth / 2.0f; - renderer.setRenderBounds(minPostPos, 0.0, minPostPos, maxPostPos, postHeight, maxPostPos); - renderer.renderStandardBlock(block, par2, par3, par4); - rendered = true; - boolean connectAnyX = false; - boolean connectAnyZ = false; - if (blockFence.canConnectFenceTo(renderer.blockAccess, par2 - 1, par3, par4) || blockFence.canConnectFenceTo(renderer.blockAccess, par2 + 1, par3, par4)) { - connectAnyX = true; - } - if (blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 - 1) || blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 + 1)) { - connectAnyZ = true; - } - final boolean connectNegX = blockFence.canConnectFenceTo(renderer.blockAccess, par2 - 1, par3, par4); - final boolean connectPosX = blockFence.canConnectFenceTo(renderer.blockAccess, par2 + 1, par3, par4); - final boolean connectNegZ = blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 - 1); - final boolean connectPosZ = blockFence.canConnectFenceTo(renderer.blockAccess, par2, par3, par4 + 1); - if (!connectAnyX && !connectAnyZ) { - connectAnyX = true; - } - minPostPos = 7.0f * i; - maxPostPos = 9.0f * i; - float barMinY = 12.0f * i; - float barMaxY = 15.0f * i; - final float minX = connectNegX ? 0.0f : minPostPos; - final float maxX = connectPosX ? 1.0f : maxPostPos; - final float minZ = connectNegZ ? 0.0f : minPostPos; - final float maxZ = connectPosZ ? 1.0f : maxPostPos; - boolean renderBottom = true; - if (fenceType.size == 2) { - barMaxY -= 5.0f * i; - barMinY -= 5.0f * i; - } - if (fenceType.solid) { - renderBottom = false; - if (fenceType.size == 0) { - barMinY = 6.0f * i; - } - else { - barMinY = i; - } - } - final float totalMaxY = barMaxY; - FenceRenderer.layer = 1; - if (connectAnyX) { - renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos); - renderer.renderStandardBlock(blockFence, par2, par3, par4); - rendered = true; - } - if (connectAnyZ) { - renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ); - renderer.renderStandardBlock(blockFence, par2, par3, par4); - rendered = true; - } - if (renderBottom) { - barMinY -= 6.0f * i; - barMaxY -= 6.0f * i; - if (fenceType.size == 1) { - barMinY += i; - } - if (connectAnyX) { - renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos); - renderer.renderStandardBlock(blockFence, par2, par3, par4); - rendered = true; - } - if (connectAnyZ) { - renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ); - renderer.renderStandardBlock(blockFence, par2, par3, par4); - rendered = true; - } - } - if (renderBottom && fenceType.size == 1) { - barMinY -= 6.0f * i; - barMaxY -= 6.0f * i; - barMaxY += i; - if (connectAnyX) { - renderer.setRenderBounds(minX, barMinY, minPostPos, maxX, barMaxY, maxPostPos); - renderer.renderStandardBlock(blockFence, par2, par3, par4); - rendered = true; - } - if (connectAnyZ) { - renderer.setRenderBounds(minPostPos, barMinY, minZ, maxPostPos, barMaxY, maxZ); - renderer.renderStandardBlock(blockFence, par2, par3, par4); - rendered = true; - } - } - final float totalMinY = barMinY; - FenceRenderer.layer = 0; - if (fenceType.embossed) { - minPostPos -= (float) (i - 0.25 * i); - maxPostPos += (float) (i - 0.25 * i); - float minY = totalMinY + 2.0f * i; - float maxY = totalMaxY - 2.0f * i; - if (fenceType.size == 1 && !fenceType.solid) { - minY = 6.0f * i; - maxY = 10.0f * i; - } - else if (fenceType.size == 0 && fenceType.solid) { - minY -= 4.0f * i; - maxY -= 4.0f * i; - } - else if (fenceType.size == 2 && fenceType.solid) { - minY += 4.0f * i; - maxY += 4.0f * i; - } - if (connectAnyX) { - renderer.setRenderBounds(minX, minY, minPostPos, maxX, maxY, maxPostPos); - renderer.renderStandardBlock(block, par2, par3, par4); - } - if (connectAnyZ) { - renderer.setRenderBounds(minPostPos, minY, minZ, maxPostPos, maxY, maxZ); - renderer.renderStandardBlock(block, par2, par3, par4); - } - } - blockFence.setBlockBoundsBasedOnState(renderer.blockAccess, par2, par3, par4); - return rendered; - } - - @Override - public boolean shouldRender3DInInventory(final int i) { - return true; - } - - @Override - public int getRenderId() { - return ExtraTrees.fenceID; - }*/ -} diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java index 6d521939..af5aab57 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java @@ -12,8 +12,6 @@ import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; public abstract class BlockETPlank extends BlockForestryPlanks { - public static final String BLOCK_NAME = "plank"; - private BlockETPlank(boolean fireproof, int blockNumber) { super(fireproof, blockNumber); String name = "planks."; diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index 518cbaa3..0f527624 100644 --- a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -14,8 +14,6 @@ import binnie.extratrees.api.ICarpentryInterface; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignCategory; import binnie.extratrees.api.IDesignMaterial; -import binnie.extratrees.api.ILayout; -import binnie.extratrees.api.IPattern; public class CarpentryInterface implements ICarpentryInterface { static Map woodMap = new LinkedHashMap<>(); @@ -62,21 +60,11 @@ public class CarpentryInterface implements ICarpentryInterface { return CarpentryInterface.designMap.get(index); } - @Override - public ILayout getLayout(final IPattern pattern, final boolean inverted) { - return Layout.get(pattern, inverted); - } - @Override public boolean registerDesignCategory(final IDesignCategory category) { return CarpentryInterface.designCategories.put(category.getId(), category) == null; } - @Override - public IDesignCategory getDesignCategory(final String id) { - return CarpentryInterface.designCategories.get(id); - } - @Override public Collection getAllDesignCategories() { final List categories = new ArrayList<>(); diff --git a/src/main/java/binnie/extratrees/carpentry/Layout.java b/src/main/java/binnie/extratrees/carpentry/Layout.java index 3ec84e55..d6ae7d0a 100644 --- a/src/main/java/binnie/extratrees/carpentry/Layout.java +++ b/src/main/java/binnie/extratrees/carpentry/Layout.java @@ -18,10 +18,6 @@ public class Layout implements ILayout { this.inverted = inverted; } - private Layout(final IPattern pattern) { - this(pattern, false); - } - public static ILayout get(final IPattern pattern, final boolean inverted) { return new Layout(pattern, inverted); } diff --git a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java index e0031198..376af390 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenWalnut.java @@ -12,6 +12,7 @@ import forestry.arboriculture.worldgen.WorldGenTree; import forestry.core.worldgen.WorldGenHelper; public class WorldGenWalnut { + // TODO: unused? public static class BlackWalnut extends WorldGenTree { public BlackWalnut(ITreeGenData tree) { super(tree, 9, 6); diff --git a/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java index d2c9a057..ebb3ac26 100644 --- a/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java @@ -47,14 +47,14 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { @Override @SideOnly(Side.CLIENT) protected void addTabs() { - new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.overview", 0)); - new PageSpeciesTreeGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.genome", 0)); - new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.classification", 0)); - new PageSpeciesResultant(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.resultant", 0)); - new PageSpeciesMutations(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.further", 0)); - new PageBranchOverview(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(ExtraTrees.instance, "branches.overview", 0)); - new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(ExtraTrees.instance, "branches.species", 0)); - new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(ExtraTrees.instance, "breeder", 0)); + new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.overview")); + new PageSpeciesTreeGenome(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.genome")); + new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.classification")); + new PageSpeciesResultant(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.resultant")); + new PageSpeciesMutations(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "species.further")); + new PageBranchOverview(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(ExtraTrees.instance, "branches.overview")); + new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(ExtraTrees.instance, "branches.species")); + new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(ExtraTrees.instance, "breeder")); this.createMode(TreeMode.FRUIT, new ModeWidgets(TreeMode.FRUIT, this) { @Override public void createListBox(final Area area) { @@ -97,11 +97,11 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { this.listBox = controlListBox; } }); - new PageFruit(this.getInfoPages(TreeMode.FRUIT), new DatabaseTab(ExtraTrees.instance, "fruit.natural", 0), true); - new PageFruit(this.getInfoPages(TreeMode.FRUIT), new DatabaseTab(ExtraTrees.instance, "fruit.potential", 0), false); - new PageWood(this.getInfoPages(TreeMode.WOOD), new DatabaseTab(ExtraTrees.instance, "wood.natural", 0)); - new PagePlanksOverview(this.getInfoPages(TreeMode.PLANKS), new DatabaseTab(ExtraTrees.instance, "planks.overview", 0)); - new PagePlanksTrees(this.getInfoPages(TreeMode.PLANKS), new DatabaseTab(ExtraTrees.instance, "planks.natural", 1)); + new PageFruit(this.getInfoPages(TreeMode.FRUIT), new DatabaseTab(ExtraTrees.instance, "fruit.natural"), true); + new PageFruit(this.getInfoPages(TreeMode.FRUIT), new DatabaseTab(ExtraTrees.instance, "fruit.potential"), false); + new PageWood(this.getInfoPages(TreeMode.WOOD), new DatabaseTab(ExtraTrees.instance, "wood.natural")); + new PagePlanksOverview(this.getInfoPages(TreeMode.PLANKS), new DatabaseTab(ExtraTrees.instance, "planks.overview")); + new PagePlanksTrees(this.getInfoPages(TreeMode.PLANKS), new DatabaseTab(ExtraTrees.instance, "planks.natural")); } @Override diff --git a/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java index 593b5455..568bb326 100644 --- a/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java @@ -31,14 +31,14 @@ public class WindowLepidopteristDatabase extends WindowAbstractDatabase { @Override @SideOnly(Side.CLIENT) protected void addTabs() { - new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.overview", 0)); - new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.classification", 0)); - new PageSpeciesImage(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.specimen", 0)); - new PageSpeciesResultant(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.resultant", 0)); - new PageSpeciesMutations(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.further", 0)); - new PageBranchOverview(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.overview", 0)); - new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.species", 0)); - new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(ExtraTrees.instance, "butterfly.breeder", 0)); + new PageSpeciesOverview(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.overview")); + new PageSpeciesClassification(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.classification")); + new PageSpeciesImage(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.specimen")); + new PageSpeciesResultant(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.resultant")); + new PageSpeciesMutations(this.getInfoPages(Mode.SPECIES), new DatabaseTab(ExtraTrees.instance, "butterfly.species.further")); + new PageBranchOverview(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.overview")); + new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.species")); + new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(ExtraTrees.instance, "butterfly.breeder")); } @Override diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index 24994864..55398de5 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -88,10 +88,6 @@ public enum Food implements IItemMiscProvider { int hunger; private List ores; - Food() { - this(0); - } - Food(final int hunger) { this.ores = new ArrayList<>(); this.hunger = hunger; diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java deleted file mode 100644 index 1dc8ed15..00000000 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropdownButton.java +++ /dev/null @@ -1,24 +0,0 @@ -package binnie.extratrees.kitchen.craftgui; - -import binnie.core.gui.IWidget; -import binnie.core.gui.controls.button.ControlButton; -import binnie.core.gui.events.EventMouse; -import binnie.core.gui.minecraft.Window; - -public abstract class ControlDropdownButton extends ControlButton { - public ControlDropdownButton(final IWidget parent, final int x, final int y, final int width, final int height, final String text) { - super(parent, x, y, width, height, text); - this.addSelfEventHandler(EventMouse.Down.class, event -> { - ControlDropDownMenu menu = ControlDropdownButton.this.getWidget(ControlDropDownMenu.class); - ControlDropdownButton.this.deleteChild(ControlDropdownButton.this.getWidget(ControlDropDownMenu.class)); - if (ControlDropdownButton.this.getWidget(ControlDropDownMenu.class) == null) { - menu = ControlDropdownButton.this.createDropDownMenu(); - Window.get(ControlDropdownButton.this.getWidget()).setFocusedWidget(menu); - } else { - ControlDropdownButton.this.deleteChild(ControlDropdownButton.this.getWidget(ControlDropDownMenu.class)); - } - }); - } - - public abstract ControlDropDownMenu createDropDownMenu(); -} diff --git a/src/main/java/binnie/extratrees/machines/DummyManagers.java b/src/main/java/binnie/extratrees/machines/DummyManagers.java index 3ef3b4ed..cc888496 100644 --- a/src/main/java/binnie/extratrees/machines/DummyManagers.java +++ b/src/main/java/binnie/extratrees/machines/DummyManagers.java @@ -37,18 +37,6 @@ public class DummyManagers { public Set recipes() { return ImmutableSet.of(); } - - @Nullable - @Override - public String getJEICategory() { - return null; - } - - @Nullable - @Override - public Object getJeiWrapper(T recipe) { - return null; - } } public static class DummyBreweryManager extends DummyCraftingManager implements IBreweryManager { diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java b/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java index 866d091a..ef6a333e 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreesErrorCode.java @@ -31,10 +31,6 @@ public enum ExtraTreesErrorCode implements IErrorStateDefinition { this(name, null, EnumErrorType.NONE); } - ExtraTreesErrorCode(String name, EnumErrorType type) { - this(name, null, type); - } - ExtraTreesErrorCode(String name, IErrorStateDefinition parent) { this(name, parent, EnumErrorType.NONE); } diff --git a/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java b/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java index 72c8cf8c..0288533c 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java +++ b/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java @@ -9,12 +9,10 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Optional; import binnie.extratrees.api.recipes.IBreweryManager; import binnie.extratrees.api.recipes.IBreweryRecipe; -import binnie.extratrees.integration.jei.RecipeUids; import binnie.extratrees.integration.jei.brewery.BreweryRecipeWrapper; import binnie.extratrees.item.ExtraTreeItems; @@ -153,20 +151,6 @@ public class BreweryRecipeManager implements IBreweryManager { return "Brewery"; } - @Override - public String getJEICategory() { - return RecipeUids.BREWING; - } - - @Nullable - @Override - public Object getJeiWrapper(IBreweryRecipe recipe) { - if(!Loader.isModLoaded("jei")){ - return null; - } - return getWrapper(recipe); - } - @Optional.Method(modid = "jei") private Object getWrapper(IBreweryRecipe recipe){ return new BreweryRecipeWrapper(recipe); diff --git a/src/main/java/binnie/extratrees/machines/brewery/window/DialogBreweryRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/window/DialogBreweryRecipe.java deleted file mode 100644 index b2f3d46f..00000000 --- a/src/main/java/binnie/extratrees/machines/brewery/window/DialogBreweryRecipe.java +++ /dev/null @@ -1,18 +0,0 @@ -package binnie.extratrees.machines.brewery.window; - -import binnie.core.gui.IWidget; -import binnie.core.gui.minecraft.Dialog; - -public class DialogBreweryRecipe extends Dialog { - public DialogBreweryRecipe(final IWidget parent, final int w, final int h) { - super(parent, w, h); - } - - @Override - public void initialise() { - } - - @Override - public void onClose() { - } -} diff --git a/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java b/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java index f68c33c4..a995dec9 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java +++ b/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java @@ -11,13 +11,8 @@ import java.util.Map; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.Optional; - import binnie.extratrees.api.recipes.IDistilleryManager; import binnie.extratrees.api.recipes.IDistilleryRecipe; -import binnie.extratrees.integration.jei.RecipeUids; -import binnie.extratrees.integration.jei.distillery.DistilleryRecipeWrapper; public class DistilleryRecipeManager implements IDistilleryManager { private static final int LEVELS = 3; @@ -93,23 +88,4 @@ public class DistilleryRecipeManager implements IDistilleryManager { public Collection recipes() { return recipeList; } - - @Override - public String getJEICategory() { - return RecipeUids.DISTILLING; - } - - @Nullable - @Override - public Object getJeiWrapper(IDistilleryRecipe recipe) { - if(!Loader.isModLoaded("jei")){ - return null; - } - return getWrapper(recipe); - } - - @Optional.Method(modid = "jei") - private Object getWrapper(IDistilleryRecipe recipe){ - return new DistilleryRecipeWrapper(recipe.getLevel(), recipe.getInput(), recipe.getOutput()); - } } diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java b/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java index b0bd95fe..b5625669 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java @@ -11,12 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.Optional; - import binnie.extratrees.api.recipes.IFruitPressManager; import binnie.extratrees.api.recipes.IFruitPressRecipe; -import binnie.extratrees.integration.jei.RecipeUids; public class FruitPressRecipeManager implements IFruitPressManager { //Map> @@ -65,23 +61,4 @@ public class FruitPressRecipeManager implements IFruitPressManager { public Collection recipes() { return recipes.values(); } - - @Override - public String getJEICategory() { - return RecipeUids.FRUIT_PRESS; - } - - @Nullable - @Override - public Object getJeiWrapper(IFruitPressRecipe recipe) { - if(!Loader.isModLoaded("jei")){ - return null; - } - return getWrapper(recipe); - } - - @Optional.Method(modid = "jei") - private Object getWrapper(IFruitPressRecipe recipe){ - return new FruitPressRecipe(recipe.getInput(), recipe.getOutput()); - } } diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java b/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java index ce52373d..1cf975ca 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/recipes/LumbermillRecipeManager.java @@ -3,7 +3,6 @@ package binnie.extratrees.machines.lumbermill.recipes; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import javax.annotation.Nullable; import java.util.Collection; import net.minecraft.entity.player.EntityPlayer; @@ -18,15 +17,10 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.Optional; - import binnie.core.util.FakeCraftingWorld; import binnie.core.util.OreDictionaryUtil; import binnie.extratrees.api.recipes.ILumbermillManager; import binnie.extratrees.api.recipes.ILumbermillRecipe; -import binnie.extratrees.integration.jei.RecipeUids; -import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeWrapper; public class LumbermillRecipeManager implements ILumbermillManager { //Map> @@ -115,25 +109,6 @@ public class LumbermillRecipeManager implements ILumbermillManager { return recipes.values(); } - @Override - public String getJEICategory() { - return RecipeUids.LUMBERMILL; - } - - @Nullable - @Override - public Object getJeiWrapper(ILumbermillRecipe recipe) { - if(!Loader.isModLoaded("jei")){ - return null; - } - return getWrapper(recipe); - } - - @Optional.Method(modid = "jei") - private Object getWrapper(ILumbermillRecipe recipe){ - return new LumbermillRecipeWrapper(recipe.getInput(), recipe.getOutput()); - } - private static class FakeCraftingHandler extends Container { @Override public void onCraftMatrixChanged(IInventory inventoryIn) { diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java b/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java index 6030e894..d0275a37 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java @@ -91,7 +91,6 @@ public class ControlLumbermillProgress extends ControlProgressBase { } //final IIcon icon2 = block2.getIcon(2, result.getItemDamage()); TextureAtlasSprite sprite = getWoodSprite(result); - final Point size = this.getSize(); final Point pos = this.getAbsolutePosition(); CraftGUI.RENDER.limitArea(new Area(pos.add(Point.ZERO), new Point(Math.round(this.progress * 64) + 2, 18)), guiWidth, guiHeight); GL11.glEnable(GL11.GL_SCISSOR_TEST); diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java b/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java index 2ba191f8..a54550bb 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/window/SlotValidatorLog.java @@ -2,15 +2,11 @@ package binnie.extratrees.machines.lumbermill.window; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.extratrees.machines.lumbermill.recipes.LumbermillRecipeManager; public class SlotValidatorLog extends SlotValidator { - private static final int logWoodId = OreDictionary.getOreID("logWood"); - public SlotValidatorLog() { super(SlotValidator.spriteBlock); } diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index 213748f7..3df171b6 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -14,7 +14,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.arboriculture.PluginArboriculture; import forestry.core.models.BlockModelEntry; -import forestry.core.models.ModelEntry; import binnie.Constants; import binnie.core.models.ModelManager; @@ -38,8 +37,7 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { //ForestryAPI.textureManager.registerIconProvider(FruitSprite.Average); } - @Override - public void registerBlockModel(final BlockModelEntry index) { + private static void registerBlockModel(final BlockModelEntry index) { ModelManager.registerCustomBlockModel(index); if (index.addStateMapper) { StateMapperBase ignoreState = new BlockModeStateMapper(index); @@ -47,11 +45,6 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { } } - @Override - public void registerModel(ModelEntry index) { - ModelManager.registerCustomModel(index); - } - @Override public void setCustomStateMapper(String name, Block block) { ModelLoader.setCustomStateMapper(block, new CustomMapper(name)); @@ -114,7 +107,7 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { } } - class BlockModeStateMapper extends StateMapperBase { + private static class BlockModeStateMapper extends StateMapperBase { private final BlockModelEntry index; public BlockModeStateMapper(BlockModelEntry index) { diff --git a/src/main/java/binnie/genetics/genetics/GeneProject.java b/src/main/java/binnie/genetics/genetics/GeneProject.java deleted file mode 100644 index 81bc45a2..00000000 --- a/src/main/java/binnie/genetics/genetics/GeneProject.java +++ /dev/null @@ -1,62 +0,0 @@ -package binnie.genetics.genetics; - -import java.util.ArrayList; -import java.util.List; - -import com.mojang.authlib.GameProfile; - -public class GeneProject { - private int id; - private String name; - private GameProfile leader; - private List members; - - public GeneProject(int id, String name, GameProfile leader) { - this.id = 0; - this.leader = leader; - this.name = name; - members = new ArrayList<>(); - setID(id); - } - - public int getID() { - return id; - } - - public void setID(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public GameProfile getLeader() { - return leader; - } - - public boolean isEmpty() { - return members.isEmpty(); - } - - public void addPlayer(GameProfile player) { - if (!members.contains(player)) { - members.add(player); - } - // TODO always false? - if (leader == null) { - leader = player; - } - } - - public void removePlayer(GameProfile player) { - if (player == leader) { - throw new RuntimeException("Can't remove leader of a Gene Project"); - } - members.remove(player); - } -} diff --git a/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java b/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java deleted file mode 100644 index 77dfd923..00000000 --- a/src/main/java/binnie/genetics/genetics/GeneProjectTracker.java +++ /dev/null @@ -1,121 +0,0 @@ -package binnie.genetics.genetics; - -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -import com.mojang.authlib.GameProfile; -import net.minecraft.world.storage.WorldSavedData; - -public class GeneProjectTracker extends WorldSavedData { - private Map projects; - private Map> TeamInvites; - - public GeneProjectTracker(String s) { - super(s); - projects = new HashMap<>(); - TeamInvites = new HashMap<>(); - } - - public static GeneProjectTracker getTracker(World world) { - String filename = "GeneProjectTracker.common"; - GeneProjectTracker tracker = (GeneProjectTracker) world.loadData(GeneProjectTracker.class, filename); - if (tracker == null) { - tracker = new GeneProjectTracker(filename); - world.setData(filename, tracker); - } - return tracker; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - // ignored - } - - @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - return nbt; - } - - public int createProject(String name, GameProfile leader) { - int i; - for (i = 1; projects.keySet().contains(i); ++i) { - } - GeneProject project = new GeneProject(i, name, leader); - projects.put(i, project); - markDirty(); - return i; - } - - public void removeProject(int id) { - projects.remove(id); - for (Map.Entry> entry : TeamInvites.entrySet()) { - entry.getValue().remove(id); - } - markDirty(); - } - - public void leaveProject(int id, GameProfile player) { - GeneProject project = projects.get(id); - if (project == null) { - return; - } - - project.removePlayer(player); - if (project.isEmpty()) { - removeProject(id); - } - markDirty(); - } - - public void joinProject(int id, GameProfile player) { - GeneProject project = projects.get(id); - if (project == null) { - return; - } - project.addPlayer(player); - markDirty(); - } - - public void reassignPlayer(int id, int id2, GameProfile player) { - GeneProject project = projects.get(id); - if (project == null) { - return; - } - - GeneProject project2 = projects.get(id2); - if (project2 == null) { - return; - } - leaveProject(id, player); - joinProject(id2, player); - } - - public void renameProject(int id, String newName) { - GeneProject project = projects.get(id); - if (project != null) { - project.setName(newName); - } - markDirty(); - } - - public void invitePlayer(int id, GameProfile player) { - if (!TeamInvites.containsKey(player)) { - TeamInvites.put(player, new LinkedHashSet<>()); - } - TeamInvites.get(player).add(id); - markDirty(); - } - - public void revokeInvite(int id, GameProfile player) { - if (!TeamInvites.containsKey(player)) { - TeamInvites.put(player, new LinkedHashSet<>()); - } - TeamInvites.get(player).add(id); - markDirty(); - } -} diff --git a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java deleted file mode 100644 index f0902ca8..00000000 --- a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java +++ /dev/null @@ -1,68 +0,0 @@ -package binnie.genetics.genetics; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; - -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleFloat; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; - -import binnie.core.genetics.BreedingSystem; - -public class GeneticEngineeringSystem { - static List speciesList; - public Map> chromosomeMap; - BreedingSystem breedingSystem; - - public GeneticEngineeringSystem(BreedingSystem system) { - chromosomeMap = new HashMap<>(); - breedingSystem = system; - for (IIndividual indiv : breedingSystem.getSpeciesRoot().getIndividualTemplates()) { - for (IChromosomeType chromosome : breedingSystem.getSpeciesRoot().getKaryotype()) { - if (!chromosomeMap.containsKey(chromosome)) { - chromosomeMap.put(chromosome, new ArrayList<>()); - } - IAllele a1 = indiv.getGenome().getActiveAllele(chromosome); - IAllele a2 = indiv.getGenome().getInactiveAllele(chromosome); - chromosomeMap.get(chromosome).add(a1); - chromosomeMap.get(chromosome).add(a2); - } - } - for (IChromosomeType chromosome2 : breedingSystem.getSpeciesRoot().getKaryotype()) { - List alleles = getAlleles(chromosome2); - TreeSet set = new TreeSet<>(new ComparatorAllele()); - set.addAll(alleles); - List list = new ArrayList<>(); - list.addAll(set); - chromosomeMap.put(chromosome2, list); - } - } - - public List getAlleles(IChromosomeType chromosome) { - return chromosomeMap.get(chromosome); - } - - public ISpeciesRoot getSpeciesRoot() { - return breedingSystem.getSpeciesRoot(); - } - - class ComparatorAllele implements Comparator { - @Override - public int compare(IAllele o1, IAllele o2) { - if (o1 instanceof IAlleleFloat && o2 instanceof IAlleleFloat) { - return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(((IAlleleFloat) o2).getValue()); - } - if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger) { - return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue()); - } - return o1.getUID().compareTo(o2.getUID()); - } - } -} diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java index c3ccef1c..95de32b2 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java @@ -32,7 +32,6 @@ import binnie.core.gui.minecraft.Window; import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.gui.renderer.RenderUtil; import binnie.core.integration.extrabees.ExtraBeesIntegration; -import binnie.core.resource.BinnieSprite; import binnie.core.util.I18N; public class AnalystPageMutations extends ControlAnalystPage { @@ -126,11 +125,6 @@ public class AnalystPageMutations extends ControlAnalystPage { setSize(new Point(getWidth(), y)); } - @SideOnly(Side.CLIENT) - private void drawSprite(BinnieSprite sprite) { - RenderUtil.drawSprite(new Point(14, 0), sprite.getSprite()); - } - private boolean isKnown(BreedingSystem system, IMutation mutation) { return system.getDiscoveredMutations(getWindow().getWorld(), getWindow().getPlayer().getGameProfile()).contains(mutation); } diff --git a/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java b/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java deleted file mode 100644 index b6dd75c5..00000000 --- a/src/main/java/binnie/genetics/gui/analyst/ControlTooltip.java +++ /dev/null @@ -1,17 +0,0 @@ -package binnie.genetics.gui.analyst; - -import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; -import binnie.core.gui.Tooltip; -import binnie.core.gui.controls.core.Control; -import net.minecraft.client.util.ITooltipFlag; - -public class ControlTooltip extends Control implements ITooltip { - public ControlTooltip(IWidget parent, int x, int y, int w, int h) { - super(parent, x, y, w, h); - } - - @Override - public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { - } -} diff --git a/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java b/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java index 0e42578d..6eb86e0c 100644 --- a/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java +++ b/src/main/java/binnie/genetics/gui/database/bee/WindowApiaristDatabase.java @@ -31,16 +31,16 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase { @Override @SideOnly(Side.CLIENT) protected void addTabs() { - new PageSpeciesOverview(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.overview", 0)); - new PageSpeciesClassification(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.classification", 0)); - new PageSpeciesGenome(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.genome", 0)); - new PageSpeciesProducts(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.products", 0)); - new PageSpeciesClimate(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.climate", 0)); - new PageSpeciesResultant(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.resultant", 0)); - new PageSpeciesMutations(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.further", 0)); - new PageBranchOverview(getInfoPages(Mode.BRANCHES), new DatabaseTab(Genetics.instance, "branches.overview", 0)); - new PageBranchSpecies(getInfoPages(Mode.BRANCHES), new DatabaseTab(Genetics.instance, "branches.species", 0)); - new PageBreeder(getInfoPages(Mode.BREEDER), getUsername(), new DatabaseTab(Genetics.instance, "breeder", 0)); + new PageSpeciesOverview(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.overview")); + new PageSpeciesClassification(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.classification")); + new PageSpeciesGenome(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.genome")); + new PageSpeciesProducts(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.products")); + new PageSpeciesClimate(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.climate")); + new PageSpeciesResultant(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.resultant")); + new PageSpeciesMutations(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.further")); + new PageBranchOverview(getInfoPages(Mode.BRANCHES), new DatabaseTab(Genetics.instance, "branches.overview")); + new PageBranchSpecies(getInfoPages(Mode.BRANCHES), new DatabaseTab(Genetics.instance, "branches.species")); + new PageBreeder(getInfoPages(Mode.BREEDER), getUsername(), new DatabaseTab(Genetics.instance, "breeder")); } @Override diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/src/main/java/binnie/genetics/item/GeneticLiquid.java index 12393682..4479513a 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -18,15 +18,12 @@ public enum GeneticLiquid implements IFluidType { String name; String ident; - //IIcon icon; int colour; - float transparency; GeneticLiquid(final String name, final String ident, final int colour) { this.name = name; this.ident = ident; this.colour = colour; - this.transparency = 1.0f; } @Override diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index 9477bcf4..5cec0e76 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -12,12 +12,6 @@ import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; public class ItemAnalyst extends ItemCore { - /*@Override - @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.itemIcon = Genetics.proxy.getIcon(register, "analyst"); - }*/ - public ItemAnalyst() { super("analyst"); this.setCreativeTab(CreativeTabGenetics.instance); diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index 8c763924..195b998b 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -12,12 +12,6 @@ import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; public class ItemRegistry extends ItemCore { - /*@Override - @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - this.itemIcon = Genetics.proxy.getIcon(register, "registry"); - }*/ - public ItemRegistry() { super("registry"); this.setCreativeTab(CreativeTabGenetics.instance); diff --git a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java deleted file mode 100644 index 0692376b..00000000 --- a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java +++ /dev/null @@ -1,39 +0,0 @@ -package binnie.genetics.machine; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.util.math.BlockPos; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import binnie.core.BinnieCore; -import binnie.core.machines.Machine; -import binnie.core.machines.component.IRender; - -@SideOnly(Side.CLIENT) -public class MachineRendererGenetics { - public static MachineRendererGenetics instance = new MachineRendererGenetics(); - - public void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage) { - GlStateManager.pushMatrix(); - int i1 = 0; - BlockPos pos = machine.getTileEntity().getPos(); - final int ix = pos.getX(); - final int iy = pos.getY(); - final int iz = pos.getZ(); - if (machine.getTileEntity() != null) { - i1 = ix * iy * iz + ix * iy - ix * iz + iy * iz - ix + iy - iz; - } - final float phase = (float) Math.max(0.0, Math.sin((System.currentTimeMillis() + i1) * 0.003)); - GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5); - GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); - BinnieCore.getBinnieProxy().getMinecraftInstance(); - if (Minecraft.isFancyGraphicsEnabled()) { - for (IRender.Render render : machine.getInterfaces(IRender.Render.class)) { - render.renderInWorld(x, y, z); - } - } - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java deleted file mode 100644 index c9841eb6..00000000 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ /dev/null @@ -1,96 +0,0 @@ -package binnie.genetics.machine; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import binnie.core.BinnieCore; -import binnie.core.machines.Machine; - -@SideOnly(Side.CLIENT) -public class MachineRendererLab { - public static MachineRendererLab instance = new MachineRendererLab(); - private final EntityItem dummyEntityItem; - private final EntityItem[] itemSides; - private long lastTick; - - public MachineRendererLab() { - World world = Minecraft.getMinecraft().world; - this.dummyEntityItem = new EntityItem(world); - this.itemSides = new EntityItem[]{new EntityItem(world), new EntityItem(world), new EntityItem(world), new EntityItem(world)}; - } - - public void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage) { - GlStateManager.pushMatrix(); - int i1 = 0; - BlockPos pos = machine.getTileEntity().getPos(); - int ix = pos.getX(); - int iy = pos.getY(); - int iz = pos.getZ(); - if (machine.getTileEntity() != null) { - i1 = ix * iy * iz + ix * iy - ix * iz + iy * iz - ix + iy - iz; - } - float phase = (float) Math.max(0.0, Math.sin((System.currentTimeMillis() + i1) * 0.003)); - GlStateManager.translate(x + 0.5, y + 1.5, z + 0.5); - GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); - World world = machine.getWorld(); - LaboratoryMachine.ComponentGUIHolder holder = Machine.getInterface(LaboratoryMachine.ComponentGUIHolder.class, machine); - Label_0591: - { - if (world != null && holder != null && !holder.getStack().isEmpty()) { - BinnieCore.getBinnieProxy().getMinecraftInstance(); - if (Minecraft.isFancyGraphicsEnabled()) { - final ItemStack stack = holder.getStack(); - this.dummyEntityItem.world = world; - this.dummyEntityItem.setItem(stack); - if (world.getTotalWorldTime() != this.lastTick) { - this.lastTick = world.getTotalWorldTime(); - this.dummyEntityItem.onUpdate(); - } - GlStateManager.pushMatrix(); - final EntityPlayer player = BinnieCore.getBinnieProxy().getPlayer(); - final double dx = ix + 0.5 - player.lastTickPosX; - final double dz = iz + 0.5 - player.lastTickPosZ; - final double t = Math.atan2(dz, dx) * 180.0 / 3.1415; - GlStateManager.rotate(90.0f, 1.0f, 0.0f, 0.0f); - GlStateManager.translate(0.0f, 0.0f, -0.55f); - GlStateManager.rotate(90.0f + (float) (-t), 0.0f, 0.0f, 1.0f); - GlStateManager.translate(0.0f, -0.125f, 0.0f); - GlStateManager.scale(1.2f, 1.2f, 1.2f); - GlStateManager.rotate(45.0f, 1.0f, 0.0f, 0.0f); - GlStateManager.translate(0.0f, 0.1f, 0.1f); - RenderManager renderManager = BinnieCore.getBinnieProxy().getMinecraftInstance().getRenderManager(); - renderManager.doRenderEntity(this.dummyEntityItem, 0.0, 0.0, 0.0, 0.0f, 0.0f, false); - GlStateManager.popMatrix(); - int rot = 0; - for (EntityItem item : this.itemSides) { - GlStateManager.pushMatrix(); - item.world = world; - item.setItem(stack); - GlStateManager.rotate(rot, 0.0f, 1.0f, 0.0f); - GlStateManager.rotate(180.0f, 1.0f, 0.0f, 0.0f); - GlStateManager.translate(0.0, -1.13, 0.4); - GlStateManager.scale(0.8f, 0.8f, 0.8f); - renderManager.doRenderEntity(item, 0.0, 0.0, 0.0, 0.0f, 0.0f, false); - rot += 90; - GlStateManager.popMatrix(); - } - break Label_0591; - } - } - this.dummyEntityItem.setItem(ItemStack.EMPTY); - for (final EntityItem item2 : this.itemSides) { - item2.setItem(ItemStack.EMPTY); - } - } - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/binnie/genetics/machine/SlotValidatorInoculatorCatalyst.java b/src/main/java/binnie/genetics/machine/SlotValidatorInoculatorCatalyst.java deleted file mode 100644 index 2f19a053..00000000 --- a/src/main/java/binnie/genetics/machine/SlotValidatorInoculatorCatalyst.java +++ /dev/null @@ -1,17 +0,0 @@ -package binnie.genetics.machine; - -import net.minecraft.item.ItemStack; - -import binnie.core.machines.inventory.Validator; - -public class SlotValidatorInoculatorCatalyst extends Validator { - @Override - public boolean isValid(final ItemStack itemStack) { - return false; - } - - @Override - public String getTooltip() { - return "Inoculation Catalyst"; - } -} diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java deleted file mode 100644 index 06ba426b..00000000 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java +++ /dev/null @@ -1,27 +0,0 @@ -package binnie.genetics.machine.craftgui; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import binnie.core.gui.IWidget; -import binnie.core.gui.geometry.Area; -import binnie.core.gui.geometry.Point; -import binnie.core.gui.minecraft.control.ControlMachineProgress; -import binnie.core.gui.renderer.RenderUtil; - -public class ControlProcessTemporary extends ControlMachineProgress { - public ControlProcessTemporary(final IWidget parent, final int x, final int y, final int width, final int height) { - super(parent, x, y, null, null, null); - this.setSize(new Point(width, height)); - } - - @Override - @SideOnly(Side.CLIENT) - public void onRenderBackground(int guiWidth, int guiHeight) { - RenderUtil.drawSolidRect(this.getArea(), -4868683); - final int width = Math.round(this.getSize().yPos() * this.progress / 100.0f); - Area area = new Area(getArea()); - area.setWidth(width); - RenderUtil.drawSolidRect(area, -65536); - } -} diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java deleted file mode 100644 index a6d86168..00000000 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneProject.java +++ /dev/null @@ -1,31 +0,0 @@ -package binnie.genetics.machine.craftgui; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; - -import net.minecraftforge.fml.relauncher.Side; - -import binnie.core.AbstractMod; -import binnie.core.gui.minecraft.Window; -import binnie.genetics.Genetics; - -public class WindowGeneProject extends Window { - public WindowGeneProject(final EntityPlayer player, final IInventory inventory, final Side side) { - super(100, 100, player, inventory, side); - } - - @Override - protected AbstractMod getMod() { - return Genetics.instance; - } - - @Override - protected String getBackgroundTextureName() { - return "GeneProjects"; - } - - @Override - public void initialiseClient() { - this.setTitle("Gene Projects"); - } -} diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java deleted file mode 100644 index 20d767d5..00000000 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGenomeAssembler.java +++ /dev/null @@ -1,35 +0,0 @@ -package binnie.genetics.machine.craftgui; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; - -import net.minecraftforge.fml.relauncher.Side; - -import binnie.core.AbstractMod; -import binnie.core.gui.minecraft.Window; -import binnie.genetics.Genetics; - -public class WindowGenomeAssembler extends WindowMachine { - public WindowGenomeAssembler(final EntityPlayer player, final IInventory inventory, final Side side) { - super(320, 240, player, inventory, side); - } - - public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) { - return new WindowGenomeAssembler(player, inventory, side); - } - - @Override - public String getTitle() { - return "Genome Assembler"; - } - - @Override - protected AbstractMod getMod() { - return Genetics.instance; - } - - @Override - protected String getBackgroundTextureName() { - return "GenomeAssembler"; - } -} diff --git a/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java b/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java index e6f7eb87..e277f712 100644 --- a/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java +++ b/src/main/java/binnie/genetics/machine/indexer/ComponentIndexerInventory.java @@ -75,16 +75,6 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im this.markDirty(); } - /*@Override - public ItemStack getStackInSlotOnClosing(final int var1) { - return null; - } - - @Override - public String getInventoryName() { - return ""; - }*/ - @Override public int getInventoryStackLimit() { return 64; @@ -95,14 +85,6 @@ public abstract class ComponentIndexerInventory extends ComponentInventory im return true; } - /*@Override - public void openInventory() { - } - - @Override - public void closeInventory() { - }*/ - @Nullable public T getMode() { return this.sortingMode; diff --git a/src/main/java/binnie/genetics/network/PacketID.java b/src/main/java/binnie/genetics/network/PacketID.java deleted file mode 100644 index 9f5fe6c2..00000000 --- a/src/main/java/binnie/genetics/network/PacketID.java +++ /dev/null @@ -1,4 +0,0 @@ -package binnie.genetics.network; - -public enum PacketID { -} diff --git a/src/main/java/binnie/genetics/network/package-info.java b/src/main/java/binnie/genetics/network/package-info.java deleted file mode 100644 index bd8156f0..00000000 --- a/src/main/java/binnie/genetics/network/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.genetics.network; - -import javax.annotation.ParametersAreNonnullByDefault; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/modules/BlankModuleContainer.java b/src/main/java/binnie/modules/BlankModuleContainer.java old mode 100644 new mode 100755 index 3cc62316..c7e46148 --- a/src/main/java/binnie/modules/BlankModuleContainer.java +++ b/src/main/java/binnie/modules/BlankModuleContainer.java @@ -1,6 +1,5 @@ package binnie.modules; -import javax.annotation.Nullable; import java.io.File; import java.util.LinkedHashSet; import java.util.Set; @@ -9,7 +8,6 @@ import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import binnie.core.AbstractMod; @@ -20,9 +18,6 @@ public abstract class BlankModuleContainer extends AbstractMod implements IModul protected Set disabledModules; protected File configFolder; - @Nullable - private SimpleNetworkWrapper wrapper; - public BlankModuleContainer() { super(); this.loadedModules = new LinkedHashSet<>();