diff options
Diffstat (limited to 'src/main/java/gregtech/api')
20 files changed, 0 insertions, 737 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 5ecf39a722..ac1aeeb7b2 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -87,10 +87,6 @@ public enum ItemList implements IItemContainer { IC2_Compressed_Coal_Ball, IC2_Compressed_Coal_Chunk, IC2_Fuel_Rod_Empty, - @Deprecated - IC2_Fuel_Can_Empty(true), - @Deprecated - IC2_Fuel_Can_Filled(true), IC2_Food_Can_Empty, IC2_Food_Can_Filled, IC2_Food_Can_Spoiled, diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index e86b0ee9b1..e9294e7258 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -180,7 +180,6 @@ public enum OrePrefixes { B[1], M * 3, 64, 19), plateDouble("2x Plates", "Double ", " Plate", true, true, false, false, false, false, true, true, false, false, B[1], M * 2, 64, 18), - /** Regular Plate made of one Ingot/Dust. Introduced by Calclavia */ plate("Plates", "", " Plate", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M * 1, 64, 17), /** Casing made of 1/2 Ingot/Dust */ @@ -245,7 +244,6 @@ public enum OrePrefixes { /** Hot Cell full of molten stuff, which can be used in the Plasma Generator. */ cellMolten("Cells of Molten stuff", "Molten ", " Cell", true, true, true, true, false, false, false, true, false, false, 0, M * 1, 64, 31), - /** Regular Gas/Fluid Cell. Introduced by Calclavia */ cell("Cells", "", " Cell", true, true, true, true, false, false, true, true, false, false, B[4] | B[8], M * 1, 64, 30), /** A vanilla Iron Bucket filled with the Material. */ @@ -517,10 +515,8 @@ public enum OrePrefixes { */ batterySingleuse("Single Use Batteries", "", "", false, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), - /** Introduced by Calclavia */ battery("Reusable Batteries", "", "", false, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), - /** Introduced by Calclavia */ circuit("Circuits", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), /** Introduced by Buildcraft */ chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), diff --git a/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java b/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java index 85e56d9b52..304e792a2a 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java +++ b/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java @@ -60,14 +60,6 @@ public class GT_GUIColorOverride { cmSection = null; } - /** - * @deprecated use {@link #get(String)} instead. - */ - @Deprecated - public GT_GUIColorOverride(String guiTexturePath) { - this(new ResourceLocation(guiTexturePath)); - } - private GT_GUIColorOverride(ResourceLocation resourceLocation) { try { Object metadata = cache.get(resourceLocation); diff --git a/src/main/java/gregtech/api/interfaces/IHasFluidDisplayItem.java b/src/main/java/gregtech/api/interfaces/IHasFluidDisplayItem.java deleted file mode 100644 index e7435dd14b..0000000000 --- a/src/main/java/gregtech/api/interfaces/IHasFluidDisplayItem.java +++ /dev/null @@ -1,7 +0,0 @@ -package gregtech.api.interfaces; - -@Deprecated -public interface IHasFluidDisplayItem { - - void updateFluidDisplayItem(); -} diff --git a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java deleted file mode 100644 index 6d84a64e0a..0000000000 --- a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java +++ /dev/null @@ -1,49 +0,0 @@ -package gregtech.api.items; - -import static gregtech.api.enums.GT_Values.W; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.ToolDictNames; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; - -public class GT_SolderingTool_Item extends GT_Tool_Item { - - public GT_SolderingTool_Item(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, - int aDischargedGTID) { - super( - aUnlocalized, - aEnglish, - "To repair and construct Circuitry", - aMaxDamage, - aEntityDamage, - true, - -1, - aDischargedGTID); - GT_OreDictUnificator.registerOre(ToolDictNames.craftingToolSolderingIron, new ItemStack(this, 1, W)); - GregTech_API.registerSolderingTool(new ItemStack(this, 1, W)); - } - - @Override - public void addAdditionalToolTips(List<String> aList, ItemStack aStack, EntityPlayer aPlayer) { - aList.add( - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Sets the Strength of outputted Redstone")); - aList.add( - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Needs Soldering Metal in Inventory!")); - } - - @Override - public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, - int ordinalSide, float hitX, float hitY, float hitZ) { - super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ); - return false; - } -} diff --git a/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java deleted file mode 100644 index 0716ca9dc1..0000000000 --- a/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java +++ /dev/null @@ -1,66 +0,0 @@ -package gregtech.api.items; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import gregtech.api.enums.SoundResource; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; - -public class GT_Spray_Bug_Item extends GT_Tool_Item { - - public GT_Spray_Bug_Item(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { - super( - aUnlocalized, - aEnglish, - "A very 'buggy' Spray", - aMaxDamage, - aEntityDamage, - true); /* - * addToEffectiveList(EntityCaveSpider.class.getName()); - * addToEffectiveList(EntitySpider.class.getName()); addToEffectiveList("EntityTFHedgeSpider"); - * addToEffectiveList("EntityTFKingSpider"); addToEffectiveList("EntityTFSwarmSpider"); - * addToEffectiveList("EntityTFTowerBroodling"); addToEffectiveList("EntityTFFireBeetle"); - * addToEffectiveList("EntityTFSlimeBeetle"); setCraftingSound(Sounds.IC2_TOOLS_PAINTER); - * setBreakingSound(Sounds.IC2_TOOLS_PAINTER); setEntityHitSound(Sounds.IC2_TOOLS_PAINTER); - * setUsageAmounts(8, 4, 1); - */ - } - - /* - * @Override public void onHitEntity(Entity aEntity) { if (aEntity instanceof EntityLiving) { - * ((EntityLiving)aEntity).addPotionEffect(new PotionEffect(Potion.poison.getId(), 60, 1, false)); - * ((EntityLiving)aEntity).addPotionEffect(new PotionEffect(Potion.confusion.getId(), 600, 1, false)); } } - * @Override public ItemStack getEmptiedItem(ItemStack aStack) { return ItemList.Spray_Empty.get(1); } - */ - @Override - public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, - int ordinalSide, float hitX, float hitY, float hitZ) { - super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ); - if (aWorld.isRemote) { - return false; - } - Block aBlock = aWorld.getBlock(aX, aY, aZ); - if (aBlock == null) return false; - // byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); - TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - - try { - if (aTileEntity instanceof ic2.api.crops.ICropTile) { - int tCropBefore = ((ic2.api.crops.ICropTile) aTileEntity).getWeedExStorage(); - if (tCropBefore <= 100 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - ((ic2.api.crops.ICropTile) aTileEntity).setWeedExStorage(tCropBefore + 100); - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - return true; - } - } - } catch (Throwable e) { - /* Do nothing */ - } - - return false; - } -} diff --git a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java deleted file mode 100644 index 6bdca0da1c..0000000000 --- a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java +++ /dev/null @@ -1,156 +0,0 @@ -package gregtech.api.items; - -import static gregtech.api.enums.GT_Values.D1; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.enums.SoundResource; -import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; - -public class GT_Spray_Foam_Item extends GT_Tool_Item { - - public GT_Spray_Foam_Item(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { - super( - aUnlocalized, - aEnglish, - "Precision Spray", - aMaxDamage, - aEntityDamage, - true); /* - * setCraftingSound(Sounds.IC2_TOOLS_PAINTER); setBreakingSound(Sounds.IC2_TOOLS_PAINTER); - * setEntityHitSound(Sounds.IC2_TOOLS_PAINTER); setUsageAmounts(25, 3, 1); - */ - } - - @Override - public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, - int ordinalSide, float hitX, float hitY, float hitZ) { - super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ); - if (aPlayer.isSneaking()) return false; - if (aWorld.isRemote) { - return false; - } - Block aBlock = aWorld.getBlock(aX, aY, aZ); - if (aBlock == null) return false; - // byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); - TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - - try { - if (GT_Utility.getClassName(aTileEntity) - .startsWith("TileEntityCable")) { - if (GT_Utility.getPublicField(aTileEntity, "foamed") - .getByte(aTileEntity) == 0) { - if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - GT_Utility.callPublicMethod(aTileEntity, "changeFoam", (byte) 1); - return true; - } - } - return false; - } - } catch (Throwable e) { - if (D1) e.printStackTrace(GT_Log.err); - } - - if (aTileEntity instanceof BaseMetaPipeEntity && (((BaseMetaPipeEntity) aTileEntity).mConnections & -64) == 0) { - if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - ((BaseMetaPipeEntity) aTileEntity).mConnections |= 64; - } - return true; - } - - aX += ForgeDirection.getOrientation(ordinalSide).offsetX; - aY += ForgeDirection.getOrientation(ordinalSide).offsetY; - aZ += ForgeDirection.getOrientation(ordinalSide).offsetZ; - - ItemStack tStack = GT_ModHandler.getIC2Item("constructionFoam", 1); - if (tStack != null && tStack.getItem() instanceof ItemBlock) { - int tRotationPitch = Math.round(aPlayer.rotationPitch); - byte tSide = 0; - if (tRotationPitch >= 65) { - tSide = 1; - } else if (tRotationPitch <= -65) { - tSide = 0; - } else { - tSide = switch (MathHelper.floor_double((aPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) { - case 0 -> 2; - case 1 -> 5; - case 2 -> 3; - case 3 -> 4; - default -> tSide; - }; - } - switch (0) { - case 0 -> { - if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) - && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - aWorld.setBlock(aX, aY, aZ, GT_Utility.getBlockFromStack(tStack), tStack.getItemDamage(), 3); - return true; - } - } - case 1 -> { - for (byte i = 0; i < 4; i++) { - if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) - && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - aWorld - .setBlock(aX, aY, aZ, GT_Utility.getBlockFromStack(tStack), tStack.getItemDamage(), 3); - } else { - if (i == 0) return false; - break; - } - aX -= ForgeDirection.getOrientation(tSide).offsetX; - aY -= ForgeDirection.getOrientation(tSide).offsetY; - aZ -= ForgeDirection.getOrientation(tSide).offsetZ; - } - return true; - } - case 2 -> { - boolean temp = false, tXFactor = (ForgeDirection.getOrientation(tSide).offsetX == 0), - tYFactor = (ForgeDirection.getOrientation(tSide).offsetY == 0), - tZFactor = (ForgeDirection.getOrientation(tSide).offsetZ == 0); - aX -= (tXFactor ? 1 : 0); - aY -= (tYFactor ? 1 : 0); - aZ -= (tZFactor ? 1 : 0); - for (byte i = 0; i < 3; i++) for (byte j = 0; j < 3; j++) { - if (GT_Utility.isBlockAir( - aWorld, - aX + (tXFactor ? i : 0), - aY + (!tXFactor && tYFactor ? i : 0) + (!tZFactor && tYFactor ? j : 0), - aZ + (tZFactor ? j : 0))) { - if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - aWorld.setBlock( - aX + (tXFactor ? i : 0), - aY + (!tXFactor && tYFactor ? i : 0) + (!tZFactor && tYFactor ? j : 0), - aZ + (tZFactor ? j : 0), - GT_Utility.getBlockFromStack(tStack), - tStack.getItemDamage(), - 3); - temp = true; - } else { - break; - } - } - } - return temp; - } - } - } - return false; - } -} diff --git a/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java deleted file mode 100644 index 2fecc77c14..0000000000 --- a/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java +++ /dev/null @@ -1,86 +0,0 @@ -package gregtech.api.items; - -import static gregtech.api.enums.GT_Values.D1; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import gregtech.api.enums.SoundResource; -import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; - -public class GT_Spray_Hardener_Item extends GT_Tool_Item { - - public GT_Spray_Hardener_Item(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { - super( - aUnlocalized, - aEnglish, - "Construction Foam Hardener", - aMaxDamage, - aEntityDamage, - true); /* - * setCraftingSound(Sounds.IC2_TOOLS_PAINTER); setBreakingSound(Sounds.IC2_TOOLS_PAINTER); - * setEntityHitSound(Sounds.IC2_TOOLS_PAINTER); setUsageAmounts(16, 3, 1); - */ - } - - @Override - public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, - int ordinalSide, float hitX, float hitY, float hitZ) { - super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ); - if (aWorld.isRemote) { - return false; - } - Block aBlock = aWorld.getBlock(aX, aY, aZ); - if (aBlock == null) return false; - // byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); - TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - - try { - if (GT_Utility.getClassName(aTileEntity) - .startsWith("TileEntityCable")) { - if (GT_Utility.getPublicField(aTileEntity, "foamed") - .getByte(aTileEntity) == 1) { - if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - GT_Utility.callPublicMethod(aTileEntity, "changeFoam", (byte) 2); - return true; - } - } - return false; - } - } catch (Throwable e) { - if (D1) e.printStackTrace(GT_Log.err); - } - - ItemStack tStack1 = GT_ModHandler.getIC2Item("constructionFoam", 1), - tStack2 = GT_ModHandler.getIC2Item("constructionFoamWall", 1); - if (tStack1 != null && tStack1.isItemEqual(new ItemStack(aBlock)) - && tStack2 != null - && tStack2.getItem() instanceof ItemBlock) { - if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - aWorld.setBlock(aX, aY, aZ, GT_Utility.getBlockFromStack(tStack2), 7, 3); - } - return true; - } - - if (aTileEntity instanceof BaseMetaPipeEntity - && (((BaseMetaPipeEntity) aTileEntity).mConnections & -64) == 64) { - if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - ((BaseMetaPipeEntity) aTileEntity).mConnections = (byte) ((((BaseMetaPipeEntity) aTileEntity).mConnections - & ~64) | -128); - } - return true; - } - - return false; - } -} diff --git a/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java deleted file mode 100644 index 6589beb94c..0000000000 --- a/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java +++ /dev/null @@ -1,64 +0,0 @@ -package gregtech.api.items; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import gregtech.api.enums.SoundResource; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; - -public class GT_Spray_Hydration_Item extends GT_Tool_Item { - - public GT_Spray_Hydration_Item(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { - super( - aUnlocalized, - aEnglish, - "To hydrate Crops and similar", - aMaxDamage, - aEntityDamage, - true); /* - * setCraftingSound(Sounds.IC2_TOOLS_PAINTER); setBreakingSound(Sounds.IC2_TOOLS_PAINTER); - * setEntityHitSound(Sounds.IC2_TOOLS_PAINTER); setUsageAmounts(20, 3, 1); - */ - } - - @Override - public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, - int ordinalSide, float hitX, float hitY, float hitZ) { - super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ); - if (aWorld.isRemote) { - return false; - } - Block aBlock = aWorld.getBlock(aX, aY, aZ); - if (aBlock == null) return false; - // byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); - TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - - try { - if (aTileEntity instanceof ic2.api.crops.ICropTile) { - int tCropBefore = ((ic2.api.crops.ICropTile) aTileEntity).getHydrationStorage(); - if (tCropBefore <= 100 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - ((ic2.api.crops.ICropTile) aTileEntity).setHydrationStorage(tCropBefore + 100); - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - } - return true; - } - } catch (Throwable e) { - /* Do nothing */ - } - - if (aTileEntity instanceof IGregTechTileEntity) { - if (((IGregTechTileEntity) aTileEntity).getColorization() >= 0 - && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - ((IGregTechTileEntity) aTileEntity).setColorization((byte) -1); - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - } - } - - return false; - } -} diff --git a/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java deleted file mode 100644 index dab2515b72..0000000000 --- a/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java +++ /dev/null @@ -1,87 +0,0 @@ -package gregtech.api.items; - -import static gregtech.api.enums.GT_Values.W; - -import java.util.Arrays; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SoundResource; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; - -public class GT_Spray_Ice_Item extends GT_Tool_Item { - - public GT_Spray_Ice_Item(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { - super( - aUnlocalized, - aEnglish, - "Very effective against Slimes", - aMaxDamage, - aEntityDamage, - true); /* - * addToEffectiveList(EntitySlime.class.getName()); addToEffectiveList("BlueSlime"); - * addToEffectiveList("SlimeClone"); addToEffectiveList("MetalSlime"); - * addToEffectiveList("EntityTFFireBeetle"); addToEffectiveList("EntityTFMazeSlime"); - * addToEffectiveList("EntityTFSlimeBeetle"); setCraftingSound(Sounds.IC2_TOOLS_PAINTER); - * setBreakingSound(Sounds.IC2_TOOLS_PAINTER); setEntityHitSound(Sounds.IC2_TOOLS_PAINTER); - * setUsageAmounts(4, 16, 1); - */ - - for (Object tName : Arrays.asList( - OrePrefixes.bucket.get(Materials.Water), - OrePrefixes.cell.get(Materials.Water), - OrePrefixes.capsule.get(Materials.Water))) { - GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Blocks.ice, 1, 0), - new Object[] { new ItemStack(this, 1, W), tName }); - } - } - /* - * @Override public void onHitEntity(Entity aEntity) { if (aEntity instanceof EntityLiving) { - * ((EntityLiving)aEntity).addPotionEffect(new PotionEffect(Potion.weakness.getId(), 400, 2, false)); - * ((EntityLiving)aEntity).addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 400, 2, false)); } } - */ - - @Override - public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, - int ordinalSide, float hitX, float hitY, float hitZ) { - super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ); - if (aWorld.isRemote) { - return false; - } - aX += ForgeDirection.getOrientation(ordinalSide).offsetX; - aY += ForgeDirection.getOrientation(ordinalSide).offsetY; - aZ += ForgeDirection.getOrientation(ordinalSide).offsetZ; - Block aBlock = aWorld.getBlock(aX, aY, aZ); - if (aBlock == null) return false; - byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ); - // TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - - if (aBlock == Blocks.water || aBlock == Blocks.flowing_water) { - if (aMeta == 0 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - aWorld.setBlock(aX, aY, aZ, Blocks.ice, 0, 3); - return true; - } - return false; - } - - if (aBlock == Blocks.lava || aBlock == Blocks.flowing_lava) { - if (aMeta == 0 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); - aWorld.setBlock(aX, aY, aZ, Blocks.obsidian, 0, 3); - return true; - } - return false; - } - return false; - } -} diff --git a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java deleted file mode 100644 index 81517daa0e..0000000000 --- a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java +++ /dev/null @@ -1,58 +0,0 @@ -package gregtech.api.items; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import gregtech.api.util.GT_LanguageManager; - -public class GT_Spray_Pepper_Item extends GT_Tool_Item { - - public GT_Spray_Pepper_Item(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { - super( - aUnlocalized, - aEnglish, - "To defend yourself against Bears", - aMaxDamage, - aEntityDamage, - true); /* - * setCraftingSound(GregTech_API.sSoundList.get(102)); - * setBreakingSound(GregTech_API.sSoundList.get(102)); - * setEntityHitSound(GregTech_API.sSoundList.get(102)); setUsageAmounts(1, 8, 1); - */ - } - - @Override - public void addAdditionalToolTips(List<String> aList, ItemStack aStack, EntityPlayer aPlayer) { - aList.add( - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".tooltip_1", "especially Pedobears, Care Bears,")); - aList.add( - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Confession Bears, Bear Grylls")); - aList.add( - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_3", "And ofcourse Man-Bear-Pig")); - } - /* - * @Override public void onHitEntity(Entity aEntity) { if (aEntity instanceof EntityLiving) { - * ((EntityLiving)aEntity).addPotionEffect(new PotionEffect(Potion.blindness.getId(), 1200, 2, false)); - * ((EntityLiving)aEntity).addPotionEffect(new PotionEffect(Potion.poison.getId(), 120, 2, false)); - * ((EntityLiving)aEntity).addPotionEffect(new PotionEffect(Potion.weakness.getId(), 200, 2, false)); - * ((EntityLiving)aEntity).addPotionEffect(new PotionEffect(Potion.confusion.getId(), 600, 2, false)); } } - */ - - @Override - public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, - int ordinalSide, float hitX, float hitY, float hitZ) { - super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, ordinalSide, hitX, hitY, hitZ); - if (aWorld.isRemote) { - return false; - } - Block aBlock = aWorld.getBlock(aX, aY, aZ); - - return false; - } -} diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index e8f607aae1..d8c957ceab 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -718,24 +718,6 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity receiveClientEvent(GregTechTileClientEvents.CHANGE_REDSTONE_OUTPUT, aRedstoneData); } - @Deprecated - public final void receiveMetaTileEntityData(short aID, int aCover0, int aCover1, int aCover2, int aCover3, - int aCover4, int aCover5, byte aTextureData, byte aUpdateData, byte aRedstoneData, byte aColorData) { - receiveMetaTileEntityData( - aID, - aCover0, - aCover1, - aCover2, - aCover3, - aCover4, - aCover5, - aTextureData, - (byte) 0, - aUpdateData, - aRedstoneData, - aColorData); - } - @Override public boolean receiveClientEvent(int aEventID, int aValue) { super.receiveClientEvent(aEventID, aValue); diff --git a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java index 68317eea48..dd1eb24960 100644 --- a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java @@ -85,22 +85,6 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov protected boolean mRedstone = false; protected byte mStrongRedstone = 0; - /* Deprecated Cover Variables */ - @Deprecated - protected final GT_CoverBehaviorBase<?>[] mCoverBehaviors = new GT_CoverBehaviorBase<?>[] { - GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, GregTech_API.sNoBehavior, - GregTech_API.sNoBehavior, GregTech_API.sNoBehavior }; - - @Deprecated - protected int[] mCoverSides = new int[] { 0, 0, 0, 0, 0, 0 }; - - @Deprecated - protected ISerializableObject[] mCoverData = new ISerializableObject[6]; - - @Deprecated - protected final boolean[] mCoverNeedUpdate = new boolean[] { false, false, false, false, false, false }; - /* End Deprecated Cover Variables */ - protected short mID = 0; public long mTickTimer = 0; private Map<ForgeDirection, ISerializableObject> clientCoverData = new HashMap<>(); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java index bbd8f4cb5e..d09120fdef 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java @@ -22,7 +22,6 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.modularui.IAddUIWidgets; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Utility; -import gregtech.common.gui.modularui.widget.FluidDisplaySlotWidget; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! @@ -343,9 +342,4 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier protected FluidSlotWidget createFluidSlot() { return new FluidSlotWidget(fluidTank); } - - @Deprecated - protected FluidDisplaySlotWidget createDrainableFluidSlot() { - return null; - } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java index b95737bb0e..8707d0f804 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java @@ -194,15 +194,6 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch { } /** - * @return pollution success - * @deprecated replaced by {@link .polluteEnvironment(MetaTileEntity)} - */ - @Deprecated - public boolean polluteEnvironment() { - return polluteEnvironment(null); - } - - /** * @param mte The multi-block controller's {@link MetaTileEntity} MetaTileEntity is passed so newer muffler hatches * can do wacky things with the multis * @return pollution success diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index e13ad191eb..2649f9cbef 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -10,7 +10,6 @@ import static mcp.mobius.waila.api.SpecialChars.RESET; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -175,22 +174,6 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity .get(ConfigCategories.machineconfig, "MultiBlockMachines.damageFactorHigh", 0.6f); } - /** - * @deprecated Use {@link MetaTileEntity#isValid()} - */ - @Deprecated - public static boolean isValidMetaTileEntity(MetaTileEntity aMetaTileEntity) { - return aMetaTileEntity.isValid(); - } - - /** - * @deprecated Use {@link GT_Utility#filterValidMTEs} - */ - @Deprecated - public static <T extends MetaTileEntity> List<T> filterValidMetaTileEntities(Collection<T> metaTileEntities) { - return new ArrayList<>(filterValidMTEs(metaTileEntities)); - } - @Override public boolean isDisplaySecondaryDescription() { return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); diff --git a/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java b/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java index 4dc0b80b93..4c089c7203 100644 --- a/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java +++ b/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java @@ -49,11 +49,6 @@ public final class CheckRecipeResultRegistry { */ public static final CheckRecipeResult NO_RECIPE = SimpleCheckRecipeResult.ofFailure("no_recipe"); /** - * @deprecated Use either of {@link #ITEM_OUTPUT_FULL} or {@link #FLUID_OUTPUT_FULL}. - */ - @Deprecated - public static final CheckRecipeResult OUTPUT_FULL = SimpleCheckRecipeResult.ofFailure("output_full"); - /** * Cannot process recipe because item output is full. */ public static final CheckRecipeResult ITEM_OUTPUT_FULL = SimpleCheckRecipeResult.ofFailure("item_output_full"); diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java b/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java index b3c04bc233..9021a60e89 100644 --- a/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java +++ b/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java @@ -26,39 +26,6 @@ public class GT_Runnable_Sound implements Runnable { mSoundModulation = aSoundModulation; } - /** - * @deprecated Use {@link #GT_Runnable_Sound(World, double, double, double, int, ResourceLocation, float, float)} - */ - public GT_Runnable_Sound(World aWorld, int aX, int aY, int aZ, int aTimeUntilNextSound, - ResourceLocation aSoundResourceLocation, float aSoundStrength, float aSoundModulation) { - this( - aWorld, - (double) aX + 0.5D, - (double) aY + 0.5D, - (double) aZ + 0.5D, - aTimeUntilNextSound, - aSoundResourceLocation, - aSoundStrength, - aSoundModulation); - } - - /** - * @deprecated Use {@link #GT_Runnable_Sound(World, double, double, double, int, ResourceLocation, float, float)} - */ - @Deprecated - public GT_Runnable_Sound(World aWorld, int aX, int aY, int aZ, int aTimeUntilNextSound, String aSoundName, - float aSoundStrength, float aSoundModulation) { - this( - aWorld, - (double) aX + 0.5D, - (double) aY + 0.5D, - (double) aZ + 0.5D, - aTimeUntilNextSound, - new ResourceLocation(aSoundName), - aSoundStrength, - aSoundModulation); - } - @Override public void run() { try { diff --git a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java index 236396e312..be9492ebba 100644 --- a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java +++ b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java @@ -36,7 +36,6 @@ import gregtech.api.gui.widgets.GT_CoverTickRateButton; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.net.GT_Packet_TileEntityCoverGUI; -import gregtech.api.objects.GT_ItemStack; import gregtech.common.covers.CoverInfo; /** @@ -800,15 +799,6 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { * Checks if the Cover can be placed on this. */ public boolean isCoverPlaceable(ForgeDirection side, ItemStack aStack, ICoverable aTileEntity) { - return isCoverPlaceable(side, new GT_ItemStack(aStack), aTileEntity); - } - - /** - * Checks if the Cover can be placed on this. You will probably want to call - * {@link #isCoverPlaceable(ForgeDirection, ItemStack, ICoverable)} instead. - */ - @Deprecated - public boolean isCoverPlaceable(ForgeDirection side, GT_ItemStack aStack, ICoverable aTileEntity) { return true; } @@ -840,11 +830,6 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { aTileEntity.setCoverIDAtSide(side, GT_Utility.stackToInt(aCover)); } - @Deprecated - public String trans(String aNr, String aEnglish) { - return GT_Utility.trans(aNr, aEnglish); - } - public boolean allowsCopyPasteTool() { return true; } diff --git a/src/main/java/gregtech/api/util/GT_ModReference.java b/src/main/java/gregtech/api/util/GT_ModReference.java deleted file mode 100644 index d0b2314764..0000000000 --- a/src/main/java/gregtech/api/util/GT_ModReference.java +++ /dev/null @@ -1,29 +0,0 @@ -package gregtech.api.util; - -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.Railcraft; - -import cpw.mods.fml.common.Loader; - -@Deprecated // use gregtech.api.enums.ModIDs instead -public enum GT_ModReference { - - RAILCRAFT(Railcraft.ID), - GTPP(GTPlusPlus.ID),; - - private final boolean loaded; - private final String modID; - - GT_ModReference(String modID) { - loaded = Loader.isModLoaded(modID); - this.modID = modID; - } - - public boolean isLoaded() { - return loaded; - } - - public String getModID() { - return modID; - } -} |