From a5ac246a28845e956b2eb78bde66b6ca27b7304e Mon Sep 17 00:00:00 2001 From: ah-OOG-ah <75745146+ah-OOG-ah@users.noreply.github.com> Date: Wed, 25 Sep 2024 02:26:28 -0400 Subject: [PATCH] Delete a bunch of unused code Passes the scream test, at least without binnie-specific tests --- .../minecraft/control/ControlEnergyBar.java | 18 +- .../machines/inventory/TransferHandler.java | 233 ------------------ .../machines/transfer/TransferHandler.java | 5 - .../binnie/core/network/packet/IPacket.java | 9 - .../core/network/packet/IndexInPayload.java | 15 -- .../packet/MessageContainerUpdate.java | 4 - .../network/packet/MessageCoordinates.java | 19 +- .../core/network/packet/MessageUpdate.java | 13 +- .../core/network/packet/PacketPayload.java | 18 -- .../java/binnie/core/proxy/BinnieProxy.java | 34 +-- .../binnie/core/proxy/BinnieProxyClient.java | 25 +- .../apiary/ComponentBeeModifier.java | 13 - .../extratrees/genetics/ExtraTreeSpecies.java | 39 +-- 13 files changed, 33 insertions(+), 412 deletions(-) delete mode 100644 src/main/java/binnie/core/machines/inventory/TransferHandler.java delete mode 100644 src/main/java/binnie/core/machines/transfer/TransferHandler.java delete mode 100644 src/main/java/binnie/core/network/packet/IPacket.java delete mode 100644 src/main/java/binnie/core/network/packet/IndexInPayload.java diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java index 3101b2d6..823b07b2 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java @@ -1,9 +1,5 @@ package binnie.core.craftgui.minecraft.control; -import net.minecraft.inventory.IInventory; - -import org.lwjgl.opengl.GL11; - import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -17,10 +13,9 @@ import binnie.core.craftgui.minecraft.MinecraftTooltip; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.power.IPoweredMachine; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; +import org.lwjgl.opengl.GL11; public class ControlEnergyBar extends Control implements ITooltip { @@ -34,17 +29,6 @@ public class ControlEnergyBar extends Control implements ITooltip { addAttribute(WidgetAttribute.MOUSE_OVER); } - // TODO unused method? - public IPoweredMachine getClientPower() { - IInventory inventory = Window.get(this).getInventory(); - TileEntityMachine machine = (inventory instanceof TileEntityMachine) ? (TileEntityMachine) inventory : null; - if (machine == null) { - return null; - } - - return machine.getMachine().getInterface(IPoweredMachine.class); - } - public float getPercentage() { float percentage = 100.0f * getStoredEnergy() / getMaxEnergy(); if (percentage > 100.0f) { diff --git a/src/main/java/binnie/core/machines/inventory/TransferHandler.java b/src/main/java/binnie/core/machines/inventory/TransferHandler.java deleted file mode 100644 index b96bf0a3..00000000 --- a/src/main/java/binnie/core/machines/inventory/TransferHandler.java +++ /dev/null @@ -1,233 +0,0 @@ -package binnie.core.machines.inventory; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; - -import binnie.core.machines.Machine; -import binnie.core.machines.power.ITankMachine; - -// TODO unused class? -public class TransferHandler { - - public static ItemStack transfer(ItemStack item, IInventory origin, IInventory destination, boolean doAdd) { - ItemStack ret = transferItemToInventory(item, destination, doAdd); - if (destination instanceof ITankMachine) { - ret = transferContainerIntoTank(ret, origin, (ITankMachine) destination, doAdd); - ret = transferTankIntoContainer(ret, origin, (ITankMachine) destination, doAdd); - } - return ret; - } - - public static ItemStack transferItemToInventory(ItemStack item, IInventory destination, boolean doAdd) { - if (item == null || destination == null) { - return item; - } - - ItemStack addition = item.copy(); - for (int i = 0; i < destination.getSizeInventory(); ++i) { - addition = transferToInventory(addition, destination, new int[] { i }, doAdd, false); - if (addition == null) { - return null; - } - } - return addition; - } - - public static ItemStack transferToInventory(ItemStack item, IInventory destination, int[] targetSlots, - boolean doAdd, boolean ignoreValidation) { - for (int i : targetSlots) { - if (destination.isItemValidForSlot(i, item) || ignoreValidation) { - if (destination.getStackInSlot(i) == null) { - if (doAdd) { - destination.setInventorySlotContents(i, item.copy()); - } - return null; - } - if (item.isStackable()) { - ItemStack merged = destination.getStackInSlot(i).copy(); - ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy()); - item = newStacks[0]; - if (doAdd) { - destination.setInventorySlotContents(i, newStacks[1]); - } - if (item == null) { - return null; - } - } - } - } - return item; - } - - public static ItemStack[] mergeStacks(ItemStack itemstack, ItemStack merged) { - if (ItemStack.areItemStackTagsEqual(itemstack, merged) && itemstack.isItemEqual(merged)) { - int space = merged.getMaxStackSize() - merged.stackSize; - if (space > 0) { - if (itemstack.stackSize > space) { - itemstack.stackSize -= space; - merged.stackSize += space; - } else { - merged.stackSize += itemstack.stackSize; - itemstack = null; - } - } - } - return new ItemStack[] { itemstack, merged }; - } - - public static ItemStack transferContainerIntoTank(ItemStack item, IInventory origin, ITankMachine destination, - boolean doAdd) { - if (item == null) { - return null; - } - - IFluidTank[] tanks = destination.getTanks(); - ItemStack stack = item.copy(); - for (int i = 0; i < tanks.length; ++i) { - stack = transferToTank(stack, origin, destination, i, doAdd); - } - return stack; - } - - public static ItemStack transferTankIntoContainer(ItemStack item, IInventory origin, ITankMachine destination, - boolean doAdd) { - if (item == null) { - return null; - } - - IFluidTank[] tanks = destination.getTanks(); - ItemStack stack = item.copy(); - for (int i = 0; i < tanks.length; ++i) { - stack = transferFromTank(stack, origin, destination, i, doAdd); - } - return stack; - } - - public static ItemStack transferToTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID, - boolean doAdd) { - if (item == null) { - return item; - } - - FluidStack containerLiquid = null; - FluidContainerRegistry.FluidContainerData containerLiquidData = null; - for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry - .getRegisteredFluidContainerData()) { - if (data.filledContainer.isItemEqual(item)) { - containerLiquidData = data; - containerLiquid = data.fluid.copy(); - break; - } - } - - if (containerLiquid == null) { - return item; - } - - IFluidTank tank = destination.getTanks()[tankID]; - IValidatedTankContainer validated = Machine.getInterface(IValidatedTankContainer.class, destination); - if (validated != null && !validated.isLiquidValidForTank(containerLiquid, tankID)) { - return item; - } - - FluidStack largeAmountOfLiquid = containerLiquid.copy(); - largeAmountOfLiquid.amount = tank.getCapacity(); - int amountAdded = tank.fill(largeAmountOfLiquid, false); - int numberOfContainersToAdd = amountAdded / containerLiquid.amount; - if (numberOfContainersToAdd > item.stackSize) { - numberOfContainersToAdd = item.stackSize; - } - - ItemStack copy; - ItemStack leftOverContainers = copy = item.copy(); - copy.stackSize -= numberOfContainersToAdd; - if (leftOverContainers.stackSize <= 0) { - leftOverContainers = null; - } - - ItemStack emptyContainers = containerLiquidData.emptyContainer.copy(); - emptyContainers.stackSize = 0; - ItemStack itemStack = emptyContainers; - itemStack.stackSize += numberOfContainersToAdd; - if (emptyContainers.stackSize <= 0) { - emptyContainers = null; - } - - ItemStack containersThatCantBeDumped = transferItemToInventory(emptyContainers, origin, false); - if (containersThatCantBeDumped != null) { - return item; - } - - if (doAdd) { - FluidStack copy2; - FluidStack liquidToFillTank = copy2 = containerLiquid.copy(); - copy2.amount *= numberOfContainersToAdd; - tank.fill(liquidToFillTank, true); - transferItemToInventory(emptyContainers, origin, true); - } - return leftOverContainers; - } - - public static ItemStack transferFromTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID, - boolean doAdd) { - if (item == null) { - return item; - } - - IFluidTank tank = destination.getTanks()[tankID]; - FluidStack liquidInTank = tank.getFluid(); - if (liquidInTank == null) { - return item; - } - - FluidContainerRegistry.FluidContainerData containerLiquidData = null; - for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry - .getRegisteredFluidContainerData()) { - if (data.emptyContainer.isItemEqual(item) && liquidInTank.isFluidEqual(data.fluid)) { - containerLiquidData = data; - break; - } - } - - if (containerLiquidData == null) { - return item; - } - - int maximumExtractedLiquid = item.stackSize * containerLiquidData.fluid.amount; - FluidStack drainedLiquid = tank.drain(maximumExtractedLiquid, false); - int amountInTank = (drainedLiquid == null) ? 0 : drainedLiquid.amount; - int numberOfContainersToFill = amountInTank / containerLiquidData.fluid.amount; - if (numberOfContainersToFill > item.stackSize) { - numberOfContainersToFill = item.stackSize; - } - - ItemStack copy; - ItemStack leftOverContainers = copy = item.copy(); - copy.stackSize -= numberOfContainersToFill; - if (leftOverContainers.stackSize <= 0) { - leftOverContainers = null; - } - - ItemStack filledContainers = containerLiquidData.filledContainer.copy(); - filledContainers.stackSize = 0; - ItemStack itemStack = filledContainers; - itemStack.stackSize += numberOfContainersToFill; - if (filledContainers.stackSize <= 0) { - filledContainers = null; - } - - ItemStack containersThatCantBeDumped = transferItemToInventory(filledContainers, origin, false); - if (containersThatCantBeDumped != null) { - return item; - } - - if (doAdd) { - tank.drain(maximumExtractedLiquid, true); - transferItemToInventory(filledContainers, origin, true); - } - return leftOverContainers; - } -} diff --git a/src/main/java/binnie/core/machines/transfer/TransferHandler.java b/src/main/java/binnie/core/machines/transfer/TransferHandler.java deleted file mode 100644 index 210f0b2f..00000000 --- a/src/main/java/binnie/core/machines/transfer/TransferHandler.java +++ /dev/null @@ -1,5 +0,0 @@ -package binnie.core.machines.transfer; - -// TODO unused class? -public class TransferHandler { -} 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 4e45021e..00000000 --- a/src/main/java/binnie/core/network/packet/IPacket.java +++ /dev/null @@ -1,9 +0,0 @@ -package binnie.core.network.packet; - -import net.minecraft.network.Packet; - -// TODO unused interface? -public interface IPacket { - - Packet getPacket(); -} 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 34085af1..00000000 --- a/src/main/java/binnie/core/network/packet/IndexInPayload.java +++ /dev/null @@ -1,15 +0,0 @@ -package binnie.core.network.packet; - -// TODO unused class? -public class IndexInPayload { - - public int intIndex; - public int floatIndex; - public int stringIndex; - - public IndexInPayload(int intIndex, int floatIndex, int stringIndex) { - this.intIndex = intIndex; - this.floatIndex = floatIndex; - this.stringIndex = stringIndex; - } -} diff --git a/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java b/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java index 64dca339..833a70f2 100644 --- a/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java @@ -8,8 +8,4 @@ public class MessageContainerUpdate extends MessageCraftGUI { super(nbt); } - // TODO unused constructor? - public MessageContainerUpdate(MessageBinnie message) { - super(message); - } } diff --git a/src/main/java/binnie/core/network/packet/MessageCoordinates.java b/src/main/java/binnie/core/network/packet/MessageCoordinates.java index c5161f2d..5eb89570 100644 --- a/src/main/java/binnie/core/network/packet/MessageCoordinates.java +++ b/src/main/java/binnie/core/network/packet/MessageCoordinates.java @@ -1,12 +1,9 @@ package binnie.core.network.packet; -import java.io.IOException; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; - import io.netty.buffer.ByteBuf; +import java.io.IOException; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class MessageCoordinates extends MessageBase { @@ -18,11 +15,6 @@ public class MessageCoordinates extends MessageBase { super(message); } - // TODO unused constructor? - public MessageCoordinates(int id, ChunkCoordinates coordinates) { - this(id, coordinates.posX, coordinates.posY, coordinates.posZ); - } - public MessageCoordinates(int id, int posX, int posY, int posZ) { super(id); this.posX = posX; @@ -44,11 +36,6 @@ public class MessageCoordinates extends MessageBase { posZ = data.readInt(); } - // TODO unused method? - public ChunkCoordinates getCoordinates() { - return new ChunkCoordinates(posX, posY, posZ); - } - public TileEntity getTileEntity(World world) { return world.getTileEntity(posX, posY, posZ); } diff --git a/src/main/java/binnie/core/network/packet/MessageUpdate.java b/src/main/java/binnie/core/network/packet/MessageUpdate.java index 7c290358..4c239982 100644 --- a/src/main/java/binnie/core/network/packet/MessageUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageUpdate.java @@ -1,13 +1,10 @@ package binnie.core.network.packet; -import java.io.IOException; -import java.nio.charset.StandardCharsets; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - import binnie.core.network.INetworkedEntity; import io.netty.buffer.ByteBuf; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import net.minecraft.tileentity.TileEntity; public class MessageUpdate extends MessageCoordinates { @@ -75,8 +72,4 @@ public class MessageUpdate extends MessageCoordinates { } } - // TODO unused method? - public TileEntity getTarget(World world) { - return world.getTileEntity(posX, posY, posZ); - } } diff --git a/src/main/java/binnie/core/network/packet/PacketPayload.java b/src/main/java/binnie/core/network/packet/PacketPayload.java index 002c2689..6c26780f 100644 --- a/src/main/java/binnie/core/network/packet/PacketPayload.java +++ b/src/main/java/binnie/core/network/packet/PacketPayload.java @@ -3,8 +3,6 @@ package binnie.core.network.packet; import java.util.ArrayList; import java.util.List; -import binnie.core.network.INetworkedEntity; - public class PacketPayload { public List intPayload; @@ -17,12 +15,6 @@ public class PacketPayload { stringPayload = new ArrayList<>(); } - // TODO unused constructor? - public PacketPayload(INetworkedEntity tile) { - this(); - tile.writeToPacket(this); - } - public void addInteger(int a) { intPayload.add(a); } @@ -47,16 +39,6 @@ public class PacketPayload { return stringPayload.remove(0); } - // TODO unused method - public void append(PacketPayload other) { - if (other == null) { - return; - } - intPayload.addAll(other.intPayload); - floatPayload.addAll(other.floatPayload); - stringPayload.addAll(other.stringPayload); - } - public boolean isEmpty() { return intPayload.isEmpty() && floatPayload.isEmpty() && stringPayload.isEmpty(); } diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index 6784007e..5edfd549 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -1,7 +1,14 @@ package binnie.core.proxy; +import binnie.core.AbstractMod; +import binnie.core.BinnieCore; +import binnie.core.network.BinnieCorePacketID; +import binnie.core.network.INetworkedEntity; +import binnie.core.network.packet.MessageUpdate; +import binnie.core.resource.BinnieResource; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import java.io.File; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -13,16 +20,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; -import binnie.core.AbstractMod; -import binnie.core.BinnieCore; -import binnie.core.network.BinnieCorePacketID; -import binnie.core.network.INetworkedEntity; -import binnie.core.network.packet.MessageUpdate; -import binnie.core.resource.BinnieResource; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.registry.GameRegistry; - public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { private short uniqueTextureUID; @@ -69,11 +66,6 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { return null; } - // TODO unused method? - public void throwException(String message, Throwable e) { - FMLCommonHandler.instance().raiseException(e, message, true); - } - @Override public Minecraft getMinecraftInstance() { return null; @@ -129,16 +121,6 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { return null; } - // TODO unused method? - public void handleTextureRefresh(IIconRegister register, int type) { - // ignored - } - - // TODO unused method? - public void handlePostTextureRefresh(IIconRegister register, int type) { - // ignored - } - public short getUniqueTextureUID() { uniqueTextureUID++; return uniqueTextureUID; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index a326878c..087262b6 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -1,8 +1,14 @@ package binnie.core.proxy; +import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; +import binnie.core.resource.BinnieResource; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import java.io.File; import java.io.IOException; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.SimpleTexture; @@ -17,19 +23,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; - import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import binnie.Binnie; -import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; -import binnie.core.resource.BinnieResource; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.GameRegistry; - public class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { @Override @@ -139,13 +135,6 @@ public class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { return Minecraft.getMinecraft().thePlayer; } - // TODO unused method? - public void handlePreTextureRefresh(IIconRegister register, int type) { - if (type == 0) { - Binnie.Liquid.reloadIcons(register); - } - } - @Override public void preInit() { IResourceManager manager = Minecraft.getMinecraft().getResourceManager(); diff --git a/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java b/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java index f8d44ad1..fad2f81b 100644 --- a/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java +++ b/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java @@ -1,10 +1,7 @@ package binnie.extrabees.apiary; -import net.minecraft.item.ItemStack; - import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; -import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; @@ -61,21 +58,11 @@ public class ComponentBeeModifier extends MachineComponent implements IBeeModifi return false; } - // TODO unused method? - public void onQueenChange(ItemStack queen) { - // ignored - } - @Override public void wearOutEquipment(int amount) { // ignored } - // TODO unused method? - public boolean onEggLaid(IBee queen) { - return false; - } - @Override public float getGeneticDecay(IBeeGenome genome, float currentModifier) { return 1.0f; diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java index edc0f62f..dd93350c 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java @@ -1,20 +1,5 @@ package binnie.extratrees.genetics; -import java.awt.Color; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; -import net.minecraftforge.common.EnumPlantType; - -import com.mojang.authlib.GameProfile; - import binnie.Binnie; import binnie.core.Mods; import binnie.core.util.I18N; @@ -80,6 +65,7 @@ import binnie.extratrees.worldgen.WorldGenWesternHemlock; import binnie.extratrees.worldgen.WorldGenWhitebeam; import binnie.extratrees.worldgen.WorldGenYew; import binnie.genetics.genetics.AlleleHelper; +import com.mojang.authlib.GameProfile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeChromosome; @@ -106,6 +92,16 @@ import forestry.arboriculture.render.TextureLeaves; import forestry.core.genetics.alleles.EnumAllele; import forestry.core.render.TextureManager; import forestry.plugins.PluginArboriculture; +import java.awt.Color; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraftforge.common.EnumPlantType; public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGermlingIconProvider { @@ -690,19 +686,6 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm .setFertility(EnumAllele.Saplings.LOW).setMaturation(EnumAllele.Maturation.SLOWER); } - // TODO unused method? - static ItemStack getEBXLStack(String name) { - try { - Class elements = Class.forName("extrabiomes.lib.Element"); - Method getElementMethod = elements.getMethod("valueOf", String.class); - Method getItemStack = elements.getMethod("get"); - Object element = getElementMethod.invoke(null, "SAPLING_AUTUMN_YELLOW"); - return (ItemStack) getItemStack.invoke(element); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - private ExtraTreeSpecies addFamily(IFruitFamily family) { families.add(family); return this;