diff options
| author | miozune <miozune@gmail.com> | 2023-12-29 21:32:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-29 13:32:03 +0100 |
| commit | 630761e5d633eb976f4a1bd2178a3fbcae5072d4 (patch) | |
| tree | 4ac085ba09e76c63f0b3cbcc0026861644543081 /src | |
| parent | 90615c78f2219b0fadf50c1c31b9e678ddc808c1 (diff) | |
| download | GT5-Unofficial-630761e5d633eb976f4a1bd2178a3fbcae5072d4.tar.gz GT5-Unofficial-630761e5d633eb976f4a1bd2178a3fbcae5072d4.tar.bz2 GT5-Unofficial-630761e5d633eb976f4a1bd2178a3fbcae5072d4.zip | |
Cleanup deprecation (#2416)
* Remove isValidMetaTileEntity and filterValidMetaTileEntities
* Remove OUTPUT_FULL
* Remove calclavia oredict
* Remove unused GT_GUIColorOverride constructor
* Remove getItemGridPositions
* Remove unused tool classes
* Remove unused GT_Runnable_Sound constructors
* Remove unused cover constructors
* Remove getBasicOutput()
* Remove unused GT_MetaTileEntity_GasTurbine constructors
* Remove ImplosionCompressorRecipes#addImplosionRecipe
* Remove mOutputItem1 & mOutputItem2
* Remove GT_MetaTileEntity_Miner#moveOneDown & #getFakePlayer
* Remove unused GT_Worldgen_GT_Ore_Layer constructor
* Remove GT_ModReference
* Remove deprecated BaseMetaTileEntity#receiveMetaTileEntityData
* Remove deprecated cover variables
* Remove deprecated GT_CoverBehaviorBase#isCoverPlaceable
* Remove unused variables from GT_MachineRecipeLoader
* Remove #getCalcificationOutput
* Remove IC2_Fuel_Can_Empty and IC2_Fuel_Can_Filled
* Remove deprecated #polluteEnvironment()
* Remove FluidDisplaySlotWidget
Diffstat (limited to 'src')
57 files changed, 1 insertions, 1541 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; - } -} diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java index 5528b4ac63..fd260d73a4 100644 --- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java +++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java @@ -51,44 +51,6 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { @Deprecated public GT_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize, boolean aOverworld, boolean aNether, boolean aEnd, boolean GC_UNUSED1, boolean GC_UNUSED2, - boolean GC_UNUSED3, int aPrimary, int aSecondary, int aBetween, int aSporadic) { - super(aName, sList, aDefault); - this.mOverworld = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld); - this.mNether = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether); - this.mEnd = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd); - this.mEndAsteroid = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "EndAsteroid", aEnd); - this.mMinY = ((short) GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY)); - short mMaxY = ((short) GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY)); - if (mMaxY < (this.mMinY + 9)) { - GT_Log.out.println("Oremix " + this.mWorldGenName + " has invalid Min/Max heights!"); - mMaxY = (short) (this.mMinY + 9); - } - this.mMaxY = mMaxY; - this.mWeight = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight)); - this.mDensity = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "Density", aDensity)); - this.mSize = ((short) Math - .max(1, GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); - this.mPrimaryMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary)); - this.mSecondaryMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary)); - this.mBetweenMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween)); - this.mSporadicMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic)); - this.mRestrictBiome = GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None"); - - if (this.mEnabled) { - sWeight += this.mWeight; - } - } - - @Deprecated - public GT_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, - int aSize, boolean aOverworld, boolean aNether, boolean aEnd, boolean GC_UNUSED1, boolean GC_UNUSED2, boolean GC_UNUSED3, Materials aPrimary, Materials aSecondary, Materials aBetween, Materials aSporadic) { this( aName, diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java index 8391724c75..dc44e2b390 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java @@ -38,14 +38,6 @@ public class GT_Cover_Arm extends GT_CoverBehavior { // among players doesn't make sense. private static final String ANY_TEXT = "Any"; - /** - * @deprecated use {@link #GT_Cover_Arm(int aTickRate, ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_Arm(int aTickRate) { - this(aTickRate, null); - } - public GT_Cover_Arm(int aTickRate, ITexture coverTexture) { super(coverTexture); this.mTickRate = aTickRate; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java index b57c4d682b..560a91bcef 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java @@ -22,14 +22,6 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControlsWorkCover { - /** - * @deprecated use {@link #GT_Cover_ControlsWork(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_ControlsWork() { - this(null); - } - public GT_Cover_ControlsWork(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java index e9ce1fe3d0..fcedfbe768 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java @@ -28,22 +28,6 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { public final int mTickRate; private final int mMaxStacks; - /** - * @deprecated use {@link #GT_Cover_Conveyor(int aTickRate, int maxStacks, ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_Conveyor(int aTickRate) { - this(aTickRate, 1, null); - } - - /** - * @deprecated use {@link #GT_Cover_Conveyor(int aTickRate, int maxStacks, ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_Conveyor(int aTickRate, int maxStacks) { - this(aTickRate, maxStacks, null); - } - public GT_Cover_Conveyor(int aTickRate, int maxStacks, ITexture coverTexture) { super(coverTexture); this.mTickRate = aTickRate; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java index 2039162f93..f492542fa9 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java @@ -13,14 +13,6 @@ import gregtech.api.util.ISerializableObject; public class GT_Cover_Crafting extends GT_CoverBehavior { - /** - * @deprecated use {@link #GT_Cover_Crafting(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_Crafting() { - this(null); - } - public GT_Cover_Crafting(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java index 2e60c8cad2..37c791b024 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java @@ -20,14 +20,6 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget public class GT_Cover_DoesWork extends GT_CoverBehavior { - /** - * @deprecated use {@link #GT_Cover_DoesWork(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_DoesWork() { - this(null); - } - public GT_Cover_DoesWork(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java index b10ca4f493..2590f8e7ae 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java @@ -18,14 +18,6 @@ import gregtech.api.util.GT_Utility; public class GT_Cover_Drain extends GT_CoverBehavior { - /** - * @deprecated use {@link #GT_Cover_Drain(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_Drain() { - this(null); - } - public GT_Cover_Drain(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java index d91e62a687..de1f934a71 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java @@ -35,14 +35,6 @@ import io.netty.buffer.ByteBuf; public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMeterData> { - /** - * @deprecated use {@link #GT_Cover_EUMeter(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_EUMeter() { - this(null); - } - public GT_Cover_EUMeter(ITexture coverTexture) { super(EUMeterData.class, coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java index e1832d5a54..871f89a07b 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java @@ -32,14 +32,6 @@ import io.netty.buffer.ByteBuf; */ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLimiter.FluidLimiterData> { - /** - * @deprecated use {@link #GT_Cover_FluidLimiter(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_FluidLimiter() { - this(null); - } - public GT_Cover_FluidLimiter(ITexture coverTexture) { super(FluidLimiterData.class, coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java index 5325d09187..ce11a397f4 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java @@ -61,14 +61,6 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid public final int mTransferRate; private boolean allowFluid = false; - /** - * @deprecated use {@link #GT_Cover_FluidRegulator(int aTransferRate, ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_FluidRegulator(int aTransferRate) { - this(aTransferRate, null); - } - public GT_Cover_FluidRegulator(int aTransferRate, ITexture coverTexture) { super(FluidRegulatorData.class, coverTexture); if (aTransferRate > (-1 >>> (Integer.SIZE - SPEED_LENGTH))) diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java index 296b9c3469..5a6999e055 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java @@ -45,14 +45,6 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil private final int ANY_INPUT_FILTER_OUTPUT = 6; // 110 private final int ANY_INPUT_INVERT_OUTPUT = 7; // 111 - /** - * @deprecated use {@link #GT_Cover_Fluidfilter(ITexture coverTexture)} instead - */ - @Deprecated - GT_Cover_Fluidfilter() { - this(null); - } - public GT_Cover_Fluidfilter(ITexture coverTexture) { super(FluidFilterData.class, coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java index a142259438..d93c4b29d1 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java @@ -40,14 +40,6 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte private final boolean mExport; - /** - * @deprecated use {@link #GT_Cover_ItemFilter(boolean isExport, ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_ItemFilter(boolean isExport) { - this(isExport, null); - } - public GT_Cover_ItemFilter(boolean isExport, ITexture coverTexture) { super(ItemFilterData.class, coverTexture); this.mExport = isExport; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java index 957d446a51..2339bd2243 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java @@ -40,14 +40,6 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. private static final int CONVERTED_BIT = 0x80000000; private static final int INVERT_BIT = 0x40000000; - /** - * @deprecated use {@link #GT_Cover_ItemMeter(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_ItemMeter() { - this(null); - } - public GT_Cover_ItemMeter(ITexture coverTexture) { super(ItemMeterData.class, coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Lens.java b/src/main/java/gregtech/common/covers/GT_Cover_Lens.java index 9e531e552c..94794e5892 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Lens.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Lens.java @@ -10,14 +10,6 @@ public class GT_Cover_Lens extends GT_CoverBehavior { private final byte mColor; - /** - * @deprecated use {@link #GT_Cover_Lens(byte aColor, ITexture coverTexture)} instead. - */ - @Deprecated - public GT_Cover_Lens(byte aColor) { - this(aColor, null); - } - public GT_Cover_Lens(byte aColor, ITexture coverTexture) { super(coverTexture); this.mColor = aColor; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java index 712c3a94bb..55cae3241c 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java @@ -23,14 +23,6 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { - /** - * @deprecated use {@link #GT_Cover_NeedMaintainance(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_NeedMaintainance() { - this(null); - } - public GT_Cover_NeedMaintainance(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java index 8d0b7d46b5..d358c4e578 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java @@ -23,14 +23,6 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { private String placer = ""; private int range = 8; - /** - * @deprecated use {@link #GT_Cover_PlayerDetector(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_PlayerDetector() { - this(null); - } - public GT_Cover_PlayerDetector(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java index 5362f96d31..c19f9d0d3a 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java @@ -26,14 +26,6 @@ public class GT_Cover_Pump extends GT_CoverBehavior { public final int mTransferRate; - /** - * @deprecated use {@link #GT_Cover_Pump(int aTransferRate, ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_Pump(int aTransferRate) { - this(aTransferRate, null); - } - public GT_Cover_Pump(int aTransferRate, ITexture coverTexture) { super(coverTexture); this.mTransferRate = aTransferRate; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java index 963ef4cbbf..eabf90f4de 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java @@ -8,14 +8,6 @@ import gregtech.api.interfaces.tileentity.ICoverable; public class GT_Cover_RedstoneReceiverExternal extends GT_Cover_RedstoneWirelessBase { - /** - * @deprecated use {@link #GT_Cover_RedstoneReceiverExternal(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_RedstoneReceiverExternal() { - this(null); - } - public GT_Cover_RedstoneReceiverExternal(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java index 8b94861730..3edd7f7e43 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java @@ -10,14 +10,6 @@ import gregtech.api.util.ISerializableObject; public class GT_Cover_RedstoneReceiverInternal extends GT_Cover_RedstoneWirelessBase { - /** - * @deprecated use {@link #GT_Cover_RedstoneReceiverInternal(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_RedstoneReceiverInternal() { - this(null); - } - public GT_Cover_RedstoneReceiverInternal(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java index e2efbc3d87..1ee0a05837 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java @@ -11,14 +11,6 @@ import gregtech.api.util.ISerializableObject; public class GT_Cover_RedstoneTransmitterExternal extends GT_Cover_RedstoneWirelessBase { - /** - * @deprecated use {@link #GT_Cover_RedstoneTransmitterExternal(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_RedstoneTransmitterExternal() { - this(null); - } - public GT_Cover_RedstoneTransmitterExternal(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java index a7f39fccf0..a812a49990 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java @@ -8,14 +8,6 @@ import gregtech.api.interfaces.tileentity.ICoverable; public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirelessBase { - /** - * @deprecated use {@link #GT_Cover_RedstoneTransmitterInternal(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_RedstoneTransmitterInternal() { - this(null); - } - public GT_Cover_RedstoneTransmitterInternal(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java index 8cce7fb55d..45441025e5 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java @@ -26,14 +26,6 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { private static final int PUBLIC_MASK = 0x0000FFFF; private static final int CHECKBOX_MASK = 0x00010000; - /** - * @deprecated use {@link #GT_Cover_RedstoneWirelessBase(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_RedstoneWirelessBase() { - this(null); - } - public GT_Cover_RedstoneWirelessBase(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Screen.java b/src/main/java/gregtech/common/covers/GT_Cover_Screen.java index fcf33093c5..fab2b81b0b 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Screen.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Screen.java @@ -10,14 +10,6 @@ import gregtech.api.util.GT_CoverBehavior; public class GT_Cover_Screen extends GT_CoverBehavior { - /** - * @deprecated use {@link #GT_Cover_Screen(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_Screen() { - this(null); - } - public GT_Cover_Screen(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java index 90904cba65..670506141c 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java @@ -20,14 +20,6 @@ import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget public class GT_Cover_Shutter extends GT_CoverBehavior { - /** - * @deprecated use {@link #GT_Cover_Shutter(ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_Shutter() { - this(null); - } - public GT_Cover_Shutter(ITexture coverTexture) { super(coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java index e9081006e2..e67e8b05d1 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java @@ -7,14 +7,6 @@ import gregtech.api.util.GT_ModHandler; public class GT_Cover_SteamRegulator extends GT_Cover_FluidRegulator { - /** - * @deprecated use {@link #GT_Cover_SteamRegulator(int aTransferRate, ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_SteamRegulator(int aTransferRate) { - this(aTransferRate, null); - } - public GT_Cover_SteamRegulator(int aTransferRate, ITexture coverTexture) { super(aTransferRate, coverTexture); } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java b/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java index ea463acf45..5787a99c0b 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java @@ -9,14 +9,6 @@ import gregtech.api.util.GT_ModHandler; public class GT_Cover_SteamValve extends GT_Cover_Pump { - /** - * @deprecated use {@link #GT_Cover_SteamValve(int aTransferRate, ITexture coverTexture)} instead - */ - @Deprecated - public GT_Cover_SteamValve(int aTransferRate) { - this(aTransferRate, null); - } - public GT_Cover_SteamValve(int aTransferRate, ITexture coverTexture) { super(aTransferRate, coverTexture); } diff --git a/src/main/java/gregtech/common/gui/modularui/UIHelper.java b/src/main/java/gregtech/common/gui/modularui/UIHelper.java index dffeeff48f..64d686d350 100644 --- a/src/main/java/gregtech/common/gui/modularui/UIHelper.java +++ b/src/main/java/gregtech/common/gui/modularui/UIHelper.java @@ -164,15 +164,6 @@ public class UIHelper { return getGridPositions(totalCount, xOrigin, yOrigin, xDirMaxCount, 100); } - /** - * @deprecated Renamed to {@link #getGridPositions} - */ - @Deprecated - public static List<Pos2d> getItemGridPositions(int itemCount, int xOrigin, int yOrigin, int xDirMaxCount, - int yDirMaxCount) { - return getGridPositions(itemCount, xOrigin, yOrigin, xDirMaxCount, yDirMaxCount); - } - private static IDrawable[] getBackgroundsForSlot(IDrawable base, BasicUIProperties uiProperties, boolean isFluid, boolean isOutput, int index, boolean isSpecial, SteamVariant steamVariant) { IDrawable overlay = getOverlay(uiProperties, isFluid, isOutput, index, isSpecial, steamVariant); diff --git a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java deleted file mode 100644 index a5b9f88c60..0000000000 --- a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java +++ /dev/null @@ -1,437 +0,0 @@ -package gregtech.common.gui.modularui.widget; - -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.function.BiFunction; -import java.util.function.Predicate; -import java.util.function.Supplier; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidContainerItem; - -import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable; -import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import gregtech.GT_Mod; -import gregtech.api.interfaces.IFluidAccess; -import gregtech.api.interfaces.IHasFluidDisplayItem; -import gregtech.api.interfaces.metatileentity.IFluidLockable; -import gregtech.api.util.GT_Utility; - -@Deprecated -public class FluidDisplaySlotWidget extends SlotWidget { - - private IHasFluidDisplayItem iHasFluidDisplay; - private Supplier<IFluidAccess> fluidAccessConstructor; - private Supplier<Boolean> canDrainGetter; - private Supplier<Boolean> canFillGetter; - private Predicate<Fluid> canFillFilter; - private Action actionRealClick = Action.NONE; - private Action actionDragAndDrop = Action.NONE; - private BiFunction<ClickData, FluidDisplaySlotWidget, Boolean> beforeRealClick; - private BiFunction<ClickData, FluidDisplaySlotWidget, Boolean> beforeDragAndDrop; - private Runnable updateFluidDisplayItem = () -> {}; - - public FluidDisplaySlotWidget(BaseSlot slot) { - super(slot); - setAccess(false, false); - disableShiftInsert(); - } - - public FluidDisplaySlotWidget(IItemHandlerModifiable handler, int index) { - this(new BaseSlot(handler, index, true)); - } - - // === client actions === - - @Override - public ClickResult onClick(int buttonId, boolean doubleClick) { - if (actionRealClick == Action.NONE) return ClickResult.REJECT; - if (interactionDisabled) return ClickResult.REJECT; - - /* - * While a logical client don't really need to process fluid cells upon click (it could have just wait for - * server side to send the result), doing so would result in every fluid interaction having a noticeable delay - * between clicking and changes happening even on single player. I'd imagine this lag to become only more severe - * when playing MP over ethernet, which would have much more latency than a memory connection - */ - ClickData clickData = ClickData.create(buttonId, doubleClick); - ItemStack verifyToken = executeRealClick(clickData); - syncToServer(2, buffer -> { - clickData.writeToPacket(buffer); - try { - buffer.writeItemStackToBuffer(verifyToken); - } catch (IOException e) { - e.printStackTrace(); - } - }); - return ClickResult.ACCEPT; - } - - @Override - public boolean handleDragAndDrop(ItemStack draggedStack, int button) { - if (actionDragAndDrop == Action.NONE || actionDragAndDrop == Action.TRANSFER) return false; - if (interactionDisabled) return false; - - ClickData clickData = ClickData.create(button, false); - executeDragAndDrop(clickData, draggedStack); - syncToServer(5, buffer -> { - try { - clickData.writeToPacket(buffer); - buffer.writeItemStackToBuffer(draggedStack); - } catch (IOException e) { - e.printStackTrace(); - } - }); - draggedStack.stackSize = 0; - return true; - } - - @Override - public List<String> getExtraTooltip() { - return Collections.emptyList(); - } - - // === server actions === - - @Override - public void readOnServer(int id, PacketBuffer buf) throws IOException { - if (id == 1) { - getMcSlot().xDisplayPosition = buf.readVarIntFromBuffer(); - getMcSlot().yDisplayPosition = buf.readVarIntFromBuffer(); - } else if (id == 2) { - onClickServer(ClickData.readPacket(buf), buf.readItemStackFromBuffer()); - } else if (id == 3) { - phantomScroll(buf.readVarIntFromBuffer()); - } else if (id == 4) { - setEnabled(buf.readBoolean()); - } else if (id == 5) { - executeDragAndDrop(ClickData.readPacket(buf), buf.readItemStackFromBuffer()); - if (onDragAndDropComplete != null) { - onDragAndDropComplete.accept(this); - } - } - markForUpdate(); - } - - private void onClickServer(ClickData clickData, ItemStack clientVerifyToken) { - ItemStack serverVerifyToken = executeRealClick(clickData); - // similar to what NetHandlerPlayServer#processClickWindow does - if (!ItemStack.areItemStacksEqual(clientVerifyToken, serverVerifyToken)) { - ((EntityPlayerMP) getContext().getPlayer()).sendContainerToPlayer(getContext().getContainer()); - } - } - - // === client/server actions === - - private ItemStack executeRealClick(ClickData clickData) { - if (actionRealClick == Action.NONE) return null; - if (beforeRealClick != null && !beforeRealClick.apply(clickData, this)) return null; - - ItemStack ret = null; - if (actionRealClick == Action.TRANSFER) { - if (fluidAccessConstructor == null) { - GT_Mod.GT_FML_LOGGER - .warn("FluidDisplaySlotWidget is asked to transfer fluid, but fluidAccessConstructor is null!"); - return null; - } - ret = transferFluid( - fluidAccessConstructor.get(), - getContext().getPlayer(), - clickData.mouseButton == 0, - canDrainGetter != null ? canDrainGetter.get() : true, - canFillGetter != null ? canFillGetter.get() : true); - } else if (actionRealClick == Action.LOCK) { - lockFluid(getContext().getPlayer().inventory.getItemStack()); - } - - updateFluidDisplayItem.run(); - return ret; - } - - protected ItemStack transferFluid(IFluidAccess aFluidAccess, EntityPlayer aPlayer, boolean aProcessFullStack, - boolean aCanDrain, boolean aCanFill) { - ItemStack tStackHeld = aPlayer.inventory.getItemStack(); - ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld); - if (tStackSizedOne == null || tStackHeld.stackSize == 0) return null; - FluidStack tInputFluid = aFluidAccess.get(); - FluidStack tFluidHeld = GT_Utility.getFluidForFilledItem(tStackSizedOne, true); - if (tFluidHeld != null && tFluidHeld.amount <= 0) tFluidHeld = null; - if (tInputFluid == null) { - // tank empty, consider fill only from now on - if (!aCanFill) - // cannot fill and nothing to take, bail out - return null; - if (tFluidHeld == null) - // no fluid to fill - return null; - // apply filter here - if (canFillFilter != null && !canFillFilter.test(tFluidHeld.getFluid())) return null; - return fillFluid(aFluidAccess, aPlayer, tFluidHeld, aProcessFullStack); - } - // tank not empty, both action possible - if (tFluidHeld != null && tInputFluid.amount < aFluidAccess.getCapacity()) { - // both nonnull and have space left for filling. - if (aCanFill) - // actually both pickup and fill is reasonable, but I'll go with fill here - // there is already fluid in here. so we assume the slot will not accept this fluid anyway if it doesn't - // pass the filter. - return fillFluid(aFluidAccess, aPlayer, tFluidHeld, aProcessFullStack); - if (!aCanDrain) - // cannot take AND cannot fill, why make this call then? - return null; - // the slot does not allow filling, so try take some - return drainFluid(aFluidAccess, aPlayer, aProcessFullStack); - } else { - // cannot fill and there is something to take - if (!aCanDrain) - // but the slot does not allow taking, so bail out - return null; - return drainFluid(aFluidAccess, aPlayer, aProcessFullStack); - } - } - - protected static ItemStack drainFluid(IFluidAccess aFluidAccess, EntityPlayer aPlayer, boolean aProcessFullStack) { - FluidStack tTankStack = aFluidAccess.get(); - if (tTankStack == null) return null; - ItemStack tStackHeld = aPlayer.inventory.getItemStack(); - ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld); - if (tStackSizedOne == null || tStackHeld.stackSize == 0) return null; - int tOriginalFluidAmount = tTankStack.amount; - ItemStack tFilledContainer = GT_Utility.fillFluidContainer(tTankStack, tStackSizedOne, true, false); - if (tFilledContainer == null && tStackSizedOne.getItem() instanceof IFluidContainerItem tContainerItem) { - int tFilledAmount = tContainerItem.fill(tStackSizedOne, tTankStack, true); - if (tFilledAmount > 0) { - tFilledContainer = tStackSizedOne; - tTankStack.amount -= tFilledAmount; - } - } - if (tFilledContainer != null) { - if (aProcessFullStack) { - int tFilledAmount = tOriginalFluidAmount - tTankStack.amount; - /* - * work out how many more items we can fill one cell is already used, so account for that the round down - * behavior will left over a fraction of a cell worth of fluid the user then get to decide what to do - * with it it will not be too fancy if it spills out partially filled cells - */ - int tAdditionalParallel = Math.min(tStackHeld.stackSize - 1, tTankStack.amount / tFilledAmount); - tTankStack.amount -= tFilledAmount * tAdditionalParallel; - tFilledContainer.stackSize += tAdditionalParallel; - } - replaceCursorItemStack(aPlayer, tFilledContainer); - } - aFluidAccess.verifyFluidStack(); - return tFilledContainer; - } - - protected static ItemStack fillFluid(IFluidAccess aFluidAccess, EntityPlayer aPlayer, FluidStack aFluidHeld, - boolean aProcessFullStack) { - // we are not using aMachine.fill() here any more, so we need to check for fluid type here ourselves - if (aFluidAccess.get() != null && !aFluidAccess.get() - .isFluidEqual(aFluidHeld)) return null; - ItemStack tStackHeld = aPlayer.inventory.getItemStack(); - ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld); - if (tStackSizedOne == null) return null; - - int tFreeSpace = aFluidAccess.getCapacity() - (aFluidAccess.get() != null ? aFluidAccess.get().amount : 0); - if (tFreeSpace <= 0) - // no space left - return null; - - // find out how much fluid can be taken - // some cells cannot be partially filled - ItemStack tStackEmptied = null; - int tAmountTaken = 0; - if (tFreeSpace >= aFluidHeld.amount) { - // fully accepted - try take it from item now - // IFluidContainerItem is intentionally not checked here. it will be checked later - tStackEmptied = GT_Utility.getContainerForFilledItem(tStackSizedOne, false); - tAmountTaken = aFluidHeld.amount; - } - if (tStackEmptied == null && tStackSizedOne.getItem() instanceof IFluidContainerItem container) { - // either partially accepted, or is IFluidContainerItem - FluidStack tDrained = container.drain(tStackSizedOne, tFreeSpace, true); - if (tDrained != null && tDrained.amount > 0) { - // something is actually drained - change the cell and drop it to player - tStackEmptied = tStackSizedOne; - tAmountTaken = tDrained.amount; - } - } - if (tStackEmptied == null) - // somehow the cell refuse to give out that amount of fluid, no op then - return null; - - // find out how many fill can we do - // same round down behavior as above - // however here the fluid stack is not changed at all, so the exact code will slightly differ - int tParallel = aProcessFullStack ? Math.min(tFreeSpace / tAmountTaken, tStackHeld.stackSize) : 1; - if (aFluidAccess.get() == null) { - FluidStack tNewFillableStack = aFluidHeld.copy(); - tNewFillableStack.amount = tAmountTaken * tParallel; - aFluidAccess.set(tNewFillableStack); - } else { - aFluidAccess.addAmount(tAmountTaken * tParallel); - } - tStackEmptied.stackSize = tParallel; - replaceCursorItemStack(aPlayer, tStackEmptied); - return tStackEmptied; - } - - protected static void replaceCursorItemStack(EntityPlayer aPlayer, ItemStack tStackResult) { - int tStackResultMaxStackSize = tStackResult.getMaxStackSize(); - while (tStackResult.stackSize > tStackResultMaxStackSize) { - aPlayer.inventory.getItemStack().stackSize -= tStackResultMaxStackSize; - GT_Utility.addItemToPlayerInventory(aPlayer, tStackResult.splitStack(tStackResultMaxStackSize)); - } - if (aPlayer.inventory.getItemStack().stackSize == tStackResult.stackSize) { - // every cell is mutated. it could just stay on the cursor. - aPlayer.inventory.setItemStack(tStackResult); - } else { - // some cells not mutated. The mutated cells must go into the inventory - // or drop into the world if there isn't enough space. - ItemStack tStackHeld = aPlayer.inventory.getItemStack(); - tStackHeld.stackSize -= tStackResult.stackSize; - GT_Utility.addItemToPlayerInventory(aPlayer, tStackResult); - } - } - - protected void executeDragAndDrop(ClickData clickData, ItemStack draggedStack) { - if (actionDragAndDrop == Action.NONE || actionDragAndDrop == Action.TRANSFER) return; - if (beforeDragAndDrop != null && !beforeDragAndDrop.apply(clickData, this)) return; - - if (actionDragAndDrop == Action.LOCK) { - lockFluid(draggedStack); - } - updateFluidDisplayItem.run(); - } - - protected void lockFluid(ItemStack cursorStack) {} - - protected void updateFluidDisplayItem() {} - - // === setters === - - public FluidDisplaySlotWidget setFluidAccessConstructor(Supplier<IFluidAccess> fluidAccessConstructor) { - this.fluidAccessConstructor = fluidAccessConstructor; - return this; - } - - public FluidDisplaySlotWidget setIHasFluidDisplay(IHasFluidDisplayItem iHasFluidDisplay) { - this.iHasFluidDisplay = iHasFluidDisplay; - return this; - } - - public FluidDisplaySlotWidget setCanDrainGetter(Supplier<Boolean> canDrainGetter) { - this.canDrainGetter = canDrainGetter; - return this; - } - - public FluidDisplaySlotWidget setCanDrain(boolean canDrain) { - return setCanDrainGetter(() -> canDrain); - } - - public FluidDisplaySlotWidget setCanFillGetter(Supplier<Boolean> canFillGetter) { - this.canFillGetter = canFillGetter; - return this; - } - - public FluidDisplaySlotWidget setCanFill(boolean canFill) { - return setCanFillGetter(() -> canFill); - } - - /** - * Sets action called on click while holding the real item. - */ - public FluidDisplaySlotWidget setActionRealClick(Action actionRealClick) { - this.actionRealClick = actionRealClick; - return this; - } - - /** - * Add a predicate on whether a client stack will be accepted. Note this will only be called when this slot is - * already empty. It is assumed whatever is already in the slot will pass the filter. - */ - public FluidDisplaySlotWidget setEmptyCanFillFilter(Predicate<Fluid> canFillFilter) { - this.canFillFilter = canFillFilter; - return this; - } - - /** - * Sets action called on drag-and-drop from NEI. You can't use {@link Action#TRANSFER} here. - */ - public FluidDisplaySlotWidget setActionDragAndDrop(Action actionDragAndDrop) { - this.actionDragAndDrop = actionDragAndDrop; - return this; - } - - /** - * Sets function called before {@link #executeRealClick}. - * - * @param beforeRealClick (click data, this widget) -> if allow click - */ - public FluidDisplaySlotWidget setBeforeRealClick( - BiFunction<ClickData, FluidDisplaySlotWidget, Boolean> beforeRealClick) { - this.beforeRealClick = beforeRealClick; - return this; - } - - /** - * Sets function called before {@link #executeDragAndDrop}. - * - * @param beforeDragAndDrop (click data, this widget) -> if allow click - */ - public FluidDisplaySlotWidget setBeforeDragAndDrop( - BiFunction<ClickData, FluidDisplaySlotWidget, Boolean> beforeDragAndDrop) { - this.beforeDragAndDrop = beforeDragAndDrop; - return this; - } - - /** - * Sets function called before both of {@link #executeRealClick} and {@link #executeDragAndDrop}. - * - * @param beforeClick (click data, this widget) -> if allow click - */ - public FluidDisplaySlotWidget setBeforeClick(BiFunction<ClickData, FluidDisplaySlotWidget, Boolean> beforeClick) { - setBeforeRealClick(beforeClick); - setBeforeDragAndDrop(beforeClick); - return this; - } - - public FluidDisplaySlotWidget setUpdateFluidDisplayItem(Runnable updateFluidDisplayItem) { - this.updateFluidDisplayItem = updateFluidDisplayItem; - return this; - } - - /** - * Action triggered on mouse click or NEI drag-and-drop. - */ - public enum Action { - - /** - * Fill/drain fluid into/from the tank. Uses fluid amount, so drag-and-drop cannot use this mode. - */ - TRANSFER, - - /** - * Lock fluid for {@link IFluidLockable}. Does not use fluid amount. - */ - LOCK, - - /** - * Set filter for the tank. (not implemented yet) Does not use fluid amount. - */ - FILTER, - - /** - * Does nothing. - */ - NONE - } -} diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 653461f164..0a307a73d0 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -69,7 +69,6 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.util.MathHelper; -import net.minecraftforge.oredict.OreDictionary; import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; @@ -1688,8 +1687,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "batteryLV")); setElectricStats(32000 + tLastID, 75000L, GT_Values.V[1], 1L, -3L, true); registerTieredTooltip(ItemList.Battery_RE_LV_Cadmium.get(1), LV); - // Annoying backwards compat - OreDictionary.registerOre("calclavia:ADVANCED_BATTERY", ItemList.Battery_RE_LV_Cadmium.get(1)); ItemList.Battery_RE_LV_Lithium.set( addItem( @@ -1702,8 +1699,6 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "batteryLV")); setElectricStats(32000 + tLastID, 100000L, GT_Values.V[1], 1L, -3L, true); registerTieredTooltip(ItemList.Battery_RE_LV_Lithium.get(1), LV); - // Annoying backwards compat - OreDictionary.registerOre("calclavia:ADVANCED_BATTERY", ItemList.Battery_RE_LV_Lithium.get(1)); ItemList.Battery_RE_LV_Sodium.set( addItem( @@ -1713,11 +1708,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L), - "calclavia:ADVANCED_BATTERY")); + "batteryLV")); setElectricStats(32000 + tLastID, 50000L, GT_Values.V[1], 1L, -3L, true); registerTieredTooltip(ItemList.Battery_RE_LV_Sodium.get(1), LV); - // Annoying backwards compat - OreDictionary.registerOre("calclavia:ADVANCED_BATTERY", ItemList.Battery_RE_LV_Sodium.get(1)); // MV Batteries ItemList.Battery_SU_MV_SulfuricAcid.set( diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java index d136ec9e71..f5c59330ed 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java @@ -69,31 +69,10 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { return new Config(machineconfig + ".boiler.solar.bronze", 1080000, 40, 120, 45); } - /** - * for WAILA - * - * @deprecated replaced by {@link #getMaxOutputPerSecond()} - */ - @Deprecated - public int getBasicOutput() { - return (int) (getMaxOutputPerSecond() * 1.25F); - } - public int getMaxOutputPerSecond() { return mConfig.getMaxOutputPerSecond(); } - /** - * for WAILA - * - * @deprecated replaced by {@link #getProductionPerSecond()} - */ - @SuppressWarnings("unused") - @Deprecated - public int getCalcificationOutput() { - return (int) (getProductionPerSecond() * 1.25F); - } - @Override public String[] getDescription() { return String diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java index 163f9fa319..e18bc00b51 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java @@ -39,22 +39,6 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat public int mEfficiency; - @Deprecated - public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - new String[] { "Requires flammable Gasses", - "Causes " - + (int) (GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond - * GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier[aTier]) - + " Pollution per second" }); - this.mEfficiency = 100 - aTier * 5; - onConfigLoad(); - } - public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier, int mEfficiency) { super( aID, @@ -70,20 +54,6 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat onConfigLoad(); } - @Deprecated - public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - this.mEfficiency = 100 - aTier * 5; - onConfigLoad(); - } - - @Deprecated - public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - this.mEfficiency = 100 - aTier * 5; - onConfigLoad(); - } - public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, int mEfficiency) { super(aName, aTier, aDescription, aTextures); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java index 39581c6d93..2acaea8050 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java @@ -14,7 +14,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.ChunkPosition; -import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; import com.gtnewhorizons.modularui.api.drawable.FallbackableUITexture; @@ -392,28 +391,6 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine return mSpeed; } - /** - * @deprecated This method are obsolete, and may be removed in further updates. Please use - * 'this.getPipe().descent()' access! - */ - @Deprecated - public boolean moveOneDown(IGregTechTileEntity tileEntity) { - boolean descends = pipe.descent(tileEntity); - if (descends) { - fillOreList(tileEntity); - } - return descends; - } - - /** - * @deprecated This method are obsolete, and may be removed in further updates. Please use - * 'this.getPipe().getFakePlayer(te)' access! - */ - @Deprecated - protected FakePlayer getFakePlayer(IGregTechTileEntity aBaseTile) { - return pipe.getFakePlayer(aBaseTile); - } - public GT_DrillingLogicDelegate getPipe() { return pipe; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java index 670d2a3aba..e69d2c2921 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java @@ -81,12 +81,6 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn public ItemStack[] mOutputItems = new ItemStack[OUTPUT_SLOTS]; - @Deprecated - public ItemStack mOutputItem1; - - @Deprecated - public ItemStack mOutputItem2; - public GT_MetaTileEntity_PrimitiveBlastFurnace(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, INPUT_SLOTS + OUTPUT_SLOTS); } diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 2b83565ad4..7280bccdff 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1,7 +1,5 @@ package gregtech.loaders.postload; -import static gregtech.api.enums.Mods.NotEnoughItems; - import gregtech.api.enums.Materials; import gregtech.loaders.postload.chains.GT_BauxiteRefineChain; import gregtech.loaders.postload.chains.GT_NaniteChain; @@ -61,11 +59,6 @@ import gregtech.loaders.postload.recipes.WiremillRecipes; public class GT_MachineRecipeLoader implements Runnable { public static final String aTextTCGTPage = "gt.research.page.1."; - public static final Boolean isNEILoaded = NotEnoughItems.isModLoaded(); - - /** @deprecated AE2 is a required dependency now */ - @Deprecated - public static final Boolean isAE2Loaded = true; public static final Materials[] solderingMats = new Materials[] { Materials.Lead, Materials.SolderingAlloy, Materials.Tin }; diff --git a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java index a9764de8c6..a671fd6977 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java @@ -6,8 +6,6 @@ import static gregtech.api.recipe.RecipeMaps.implosionRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import net.minecraft.item.ItemStack; - import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -73,15 +71,4 @@ public class ImplosionCompressorRecipes implements Runnable { .addTo(implosionRecipes); } } - - @Deprecated - public void addImplosionRecipe(ItemStack input, int explosiveAmount, ItemStack[] outputs) { - GT_Values.RA.stdBuilder() - .itemInputs(input) - .itemOutputs(outputs) - .metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, explosiveAmount) - .duration(1 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(implosionRecipes); - } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java index 66d77cf1c8..4d51c90cb5 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java @@ -168,8 +168,6 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre("cropLemon", ItemList.FR_Lemon.get(1L)); GT_OreDictUnificator.registerOre("cropCoffee", ItemList.IC2_CoffeeBeans.get(1L)); GT_OreDictUnificator.registerOre("cropPotato", ItemList.Food_Raw_Potato.get(1L)); - GT_OreDictUnificator.registerOre("calclavia:BATTERY", GT_ModHandler.getIC2Item("reBattery", 1L)); - GT_OreDictUnificator.registerOre("calclavia:BATTERY", GT_ModHandler.getIC2Item("chargedReBattery", 1L, 32767)); GT_OreDictUnificator .registerOre(OrePrefixes.battery, Materials.Basic, GT_ModHandler.getIC2Item("reBattery", 1L)); GT_OreDictUnificator diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 9f3d6f6773..55e9b07ebd 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -420,8 +420,6 @@ GT5U.gui.button.drill_retract_pipes_active=§4Cannot interrupt abort procedure GT5U.gui.text.success=§aProcessing recipe GT5U.gui.text.generating=§aGenerating power GT5U.gui.text.no_recipe=§7No valid recipe found -#deprecated -GT5U.gui.text.output_full=§7Not enough output space GT5U.gui.text.item_output_full=§7Not enough item output space GT5U.gui.text.fluid_output_full=§7Not enough fluid output space GT5U.gui.text.none= |