From 04514282c08ebefdb3e68a46db34092f72be2316 Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 17 May 2023 00:01:01 +0900 Subject: Remove a lot of unused classes (#629) --- .../gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java | 37 ------- .../xmod/ic2/item/IC2_ItemGradualInteger.java | 47 -------- .../java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java | 73 ------------- .../gtPlusPlus/xmod/ic2/item/ItemGenerators.java | 53 --------- .../java/gtPlusPlus/xmod/ic2/item/RotorBase.java | 94 ---------------- .../gtPlusPlus/xmod/ic2/item/RotorIridium.java | 118 --------------------- .../xmod/ic2/item/reactor/IC2_FuelRod_Base.java | 52 --------- 7 files changed, 474 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java (limited to 'src/main/java/gtPlusPlus/xmod/ic2/item') diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java deleted file mode 100644 index 1ce01a5985..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java +++ /dev/null @@ -1,37 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.CoreItem; - -public class IC2_ItemGradual extends CoreItem { - - public IC2_ItemGradual(final String internalName) { - super(internalName, AddToCreativeTab.tabMachines, 1, 10000, "", EnumRarity.uncommon); - this.setNoRepair(); - } - - @Override - public boolean isDamaged(final ItemStack stack) { - return this.getDamage(stack) > 1; - } - - @Override - public boolean showDurabilityBar(final ItemStack stack) { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(final Item item, final CreativeTabs tabs, final List itemList) { - itemList.add(new ItemStack(this, 1, 1)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java deleted file mode 100644 index 817a902813..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java +++ /dev/null @@ -1,47 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import ic2.api.item.ICustomDamageItem; -import ic2.core.util.StackUtil; - -public class IC2_ItemGradualInteger extends IC2_ItemGradual implements ICustomDamageItem { - - private final int maxDmg; - - public IC2_ItemGradualInteger(final String internalName, final int maxdmg) { - super(internalName); - - this.maxDmg = maxdmg; - } - - @Override - public int getCustomDamage(final ItemStack stack) { - final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); - return nbt.getInteger("advDmg"); - } - - @Override - public int getMaxCustomDamage(final ItemStack stack) { - return this.maxDmg; - } - - @Override - public void setCustomDamage(final ItemStack stack, final int damage) { - final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); - nbt.setInteger("advDmg", 0); - - final int maxStackDamage = stack.getMaxDamage(); - if (maxStackDamage > 2) { - // stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2)); - } - } - - @Override - public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src) { - this.setCustomDamage(stack, this.getCustomDamage(stack) + damage); - return true; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java deleted file mode 100644 index 98846e6950..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java +++ /dev/null @@ -1,73 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; - -public class IC2_ItemIC2 extends Item { - - public IC2_ItemIC2(final String internalName) { - this.setUnlocalizedName(internalName); - this.setCreativeTab(AddToCreativeTab.tabMachines); - this.setTextureName(GTPlusPlus.ID + ":" + internalName); - - GameRegistry.registerItem(this, internalName); - } - - public String getTextureFolder() { - return null; - } - - /* - * public String getTextureName(int index) { if ((!this.hasSubtypes) && (index > 0)) { return null; } String name = - * getUnlocalizedName(new ItemStack(this, 1, index)); if ((name != null) && (name.length() > 4)) { return - * name.substring(4); } return name; } - * @Override - * @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { int indexCount = 0; while - * (getTextureName(indexCount) != null) { indexCount++; if (indexCount > 32767) { throw new - * RuntimeException("More Item Icons than actually possible @ " + getUnlocalizedName()); } } this.textures = new - * IIcon[indexCount]; for (int index = 0; index < indexCount; index++) { this.textures[index] = - * iconRegister.registerIcon(GTPlusPlus.ID + ":" + getUnlocalizedName()); } } - * @Override - * @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int meta) { if (meta < this.textures.length) { return - * this.textures[meta]; } return this.textures.length < 1 ? null : this.textures[0]; } - */ - - @Override - public String getUnlocalizedName() { - return super.getUnlocalizedName(); - } - - @Override - public String getUnlocalizedName(final ItemStack itemStack) { - return this.getUnlocalizedName(); - } - - @Override - public String getItemStackDisplayName(final ItemStack itemStack) { - return StatCollector.translateToLocal(this.getUnlocalizedName(itemStack)); - } - - public IC2_ItemIC2 setRarity(final int aRarity) { - this.rarity = aRarity; - return this; - } - - @Override - @SideOnly(Side.CLIENT) - public EnumRarity getRarity(final ItemStack stack) { - return EnumRarity.values()[this.rarity]; - } - - private int rarity = 0; - protected IIcon[] textures; -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java b/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java deleted file mode 100644 index e5809a0c98..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java +++ /dev/null @@ -1,53 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import ic2.core.item.block.ItemBlockIC2; - -public class ItemGenerators extends ItemBlockIC2 { - - public ItemGenerators(final Block block) { - super(block); - - this.setMaxDamage(0); - this.setHasSubtypes(true); - } - - @Override - public int getMetadata(final int i) { - return i; - } - - @Override - public String getUnlocalizedName(final ItemStack itemstack) { - final int meta = itemstack.getItemDamage(); - switch (meta) { - case 0: - return "ic2.blockRTGenerator2"; - case 1: - return "ic2.blockKineticGenerator2"; - } - return null; - } - - @Override - public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) { - final int meta = itemStack.getItemDamage(); - switch (meta) { - case 0: - info.add( - StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-32 EU/t " - + StatCollector.translateToLocal("ic2.item.tooltip.max")); - break; - case 1: - info.add( - StatCollector.translateToLocal("ic2.item.tooltip.PowerOutput") + " 1-512 EU/t " - + StatCollector.translateToLocal("ic2.item.tooltip.max")); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java deleted file mode 100644 index 7ceb5b625f..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java +++ /dev/null @@ -1,94 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import ic2.api.item.IKineticRotor; -import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator; -import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; -import ic2.core.init.InternalName; -import ic2.core.item.resources.ItemWindRotor; - -public class RotorBase extends ItemWindRotor { - - private final int maxWindStrength; - private final int minWindStrength; - private final int radius; - private final float efficiency; - private final ResourceLocation renderTexture; - private final boolean water; - - public RotorBase(final InternalName internalName, final int Radius, final int durability, final float efficiency, - final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture) { - super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture); - - this.setMaxStackSize(1); - this.setMaxDamage(durability); - - this.radius = Radius; - this.efficiency = efficiency; - this.renderTexture = RenderTexture; - this.minWindStrength = minWindStrength; - this.maxWindStrength = maxWindStrength; - this.water = true; - } - - @Override - public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) { - info.add( - StatCollector.translateToLocalFormatted( - "ic2.itemrotor.wind.info", - new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) })); - IKineticRotor.GearboxType type = null; - if ((Minecraft.getMinecraft().currentScreen != null) - && ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) { - type = IKineticRotor.GearboxType.WATER; - } else if ((Minecraft.getMinecraft().currentScreen != null) - && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) { - type = IKineticRotor.GearboxType.WIND; - } - if (type != null) { - // info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type))); - } - } - - @Override - public String getTextureFolder() { - return "rotors"; - } - - @Override - public int getDiameter(final ItemStack stack) { - return this.radius; - } - - @Override - public ResourceLocation getRotorRenderTexture(final ItemStack stack) { - return this.renderTexture; - } - - @Override - public float getEfficiency(final ItemStack stack) { - return this.efficiency; - } - - @Override - public int getMinWindStrength(final ItemStack stack) { - return this.minWindStrength; - } - - @Override - public int getMaxWindStrength(final ItemStack stack) { - return this.maxWindStrength; - } - - @Override - public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type) { - return (type == IKineticRotor.GearboxType.WIND) || (this.water); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java deleted file mode 100644 index 410b106831..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java +++ /dev/null @@ -1,118 +0,0 @@ -package gtPlusPlus.xmod.ic2.item; - -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import ic2.api.item.IKineticRotor; -import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator; -import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; -import ic2.core.init.InternalName; -import ic2.core.util.StackUtil; - -public class RotorIridium extends RotorBase { - - private final int maxWindStrength; - private final int minWindStrength; - private final int radius; - private final float efficiency; - private final ResourceLocation renderTexture; - private final boolean water; - - public RotorIridium(final InternalName internalName, final int Radius, final int durability, final float efficiency, - final int minWindStrength, final int maxWindStrength, final ResourceLocation RenderTexture) { - super(internalName, Radius, durability, efficiency, minWindStrength, maxWindStrength, RenderTexture); - - this.setMaxStackSize(1); - this.setMaxDamage(Integer.MAX_VALUE); - - this.radius = Radius; - this.efficiency = efficiency; - this.renderTexture = RenderTexture; - this.minWindStrength = minWindStrength; - this.maxWindStrength = maxWindStrength; - this.water = (internalName != InternalName.itemwoodrotor); - } - - @Override - public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) { - info.add( - StatCollector.translateToLocalFormatted( - "ic2.itemrotor.wind.info", - new Object[] { Integer.valueOf(this.minWindStrength), Integer.valueOf(this.maxWindStrength) })); - IKineticRotor.GearboxType type = null; - if ((Minecraft.getMinecraft().currentScreen != null) - && ((Minecraft.getMinecraft().currentScreen instanceof GuiWaterKineticGenerator))) { - type = IKineticRotor.GearboxType.WATER; - } else if ((Minecraft.getMinecraft().currentScreen != null) - && ((Minecraft.getMinecraft().currentScreen instanceof GuiWindKineticGenerator))) { - type = IKineticRotor.GearboxType.WIND; - } - if (type != null) { - // info.add(StatCollector.translateToLocal("ic2.itemrotor.fitsin." + isAcceptedType(itemStack, type))); - } - } - - @Override - public String getTextureFolder() { - return "rotors"; - } - - @Override - public int getDiameter(final ItemStack stack) { - return this.radius; - } - - @Override - public ResourceLocation getRotorRenderTexture(final ItemStack stack) { - return this.renderTexture; - } - - @Override - public float getEfficiency(final ItemStack stack) { - return this.efficiency; - } - - @Override - public int getMinWindStrength(final ItemStack stack) { - return this.minWindStrength; - } - - @Override - public int getMaxWindStrength(final ItemStack stack) { - return this.maxWindStrength; - } - - @Override - public boolean isAcceptedType(final ItemStack stack, final IKineticRotor.GearboxType type) { - return (type == IKineticRotor.GearboxType.WIND) || (this.water); - } - - @Override - public void setCustomDamage(final ItemStack stack, final int damage) { - final NBTTagCompound nbt = StackUtil.getOrCreateNbtData(stack); - nbt.setInteger("advDmg", 0); - - final int maxStackDamage = stack.getMaxDamage(); - if (maxStackDamage > 2) { - // stack.setItemDamage(1 + (int)Util.map(damage, this.maxDmg, maxStackDamage - 2)); - } - } - - @Override - public boolean applyCustomDamage(final ItemStack stack, final int damage, final EntityLivingBase src) { - this.setCustomDamage(stack, this.getCustomDamage(stack) + damage); - return true; - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java b/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java deleted file mode 100644 index 69c08a0095..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java +++ /dev/null @@ -1,52 +0,0 @@ -package gtPlusPlus.xmod.ic2.item.reactor; - -import net.minecraft.item.ItemStack; - -import ic2.api.reactor.IReactor; -import ic2.api.reactor.IReactorComponent; - -public class IC2_FuelRod_Base implements IReactorComponent { - - @Override - public void processChamber(IReactor var1, ItemStack var2, int var3, int var4, boolean var5) { - // TODO Auto-generated method stub - - } - - @Override - public boolean acceptUraniumPulse(IReactor var1, ItemStack var2, ItemStack var3, int var4, int var5, int var6, - int var7, boolean var8) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean canStoreHeat(IReactor var1, ItemStack var2, int var3, int var4) { - // TODO Auto-generated method stub - return false; - } - - @Override - public int getMaxHeat(IReactor var1, ItemStack var2, int var3, int var4) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int getCurrentHeat(IReactor var1, ItemStack var2, int var3, int var4) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int alterHeat(IReactor var1, ItemStack var2, int var3, int var4, int var5) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public float influenceExplosion(IReactor var1, ItemStack var2) { - // TODO Auto-generated method stub - return 0; - } -} -- cgit