aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/forestry/bees
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-05-17 00:01:01 +0900
committerGitHub <noreply@github.com>2023-05-16 17:01:01 +0200
commit04514282c08ebefdb3e68a46db34092f72be2316 (patch)
tree0c9bc99f480f7e7f45a99a55a5b6619ebb5b014b /src/main/java/gtPlusPlus/xmod/forestry/bees
parentcd58ff7cd4dc4b5ffe917a24a4b4c6da577f462d (diff)
downloadGT5-Unofficial-04514282c08ebefdb3e68a46db34092f72be2316.tar.gz
GT5-Unofficial-04514282c08ebefdb3e68a46db34092f72be2316.tar.bz2
GT5-Unofficial-04514282c08ebefdb3e68a46db34092f72be2316.zip
Remove a lot of unused classes (#629)
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/forestry/bees')
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java22
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java40
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java56
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java97
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java97
6 files changed, 0 insertions, 338 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java
deleted file mode 100644
index ef33baab5a..0000000000
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
- * at http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
- * MysteriousAges
- ******************************************************************************/
-package gtPlusPlus.xmod.forestry.bees.blocks;
-
-import forestry.apiculture.blocks.BlockApicultureType;
-import forestry.core.blocks.BlockBase;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-
-public class BlockDenseBeeHouse extends BlockBase<BlockApicultureType> {
-
- public BlockDenseBeeHouse() {
- super();
- setCreativeTab(AddToCreativeTab.tabBOP);
- setHarvestLevel("axe", 0);
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java
deleted file mode 100644
index f873963b7f..0000000000
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gtPlusPlus.xmod.forestry.bees.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import forestry.core.utils.StringUtil;
-import forestry.plugins.PluginManager;
-
-public abstract class FR_BlockRegistry {
-
- protected static <T extends Block> T registerBlock(T block, Class<? extends ItemBlock> itemClass, String name) {
- if (PluginManager.getStage() != PluginManager.Stage.SETUP) {
- throw new RuntimeException("Tried to register Block outside of Setup");
- }
- block.setBlockName("for." + name);
- GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block));
- return block;
- }
-
- protected static void registerOreDictWildcard(String oreDictName, Block block) {
- OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, 32767));
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java
deleted file mode 100644
index 73399d970f..0000000000
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
- * at http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
- * MysteriousAges
- ******************************************************************************/
-package gtPlusPlus.xmod.forestry.bees.gui;
-
-import net.minecraft.entity.player.InventoryPlayer;
-
-import forestry.apiculture.gui.ContainerBeeHelper;
-import forestry.apiculture.gui.IContainerBeeHousing;
-import forestry.apiculture.tiles.TileBeeHousingBase;
-import forestry.core.gui.ContainerTile;
-import forestry.core.network.IForestryPacketClient;
-import forestry.core.network.packets.PacketGuiUpdate;
-
-public class ContainerBeeHouse extends ContainerTile<TileBeeHousingBase> implements IContainerBeeHousing {
-
- public ContainerBeeHouse(InventoryPlayer player, TileBeeHousingBase tile, boolean hasFrames) {
- super(tile, player, 8, 108);
- ContainerBeeHelper.addSlots(this, tile, hasFrames);
- }
-
- private int beeProgress = 0;
-
- @Override
- public void detectAndSendChanges() {
- super.detectAndSendChanges();
-
- int beeProgress = tile.getBeekeepingLogic().getBeeProgressPercent();
- if (this.beeProgress != beeProgress) {
- this.beeProgress = beeProgress;
- IForestryPacketClient packet = new PacketGuiUpdate(tile);
- sendPacketToCrafters(packet);
- }
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java
deleted file mode 100644
index b2cdd2b2ef..0000000000
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
- * at http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
- * MysteriousAges
- ******************************************************************************/
-package gtPlusPlus.xmod.forestry.bees.gui;
-
-import net.minecraft.inventory.Container;
-
-import forestry.apiculture.gui.IContainerBeeHousing;
-import forestry.apiculture.gui.IGuiBeeHousingInventory;
-import forestry.core.config.Constants;
-import forestry.core.gui.GuiForestryTitled;
-import forestry.core.render.EnumTankLevel;
-
-public class GuiBeeHouse<C extends Container & IContainerBeeHousing>
- extends GuiForestryTitled<C, IGuiBeeHousingInventory> {
-
- public enum Icon {
-
- APIARY("/apiary.png"),
- BEE_HOUSE("/alveary.png");
-
- private final String path;
-
- Icon(String path) {
- this.path = path;
- }
- }
-
- public GuiBeeHouse(IGuiBeeHousingInventory tile, C container, Icon icon) {
- super(Constants.TEXTURE_PATH_GUI + icon.path, container, tile);
- ySize = 190;
- }
-
- @Override
- protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
- super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
-
- drawHealthMeter(
- guiLeft + 20,
- guiTop + 37,
- inventory.getHealthScaled(46),
- EnumTankLevel.rateTankLevel(inventory.getHealthScaled(100)));
- }
-
- private void drawHealthMeter(int x, int y, int height, EnumTankLevel rated) {
- int i = 176 + rated.getLevelScaled(16);
- int k = 0;
-
- this.drawTexturedModalRect(x, y + 46 - height, i, k + 46 - height, 4, height);
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java
deleted file mode 100644
index 31671afaa1..0000000000
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
- * at http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
- * MysteriousAges
- ******************************************************************************/
-package gtPlusPlus.xmod.forestry.bees.inventory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import forestry.api.apiculture.BeeManager;
-import forestry.api.apiculture.IBee;
-import forestry.api.apiculture.IBeeHousing;
-import forestry.api.apiculture.IBeekeepingMode;
-import forestry.api.apiculture.IHiveFrame;
-import forestry.apiculture.InventoryBeeHousing;
-import forestry.apiculture.inventory.IApiaryInventory;
-import forestry.core.access.IAccessHandler;
-import forestry.core.utils.SlotUtil;
-
-public class InventoryDenseBeeHouse extends InventoryBeeHousing implements IApiaryInventory {
-
- public static final int SLOT_FRAMES_1 = 9;
- public static final int SLOT_FRAMES_COUNT = 3;
-
- public InventoryDenseBeeHouse(IAccessHandler accessHandler) {
- super(12, accessHandler);
- }
-
- @Override
- public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
- if (SlotUtil.isSlotInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) {
- return (itemStack.getItem() instanceof IHiveFrame) && (getStackInSlot(slotIndex) == null);
- }
-
- return super.canSlotAccept(slotIndex, itemStack);
- }
-
- // override for pipe automation
- @Override
- public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) {
- if (SlotUtil.isSlotInRange(slotIndex, SLOT_FRAMES_1, SLOT_FRAMES_COUNT)) {
- return false;
- }
- return super.isItemValidForSlot(slotIndex, itemStack);
- }
-
- public Collection<IHiveFrame> getFrames() {
- Collection<IHiveFrame> hiveFrames = new ArrayList<>(SLOT_FRAMES_COUNT);
-
- for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) {
- ItemStack stackInSlot = getStackInSlot(i);
- if (stackInSlot == null) {
- continue;
- }
-
- Item itemInSlot = stackInSlot.getItem();
- if (itemInSlot instanceof IHiveFrame) {
- hiveFrames.add((IHiveFrame) itemInSlot);
- }
- }
-
- return hiveFrames;
- }
-
- @Override
- public void wearOutFrames(IBeeHousing beeHousing, int amount) {
- IBeekeepingMode beekeepingMode = BeeManager.beeRoot.getBeekeepingMode(beeHousing.getWorld());
- int wear = Math.round(amount * beekeepingMode.getWearModifier());
-
- for (int i = SLOT_FRAMES_1; i < SLOT_FRAMES_1 + SLOT_FRAMES_COUNT; i++) {
- ItemStack hiveFrameStack = getStackInSlot(i);
- if (hiveFrameStack == null) {
- continue;
- }
-
- Item hiveFrameItem = hiveFrameStack.getItem();
- if (!(hiveFrameItem instanceof IHiveFrame)) {
- continue;
- }
-
- IHiveFrame hiveFrame = (IHiveFrame) hiveFrameItem;
-
- ItemStack queenStack = getQueen();
- IBee queen = BeeManager.beeRoot.getMember(queenStack);
- ItemStack usedFrame = hiveFrame.frameUsed(beeHousing, hiveFrameStack, queen, wear);
-
- setInventorySlotContents(i, usedFrame);
- }
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java
deleted file mode 100644
index 56df184fc1..0000000000
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available
- * at http://www.gnu.org/licenses/lgpl-3.0.txt
- *
- * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie,
- * MysteriousAges
- ******************************************************************************/
-package gtPlusPlus.xmod.forestry.bees.tileentities;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import buildcraft.api.statements.ITriggerExternal;
-import cpw.mods.fml.common.Optional;
-import forestry.api.apiculture.IBeeHousingInventory;
-import forestry.api.apiculture.IBeeListener;
-import forestry.api.apiculture.IBeeModifier;
-import forestry.api.apiculture.IHiveFrame;
-import forestry.apiculture.ApiaryBeeListener;
-import forestry.apiculture.ApiaryBeeModifier;
-import forestry.apiculture.IApiary;
-import forestry.apiculture.inventory.IApiaryInventory;
-import forestry.apiculture.inventory.InventoryApiary;
-import forestry.apiculture.tiles.TileBeeHousingBase;
-import forestry.apiculture.trigger.ApicultureTriggers;
-import gtPlusPlus.xmod.forestry.bees.gui.ContainerBeeHouse;
-import gtPlusPlus.xmod.forestry.bees.gui.GuiBeeHouse;
-
-public class TileDenseBeeHouse extends TileBeeHousingBase implements IApiary {
-
- private final IBeeModifier beeModifier = new ApiaryBeeModifier();
- private final IBeeListener beeListener = new ApiaryBeeListener(this);
- private final InventoryApiary inventory = new InventoryApiary(getAccessHandler());
-
- public TileDenseBeeHouse() {
- super("apiary2");
- setInternalInventory(inventory);
- }
-
- @Override
- public IBeeHousingInventory getBeeInventory() {
- return inventory;
- }
-
- @Override
- public IApiaryInventory getApiaryInventory() {
- return inventory;
- }
-
- @Override
- public Collection<IBeeModifier> getBeeModifiers() {
- List<IBeeModifier> beeModifiers = new ArrayList<>();
-
- beeModifiers.add(beeModifier);
-
- for (IHiveFrame frame : inventory.getFrames()) {
- beeModifiers.add(frame.getBeeModifier());
- }
-
- return beeModifiers;
- }
-
- @Override
- public Iterable<IBeeListener> getBeeListeners() {
- return Collections.singleton(beeListener);
- }
-
- /* ITRIGGERPROVIDER */
- @Optional.Method(modid = "BuildCraftAPI|statements")
- @Override
- public Collection<ITriggerExternal> getExternalTriggers(ForgeDirection side, TileEntity tile) {
- LinkedList<ITriggerExternal> res = new LinkedList<>();
- res.add(ApicultureTriggers.missingQueen);
- res.add(ApicultureTriggers.missingDrone);
- res.add(ApicultureTriggers.noFrames);
- return res;
- }
-
- @Override
- public Object getGui(EntityPlayer player, int data) {
- ContainerBeeHouse container = new ContainerBeeHouse(player.inventory, this, true);
- return new GuiBeeHouse<>(this, container, GuiBeeHouse.Icon.APIARY);
- }
-
- @Override
- public Object getContainer(EntityPlayer player, int data) {
- return new ContainerBeeHouse(player.inventory, this, true);
- }
-}