diff options
Diffstat (limited to 'src/main')
235 files changed, 727 insertions, 3514 deletions
diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java index 9e3d7f7102..f5bd29947d 100644 --- a/src/main/java/gregtech/api/util/GTPP_Recipe.java +++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java @@ -1,8 +1,6 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.E; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; -import static gregtech.api.enums.Mods.GTPlusPlus; import static net.minecraft.util.EnumChatFormatting.GRAY; import java.util.ArrayList; @@ -146,7 +144,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.cokeoven", "Coke Oven", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 1, @@ -162,7 +160,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.matterfab2", "Matter Fabricator", null, - RES_PATH_GUI + "basicmachines/Default", + "", 2, 0, 0, @@ -179,7 +177,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.rocketenginefuel", "Rocket Engine Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + "", 0, 0, 0, @@ -196,7 +194,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.quantumforcesmelter", "Quantum Force Transformer", null, - RES_PATH_GUI + "basicmachines/LCRNEI", + "", 6, 6, 1, @@ -214,7 +212,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.geothermalfuel", "GeoThermal Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + "", 1, 1, 0, @@ -230,7 +228,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.chemicaldehydrator", "Dehydrator", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 0, @@ -246,7 +244,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.vacfurnace", "Vacuum Furnace", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 1, @@ -262,7 +260,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.alloyblastsmelter", "Alloy Blast Smelter", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 1, @@ -278,7 +276,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.steamturbinefuel", "GeoThermal Fuel", null, - RES_PATH_GUI + "basicmachines/Default", + "", 1, 1, 0, @@ -296,7 +294,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 0, 0, @@ -321,7 +319,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.nuclearsaltprocessingplant", "Nuclear Salt Processing Plant", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 6, 0, @@ -339,7 +337,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.oremill", "Milling", null, - RES_PATH_GUI + "basicmachines/LFTR", + "", 3, 3, 1, @@ -377,7 +375,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.fissionfuel", "Nuclear Fuel Processing", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 0, 0, @@ -395,7 +393,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.coldtrap", "Cold Trap", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 0, @@ -413,7 +411,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.reactorprocessingunit", "Reactor Processing Unit", null, - RES_PATH_GUI + "basicmachines/Dehydrator", + "", 2, 9, 0, @@ -431,7 +429,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.simplewasher", "Simple Dust Washer", null, - RES_PATH_GUI + "basicmachines/PotionBrewer", + "", 1, 1, 0, @@ -450,7 +448,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.moleculartransformer", "Molecular Transformer", null, - RES_PATH_GUI + "basicmachines/Scanner", + "", 1, 1, 0, @@ -468,7 +466,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.elementaldupe", "Elemental Duplicator", null, - RES_PATH_GUI + "basicmachines/Replicator", + "", 1, 1, 0, @@ -485,7 +483,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.fluidchemicaleactor", "Chemical Plant", null, - GTPlusPlus.ID + ":textures/gui/FluidReactor", + "", 4, 4, 0, @@ -503,7 +501,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.RTGgenerators", "RTG", null, - "gregtech:textures/gui/basicmachines/Default", + "", 1, 0, 0, @@ -521,7 +519,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.thermalgeneratorfuel", "Thermal Generator Fuel", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 0, @@ -539,7 +537,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.solartower", "Solar Tower", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 0, 0, 0, @@ -561,7 +559,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.cyclotron", "COMET - Compact Cyclotron", null, - RES_PATH_GUI + "basicmachines/BlastSmelter", + "", 9, 9, 0, @@ -579,7 +577,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.slowfusionreactor", "Mimir - Slow Fusion", null, - "gregtech:textures/gui/basicmachines/LFTR", + "", 0, 0, 0, @@ -591,31 +589,13 @@ public class GTPP_Recipe extends GT_Recipe { true, true).useModularUI(true); - // Component Assembler - public static final GT_Recipe_Map sComponentAssemblerRecipes = new GT_Recipe_Map_Assembler( - new HashSet<>(300), - "gtpp.recipe.componentassembler", - "Component Assembler", - null, - RES_PATH_GUI + "basicmachines/Assembler", - 6, - 1, - 1, - 0, - 1, - E, - 1, - E, - true, - true).useModularUI(true); - // Special Maps for Multis public static final GT_Recipe_Map sFishPondRecipes = new GT_Recipe_Map( new HashSet<>(3), "gtpp.recipe.fishpond", "Zhuhai - Fishing Port", null, - RES_PATH_GUI + "basicmachines/PotionBrewer", + "", 1, 1, 0, @@ -632,7 +612,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.spargetower", "Sparging", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 0, @@ -649,7 +629,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.cryogenicfreezer", "Cryogenic Freezer", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 1, 1, 0, @@ -665,7 +645,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multicentrifuge", "Multiblock Centrifuge", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 6, 6, 0, @@ -682,7 +662,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multielectro", "Multiblock Electrolyzer", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 6, 6, 0, @@ -701,7 +681,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.temp4", "temp4", null, - RES_PATH_GUI + "basicmachines/PotionBrewer", + "", 0, 0, 0, @@ -717,7 +697,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multimixer", "Multiblock Mixer", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 9, 9, 0, @@ -735,7 +715,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.multidehydrator", "Multiblock Dehydrator", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 6, 9, 0, @@ -753,7 +733,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.semifluidgeneratorfuels", "Semifluid Generator Fuels", null, - RES_PATH_GUI + "basicmachines/Default", + "", 0, 0, 0, @@ -771,7 +751,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.flotationcell", "Flotation Cell", null, - RES_PATH_GUI + "basicmachines/LFTR", + "", 6, 0, 1, @@ -789,7 +769,7 @@ public class GTPP_Recipe extends GT_Recipe { "gtpp.recipe.treefarm", "Tree Growth Simulator", null, - RES_PATH_GUI + "basicmachines/FissionFuel", + "", 1, 2, 1, @@ -810,6 +790,7 @@ public class GTPP_Recipe extends GT_Recipe { @Override protected List<String> handleNEIItemOutputTooltip(List<String> currentTip, FixedPositionedStack pStack) { if (ModItems.fluidFertBasic != null && pStack.isChanceBased()) { + // noinspection deprecation currentTip .add(GRAY + "Outputted if " + ModItems.fluidFertBasic.getLocalizedName() + " is provided"); } else { @@ -824,6 +805,7 @@ public class GTPP_Recipe extends GT_Recipe { List<String> result = new ArrayList<>(); if (ModItems.fluidFertBasic != null) { result.add("The sapling is not consumed."); + // noinspection deprecation result.add("If " + ModItems.fluidFertBasic.getLocalizedName() + " is provided,"); result.add("Saplings are made instead"); } diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java index f6618cb1f8..094ef5a08c 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java @@ -1,6 +1,6 @@ package gregtech.api.util; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.enums.Mods.GregTech; import net.minecraftforge.fluids.FluidStack; @@ -12,7 +12,7 @@ public class GasSpargingRecipeMap extends AutoMap<GasSpargingRecipe> { public static final String mUnlocalizedName = "gtpp.recipe.lftr.sparging"; public static final String mNEIName = mUnlocalizedName; public static final String mNEIDisplayName = "LFTR Gas Sparging"; - public static final String mNEIGUIPath = RES_PATH_GUI + "basicmachines/FissionFuel.png"; + public static final String mNEIGUIPath = GregTech.getResourcePath("textures", "gui/basicmachines/FissionFuel.png"); public static boolean addRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack aSpargedFuel, FluidStack[] aOutputs, int[] aMaxOutputs) { diff --git a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java index 61e582c7a3..4bfa15855c 100644 --- a/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java +++ b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java @@ -18,10 +18,6 @@ public class MaterialHelper { return ItemUtils.getOrePrefixStack(oreprefix, material, amount); } - public static ItemStack getComponentFromGtMaterial(OrePrefixes oreprefix, Materials material, int amount) { - return ItemUtils.getGregtechOreStack(oreprefix, material, amount); - } - /** * Generates a 16 Fluid Pipe * diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java index cc3c2cd36e..7718f68176 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.util.GT_Utility; +import gregtech.common.covers.CoverInfo; import gtPlusPlus.core.tileentities.base.TileEntityBase; import gtPlusPlus.core.util.data.ArrayUtils; @@ -90,43 +91,21 @@ public class BTF_Inventory implements ISidedInventory { @Override public int[] getAccessibleSlotsFromSide(int ordinalSide) { final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); - ArrayList<Integer> tList = new ArrayList<Integer>(); - TileEntityBase tTileEntity = this.mTile; - boolean tSkip = tTileEntity.getCoverBehaviorAtSide(side).letsItemsIn( - side, - tTileEntity.getCoverIDAtSide(side), - tTileEntity.getCoverDataAtSide(side), - -2, - tTileEntity) - || tTileEntity.getCoverBehaviorAtSide(side).letsItemsOut( - side, - tTileEntity.getCoverIDAtSide(side), - tTileEntity.getCoverDataAtSide(side), - -2, - tTileEntity); + ArrayList<Integer> tList = new ArrayList<>(); + CoverInfo coverInfo = this.mTile.getCoverInfoAtSide(side); + boolean tSkip = coverInfo.letsItemsIn(-2) || coverInfo.letsItemsIn(-2); for (int rArray = 0; rArray < this.getSizeInventory(); ++rArray) { - if (this.isValidSlot(rArray) && (tSkip - || tTileEntity.getCoverBehaviorAtSide(side).letsItemsOut( - side, - tTileEntity.getCoverIDAtSide(side), - tTileEntity.getCoverDataAtSide(side), - rArray, - tTileEntity) - || tTileEntity.getCoverBehaviorAtSide(side).letsItemsIn( - side, - tTileEntity.getCoverIDAtSide(side), - tTileEntity.getCoverDataAtSide(side), - rArray, - tTileEntity))) { - tList.add(Integer.valueOf(rArray)); + if (this.isValidSlot(rArray) + && (tSkip || coverInfo.letsItemsOut(rArray) || coverInfo.letsItemsIn(rArray))) { + tList.add(rArray); } } int[] arg6 = new int[tList.size()]; for (int i = 0; i < arg6.length; ++i) { - arg6[i] = ((Integer) tList.get(i)).intValue(); + arg6[i] = tList.get(i); } return arg6; diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java index 08462c6c65..55f1df240f 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java @@ -28,7 +28,6 @@ public abstract class BlockBaseNBT extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - @SuppressWarnings("deprecation") public BlockBaseNBT(final Material material, final String unlocalName, final String displayName) { super(material); this.setBlockName(unlocalName); diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index 79b24e2405..57b70c1927 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -31,7 +31,6 @@ public class BlockTankXpConverter extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - @SuppressWarnings("deprecation") public BlockTankXpConverter() { super(Material.iron); this.setBlockName("blockTankXpConverter"); diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java index e73c88bee0..4b4390bc78 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java @@ -35,7 +35,6 @@ public class FirePit extends BasicBlock { public static final int META_ANTIBUILDER = 2; private int meta; - @SuppressWarnings("deprecation") public FirePit() { super("blockFirePit", Material.wood); this.setBlockName("blockFirePit"); diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java index dbcd3ed57c..0a09e902f7 100644 --- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java @@ -17,7 +17,6 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.ItemFluidContainer; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; @@ -35,13 +34,11 @@ public class FluidTankInfinite extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - @SuppressWarnings("deprecation") public FluidTankInfinite() { super(Material.iron); this.setBlockName("blockInfiniteFluidTank"); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, "blockInfiniteFluidTank"); - LanguageRegistry.addName(this, "Infinite Fluid Tank"); } /** diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java index 1e864a13c8..916385647c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java +++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java @@ -35,10 +35,8 @@ import gtPlusPlus.core.util.math.MathUtils; public class HellFire extends BlockFire { - @Deprecated private final int[] field_149849_a = new int[Short.MAX_VALUE]; - @Deprecated private final int[] field_149848_b = new int[Short.MAX_VALUE]; @SideOnly(Side.CLIENT) @@ -252,16 +250,6 @@ public class HellFire extends BlockFire { } /** - * Checks the specified block coordinate to see if it can catch fire. Args: blockAccess, x, y, z - */ - @Override - @Deprecated - public boolean canBlockCatchFire(final IBlockAccess p_149844_1_, final int p_149844_2_, final int p_149844_3_, - final int p_149844_4_) { - return this.canCatchFire(p_149844_1_, p_149844_2_, p_149844_3_, p_149844_4_, UP); - } - - /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ @Override diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java index 4d974b9a61..2d2a407057 100644 --- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java @@ -23,7 +23,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.common.items.GT_MetaGenerated_Tool_01; @@ -37,14 +36,12 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils; public abstract class BlockGenericRedstone extends BlockContainer { - @SuppressWarnings("deprecation") public BlockGenericRedstone(String aUnlocalizedSuffix, String aDisplayName) { super(Material.redstoneLight); this.setBlockName("blockGenericRedstone." + aUnlocalizedSuffix); this.setHardness(3f); this.setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockGenericRedstone." + aUnlocalizedSuffix); - LanguageRegistry.addName(this, aDisplayName); } private final HashMap<Integer, HashMap<ForgeDirection, IIcon>> mTextures = new HashMap<Integer, HashMap<ForgeDirection, IIcon>>(); diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index bf4fa41296..0fc3b5b666 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -34,7 +34,6 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { return this.mTooltipID; } - @SuppressWarnings("deprecation") public CircuitProgrammer() { super(Material.iron); } diff --git a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java index e5ee4633f5..1a2dba6e65 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java @@ -50,7 +50,6 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - @SuppressWarnings("deprecation") public DecayablesChest() { super(Material.iron); this.setBlockName("blockDecayablesChest"); @@ -184,24 +183,4 @@ public class DecayablesChest extends BlockContainer implements ITileTooltip { final int z) { return false; } - - /* - * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te = - * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te); - * super.breakBlock(world, pos, blockstate); } - * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, - * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap) - * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } } - */ - - /** - * Update Chest Meta - Stub - * - * @param aWorld - * @param xPos - * @param yPos - * @param zPos - */ - @Deprecated - public void func_149954_e(World aWorld, int xPos, int yPos, int zPos) {} } diff --git a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java index 74ed902b0d..90d74c5d37 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/EggBox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java @@ -49,7 +49,6 @@ public class EggBox extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - @SuppressWarnings("deprecation") public EggBox() { super(Material.wood); this.setBlockName("blockEggBox"); @@ -147,24 +146,4 @@ public class EggBox extends BlockContainer implements ITileTooltip { final int z) { return false; } - - /* - * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te = - * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te); - * super.breakBlock(world, pos, blockstate); } - * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, - * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap) - * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } } - */ - - /** - * Update Chest Meta - Stub - * - * @param aWorld - * @param xPos - * @param yPos - * @param zPos - */ - @Deprecated - public void func_149954_e(World aWorld, int xPos, int yPos, int zPos) {} } diff --git a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java index 569a7d5762..1fb1e97703 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java @@ -46,7 +46,6 @@ public class FishTrap extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - @SuppressWarnings("deprecation") public FishTrap() { super(Material.iron); this.setBlockName("blockFishTrap"); @@ -134,14 +133,4 @@ public class FishTrap extends BlockContainer implements ITileTooltip { final int z) { return false; } - - /* - * @Override public void breakBlock(World world, BlockPos pos, IBlockState blockstate) { TileEntityFishTrap te = - * (TileEntityFishTrap) world.getTileEntity(pos); InventoryHelper.dropInventoryItems(world, pos, te); - * super.breakBlock(world, pos, blockstate); } - * @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, - * ItemStack stack) { if (stack.hasDisplayName()) { ((TileEntityFishTrap) - * worldIn.getTileEntity(pos)).setCustomName(stack.getDisplayName()); } } - */ - } diff --git a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java index 8b83713d3b..a89de43744 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java @@ -28,7 +28,6 @@ public class HeliumGenerator extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - @SuppressWarnings("deprecation") public HeliumGenerator() { super(Material.wood); this.setBlockName("blockHeliumGenerator"); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java index a3cd9fb408..8c388f1408 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java @@ -43,7 +43,6 @@ public class Machine_ModularityTable extends BlockContainer implements ITileTool return this.mTooltipID; } - @SuppressWarnings("deprecation") public Machine_ModularityTable() { super(Material.iron); this.setBlockName("blockModularity"); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java index f833774683..68532bc478 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java @@ -47,7 +47,6 @@ public class Machine_PestKiller extends BlockContainer implements ITileTooltip { return this.mTooltipID; } - @SuppressWarnings("deprecation") public Machine_PestKiller() { super(Material.wood); this.setBlockName("blockPestKiller"); diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java index f2e848a1ee..4d34d96b21 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java @@ -52,7 +52,6 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip return this.mTooltipID; } - @SuppressWarnings("deprecation") public Machine_ProjectTable() { super(Material.iron); this.setBlockName("blockProjectBench"); diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java index e3f09dc25c..982b29ed97 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java @@ -41,7 +41,6 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { return ItemBlockBasicTile.class; } - @SuppressWarnings("deprecation") public VolumetricFlaskSetter() { super(Material.iron); } diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java index 102cff2232..76b27ce93e 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java @@ -158,7 +158,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { aFluidContainerData.put("FluidStack Local Name: " + aHeldItemFluid.getLocalizedName()); aFluidContainerData .put("Fluid Unlocal Name: " + aHeldItemFluid.getFluid().getUnlocalizedName()); - aFluidContainerData.put("Fluid Local Name: " + aHeldItemFluid.getFluid().getLocalizedName()); + aFluidContainerData.put("Fluid Local Name: " + aHeldItemFluid.getLocalizedName()); aFluidContainerData.put("Fluid Name: " + aHeldItemFluid.getFluid().getName()); } diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index 296fc0518d..fd8d317fe6 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -23,7 +23,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCircuits; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Cables; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Pipes; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_ComponentAssemblers; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Dehydrators; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_FluidTanks; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_GeothermalEngines; @@ -117,7 +116,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.showHiddenNEIItems; import static gtPlusPlus.core.lib.CORE.EVERGLADESBIOME_ID; import static gtPlusPlus.core.lib.CORE.EVERGLADES_ID; import static gtPlusPlus.core.lib.CORE.turbineCutoffBase; -import static gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames; import java.io.File; @@ -250,8 +248,6 @@ public class ConfigHandler { GregTech.ID, false, "These may be overpowered, Consult a local electrician."); - enableMachine_ComponentAssemblers = config - .getBoolean("enableComponentAssemblers", GregTech.ID, true, "These construct machine components."); enableMachine_Safes = config .getBoolean("enableMachineSafes", GregTech.ID, true, "These protect your goodies/rare stuff."); enableMachine_Dehydrators = config @@ -428,15 +424,6 @@ public class ConfigHandler { EVERGLADESBIOME_ID = config .getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension."); - // Blacklisted Accelerator TileEntities - BlacklistedTileEntiyClassNames = new String[] { - "com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry" }; - BlacklistedTileEntiyClassNames = config.getStringList( - "BlacklistedTileEntiyClassNames", - GregTech.ID, - BlacklistedTileEntiyClassNames, - "The Canonical Class-Names of TileEntities that should be ignored by the WorldAccelerator"); - // Pollution pollutionPerSecondMultiPackager = config .get( diff --git a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java index 120488acbb..46e56d3f1d 100644 --- a/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java +++ b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java @@ -45,15 +45,15 @@ public class ItemGenericFluidBucket extends ItemBucket { if (FluidFactory.mMetaToBucketMap.containsKey(aID)) { try { + // noinspection deprecation throw new GregtechException( - "" + aID - + " is already registered! Unable to register fluid: " + aID + " is already registered! Unable to register fluid: " + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); } catch (GregtechException e) { e.printStackTrace(); + // noinspection deprecation CORE.crash( - "" + aID - + " is already registered! Unable to register fluid: " + aID + " is already registered! Unable to register fluid: " + FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); } } diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index a326c7e693..eef430bd4e 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -48,7 +48,6 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAdvancedBoilers; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAlgaeContent; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAmazonWarehouse; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechBufferDynamos; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechComponentAssembler; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCustomHatches; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCyclotron; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator; @@ -185,7 +184,6 @@ public class COMPAT_HANDLER { GregtechWirelessChargers.run(); GregtechIndustrialGeneratorArray.run(); GregtechIndustrialCuttingFactory.run(); - GregtechComponentAssembler.run(); GregtechTeslaTower.run(); GregtechSuperChests.run(); GregtechIndustrialFishPond.run(); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java index a4040e14b2..194e585c0d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java @@ -128,7 +128,7 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { if (this.hasEffect.get(par1ItemStack.getItemDamage() - this.mOffset) != null) { return this.hasEffect.get(par1ItemStack.getItemDamage() - this.mOffset).getValue(); } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java index 8c3fdeb0f9..e846603070 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java @@ -86,7 +86,7 @@ public class BaseItemColourable extends Item { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return this.hasEffect; } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java index 9f026e0192..8fbc005ce8 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java @@ -76,7 +76,7 @@ public class BaseItemDamageable extends Item { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { int dmg = (int) getItemDamage(par1ItemStack); if (dmg > 200) { return true; @@ -174,13 +174,7 @@ public class BaseItemDamageable extends Item { } @Override - public boolean hasContainerItem() { - return true; - } - - @Override public boolean hasContainerItem(ItemStack stack) { - Logger.INFO("hasContainerItem? " + stack.getDisplayName()); return true; } diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java index 1e2ddb4aea..b1b9e05b9e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java @@ -232,7 +232,7 @@ public class CoreItem extends Item { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return this.hasEffect; } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java index f0f14c264d..8befe3c3ab 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java @@ -91,7 +91,7 @@ public class ItemBlockMeta extends ItemBlockWithMetadata { } @Override - public int getDisplayDamage(ItemStack stack) { + public int getDamage(ItemStack stack) { return 0; } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java index 414fd8c13b..80178b6c31 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java @@ -84,7 +84,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata { } @Override - public int getDisplayDamage(ItemStack stack) { + public int getDamage(ItemStack stack) { return 0; } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 90258da65b..004ae5f3e2 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -115,11 +115,6 @@ public class ItemGenericChemBase extends Item { } @Override - public int getDisplayDamage(ItemStack stack) { - return stack.getItemDamage(); - } - - @Override public int getItemEnchantability() { return 0; } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java index e176dc603a..0f9f7d0e5c 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java @@ -96,11 +96,6 @@ public class ItemNuclearChemBase extends Item { } @Override - public int getDisplayDamage(ItemStack stack) { - return stack.getItemDamage(); - } - - @Override public int getItemEnchantability() { return 0; } diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index d2ae1efca0..0b1c8eeadd 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -349,11 +349,6 @@ public class BaseItemMetaFood extends ItemFood { } @Override - public int getDisplayDamage(ItemStack stack) { - return stack.getItemDamage(); - } - - @Override public boolean showDurabilityBar(ItemStack stack) { return false; } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java index c48a54bc67..87ebded077 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java @@ -53,6 +53,7 @@ public class ItemGenericToken extends CoreItem { mCustomNameColours = new HashMap<Integer, EnumChatFormatting>(); mIcons = new HashMap<Integer, IIcon>(); mTextureDir = aTextureDir; + setMaxStackSize(64); } public boolean register(int id, String aLocalName, int aMaxStack, String aDescript) { @@ -135,7 +136,7 @@ public class ItemGenericToken extends CoreItem { } @Override - public boolean hasEffect(ItemStack par1ItemStack) { + public boolean hasEffect(ItemStack par1ItemStack, final int pass) { return false; } @@ -145,7 +146,7 @@ public class ItemGenericToken extends CoreItem { } @Override - public int getDisplayDamage(ItemStack stack) { + public int getDamage(ItemStack stack) { return 0; } @@ -165,20 +166,15 @@ public class ItemGenericToken extends CoreItem { } @Override - public int getItemStackLimit() { - return 64; - } - - @Override public int getItemStackLimit(ItemStack aStack) { if (aStack == null) { - return getItemStackLimit(); + return maxStackSize; } else { Integer aSize = mMaxStackSizes.get(aStack.getItemDamage()); if (aSize != null) { return aSize; } else { - return getItemStackLimit(); + return maxStackSize; } } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java index a8a279299b..a614a2b737 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java @@ -173,7 +173,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { int h = getCorrectMetaForItemstack(par1ItemStack); if (this.hasEffect.get(h) != null) { return this.hasEffect.get(h); diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java index 044519028d..dbaee70bd0 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java @@ -69,7 +69,7 @@ public class SandstoneHammer extends BaseItemWithDamageValue { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index 8df0ca1e55..d4caadc7f7 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -222,7 +222,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return false; } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java index 6dd6973749..ab154c2b24 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java @@ -131,7 +131,7 @@ public class MultiSpadeBase extends StaballoySpade { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java index 7ec3be72ca..660ec408c1 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java @@ -366,7 +366,7 @@ public class StaballoyAxe extends ItemAxe { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return true; } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java index 4fa76cc288..9601662c39 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java @@ -436,7 +436,7 @@ public class StaballoyPickaxe extends ItemPickaxe { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return true; } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java index 3be95912fe..c9a4def88c 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java @@ -383,7 +383,7 @@ public class StaballoySpade extends ItemSpade { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { return true; } diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 71a812e95a..b846434665 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -23,7 +23,6 @@ import net.minecraftforge.common.util.FakePlayerFactory; import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.FMLCommonHandler; -import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.random.XSTR; @@ -173,7 +172,6 @@ public class CORE { public static boolean enableMachine_Tesseracts = true; public static boolean enableMachine_SimpleWasher = true; public static boolean enableMachine_Pollution = true; - public static boolean enableMachine_ComponentAssemblers = false; public static boolean enableCustom_Pipes = true; public static boolean enableCustom_Cables = true; public static boolean enableMachine_RF_Convetor = false; @@ -271,8 +269,6 @@ public class CORE { public static class Everglades { - @Deprecated - public static final String MODID = Mods.Names.G_T_PLUS_PLUS_EVERGLADES; public static final String NAME = "GT++ Toxic Everglades"; public static final String VERSION = "GRADLETOKEN_VERSION"; } diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java index 1ee1b79cdd..ac94fa78ba 100644 --- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java @@ -52,7 +52,7 @@ public final class ELEMENT { public final Material ALUMINIUMOXIDE = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminiumoxide); public final Material SILICON = MaterialUtils.generateMaterialFromGtENUM(Materials.Silicon); public final Material SILICONDIOXIDE = MaterialUtils.generateMaterialFromGtENUM(Materials.SiliconDioxide); - public final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphor); + public final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphorus); public final Material SULFUR = MaterialUtils.generateMaterialFromGtENUM(Materials.Sulfur); public final Material CHLORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Chlorine); public final Material ARGON = MaterialUtils.generateMaterialFromGtENUM(Materials.Argon); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 06a1fb2841..5654dd00cf 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -517,7 +517,7 @@ public class RECIPES_GREGTECH { GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), ItemList.UV_Coil.get(16L, new Object() {}), ItemList.Conveyor_Module_UV.get(4L, new Object() {}), - new Object[] { OrePrefixes.circuit.get(Materials.Superconductor), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8 }, new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 16 }, ItemList.Circuit_Chip_PPIC.get(16, new Object() {}), ALLOY.PIKYONIUM.getPlate(16), ALLOY.CINOBITE.getScrew(32) }, diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 57e7caf43f..f8c673de6c 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -3416,23 +3416,11 @@ public class RECIPES_Machines { } private static void fakeMachineCasingCovers() { - GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { GregtechItemList.FakeMachineCasingPlate_ULV, - GregtechItemList.FakeMachineCasingPlate_LV, GregtechItemList.FakeMachineCasingPlate_MV, - GregtechItemList.FakeMachineCasingPlate_HV, GregtechItemList.FakeMachineCasingPlate_EV, - GregtechItemList.FakeMachineCasingPlate_IV, GregtechItemList.FakeMachineCasingPlate_LuV, - GregtechItemList.FakeMachineCasingPlate_ZPM, GregtechItemList.FakeMachineCasingPlate_UV, - GregtechItemList.FakeMachineCasingPlate_MAX, }; int aMaxTier = GT_Values.VOLTAGE_NAMES.length; ItemStack aTier[] = new ItemStack[aMaxTier]; for (int i = 0; i < aMaxTier; i++) { aTier[i] = ItemUtils.simpleMetaStack(CoverManager.Cover_Gt_Machine_Casing, i, 7); } - // Deprecate old recipes - for (int i = 0; i < 10; i++) { - RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] { mMachineCasingCovers[i].get(1) }, - ItemUtils.getSimpleStack(aTier[i], 1)); - } // Add recipes for new ones for (int i = 0; i < aMaxTier; i++) { GT_Values.RA diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index bb7704e530..98c77865a3 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -301,7 +301,6 @@ public class CI { return Materials._NULL; } - @Deprecated public static String getTieredComponent(OrePrefixes type, int tier) { Object material = getMaterialFromTier(tier); if (material != null) { @@ -445,11 +444,11 @@ public class CI { private static final Materials[] aMaterial_Cables = new Materials[] { Materials.Tin, Materials.Cobalt, Materials.AnnealedCopper, Materials.Gold, Materials.Titanium, Materials.Nichrome, Materials.Platinum, - Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium, Materials.Superconductor, }; + Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium, Materials.SuperconductorUHV, }; private static final Materials[] aMaterial_Circuits = new Materials[] { Materials.Primitive, Materials.Basic, Materials.Good, Materials.Advanced, Materials.Data, Materials.Data, Materials.Elite, Materials.Master, - Materials.Ultimate, Materials.Superconductor, Materials.Infinite, }; + Materials.Ultimate, Materials.SuperconductorUHV, Materials.Infinite, }; private static final Material[][] aMaster = new Material[][] { aMaterial_Main, aMaterial_Secondary, aMaterial_Tertiary }; @@ -608,7 +607,7 @@ public class CI { } else if (aTier == 8) { return ItemUtils.getOrePrefixStack(aPrefix, Materials.Ultimate, aAmount); } else if (aTier == 9) { - return ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.Superconductor, aAmount); + return ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.SuperconductorUHV, aAmount); } else if (aTier == 10) { return ItemUtils.getOrePrefixStack(aPrefix, Materials.Europium, aAmount); } else { diff --git a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java index 528ae6ef68..f7ed248669 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java +++ b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java @@ -1,7 +1,5 @@ package gtPlusPlus.core.tileentities; -import static gregtech.api.enums.Mods.Thaumcraft; - import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.general.BlockSuperLight.TileEntitySuperLight; @@ -23,7 +21,6 @@ import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner; -import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; public class ModTileEntities { @@ -49,19 +46,6 @@ public class ModTileEntities { GameRegistry.registerTileEntity(TileEntityEggBox.class, "TileEggBox"); GameRegistry.registerTileEntity(TileEntityVolumetricFlaskSetter.class, "TileEntityVolumetricFlaskSetter"); - - // Mod TEs - if (Thaumcraft.isModLoaded()) {} - - blacklistTilesFromAcceleration(); } - private static void blacklistTilesFromAcceleration() { - Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator( - "gtPlusPlus.core.tileentities.general.TileEntityFishTrap"); - Meta_GT_Proxy.setTileEntityClassAsBlacklistedInWorldAccelerator( - "gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest"); - Meta_GT_Proxy - .setTileEntityClassAsBlacklistedInWorldAccelerator("gtPlusPlus.core.tileentities.general.TileEggBox"); - } } diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java index 540005d8d1..563249672d 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java @@ -7,6 +7,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; +import gregtech.common.covers.CoverInfo; import gtPlusPlus.api.objects.minecraft.BTF_FluidTank; public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFluidTank { @@ -73,13 +74,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu public int fill(ForgeDirection side, FluidStack aFluid, boolean doFill) { if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mInputDisabled) - && (side == ForgeDirection.UNKNOWN - || (this.isLiquidInput(side) && getCoverBehaviorAtSide(side).letsFluidIn( - side, - getCoverIDAtSide(side), - getCoverDataAtSide(side), - aFluid == null ? null : aFluid.getFluid(), - this)))) + && (side == ForgeDirection.UNKNOWN || (this.isLiquidInput(side) + && getCoverInfoAtSide(side).letsFluidIn(aFluid == null ? null : aFluid.getFluid())))) return this.fillEx(side, aFluid, doFill); return 0; } @@ -88,13 +84,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu public FluidStack drain(ForgeDirection side, int maxDrain, boolean doDrain) { if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mOutputDisabled) - && (side == ForgeDirection.UNKNOWN - || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side).letsFluidOut( - side, - getCoverIDAtSide(side), - getCoverDataAtSide(side), - this.getFluid() == null ? null : this.getFluid().getFluid(), - this)))) + && (side == ForgeDirection.UNKNOWN || (this.isLiquidOutput(side) && getCoverInfoAtSide(side) + .letsFluidOut(this.getFluid() == null ? null : this.getFluid().getFluid())))) return this.drainEx(side, maxDrain, doDrain); return null; } @@ -103,13 +94,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu public FluidStack drain(ForgeDirection side, FluidStack aFluid, boolean doDrain) { if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mOutputDisabled) - && (side == ForgeDirection.UNKNOWN - || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side).letsFluidOut( - side, - getCoverIDAtSide(side), - getCoverDataAtSide(side), - aFluid == null ? null : aFluid.getFluid(), - this)))) + && (side == ForgeDirection.UNKNOWN || (this.isLiquidOutput(side) + && getCoverInfoAtSide(side).letsFluidOut(aFluid == null ? null : aFluid.getFluid())))) return this.drainEx(side, aFluid, doDrain); return null; } @@ -118,8 +104,8 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu public boolean canFill(ForgeDirection side, Fluid aFluid) { if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mInputDisabled) - && (side == ForgeDirection.UNKNOWN || (this.isLiquidInput(side) && getCoverBehaviorAtSide(side) - .letsFluidIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aFluid, this)))) + && (side == ForgeDirection.UNKNOWN + || (this.isLiquidInput(side) && getCoverInfoAtSide(side).letsFluidIn(aFluid)))) return this.canFillEx(side, aFluid); return false; } @@ -128,19 +114,18 @@ public class TileBasicTank extends TileEntityBase implements IFluidHandler, IFlu public boolean canDrain(ForgeDirection side, Fluid aFluid) { if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mOutputDisabled) - && (side == ForgeDirection.UNKNOWN || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side) - .letsFluidOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aFluid, this)))) + && (side == ForgeDirection.UNKNOWN + || (this.isLiquidOutput(side) && getCoverInfoAtSide(side).letsFluidOut(aFluid)))) return this.canDrainEx(side, aFluid); return false; } @Override public FluidTankInfo[] getTankInfo(ForgeDirection side) { - if (canAccessData() && (side == ForgeDirection.UNKNOWN - || (this.isLiquidInput(side) && getCoverBehaviorAtSide(side) - .letsFluidIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), null, this)) - || (this.isLiquidOutput(side) && getCoverBehaviorAtSide(side) - .letsFluidOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), null, this)))) + CoverInfo coverInfo = getCoverInfoAtSide(side); + if (canAccessData() + && (side == ForgeDirection.UNKNOWN || (this.isLiquidInput(side) && coverInfo.letsFluidIn(null)) + || (this.isLiquidOutput(side) && coverInfo.letsFluidOut(null)))) return this.getTankInfoEx(side); return new FluidTankInfo[] {}; } diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java index 032fa62956..762d5a4d61 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java @@ -23,10 +23,10 @@ import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.net.GT_Packet_Block_Event; import gregtech.api.util.GT_CoverBehavior; -import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; +import gregtech.common.covers.CoverInfo; import gtPlusPlus.api.interfaces.ILazyCoverable; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BTF_Inventory; @@ -264,10 +264,8 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public int[] getAccessibleSlotsFromSide(int ordinalSide) { final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); - if (canAccessData() && (getCoverBehaviorAtSide(side) - .letsItemsOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), -1, this) - || getCoverBehaviorAtSide(side) - .letsItemsIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), -1, this))) + CoverInfo coverInfo = getCoverInfoAtSide(side); + if (canAccessData() && (coverInfo.letsItemsOut(-1) || coverInfo.letsItemsIn(-1))) return mInventory.getAccessibleSlotsFromSide(ordinalSide); return new int[0]; } @@ -279,8 +277,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); return canAccessData() && (mRunningThroughTick || !mInputDisabled) - && getCoverBehaviorAtSide(side) - .letsItemsIn(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aIndex, this) + && getCoverInfoAtSide(side).letsItemsIn(aIndex) && mInventory.canInsertItem(aIndex, aStack, ordinalSide); } @@ -291,8 +288,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT public boolean canExtractItem(int aIndex, ItemStack aStack, int ordinalSide) { final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); return canAccessData() && (mRunningThroughTick || !mOutputDisabled) - && getCoverBehaviorAtSide(side) - .letsItemsOut(side, getCoverIDAtSide(side), getCoverDataAtSide(side), aIndex, this) + && getCoverInfoAtSide(side).letsItemsOut(aIndex) && mInventory.canExtractItem(aIndex, aStack, ordinalSide); } @@ -431,8 +427,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT private boolean isEnergyInputSide(ForgeDirection side) { if (side != ForgeDirection.UNKNOWN) { - if (!this.getCoverBehaviorAtSide(side) - .letsEnergyIn(side, this.getCoverIDAtSide(side), this.getCoverDataAtSide(side), this)) { + if (!this.getCoverInfoAtSide(side).letsEnergyIn()) { return false; } @@ -450,8 +445,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT private boolean isEnergyOutputSide(ForgeDirection side) { if (side != ForgeDirection.UNKNOWN) { - if (!this.getCoverBehaviorAtSide(side) - .letsEnergyOut(side, this.getCoverIDAtSide(side), this.getCoverDataAtSide(side), this)) { + if (!this.getCoverInfoAtSide(side).letsEnergyOut()) { return false; } @@ -872,10 +866,6 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT this.worldObj.setBlock(this.xCoord, this.yCoord, this.zCoord, Blocks.fire); } - public String trans(String aKey, String aEnglish) { - return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false); - } - @Override public byte getInternalInputRedstoneSignal(ForgeDirection side) { return (byte) (getCoverBehaviorAtSide(side).getRedstoneInput( @@ -955,7 +945,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT final int ordinalSide = side.ordinal(); mCoverSides[ordinalSide] = aID; mCoverData[ordinalSide] = 0; - mCoverBehaviors[ordinalSide] = GregTech_API.getCoverBehavior(aID); + mCoverBehaviors[ordinalSide] = (GT_CoverBehavior) GregTech_API.getCoverBehaviorNew(aID); return true; } return false; @@ -969,7 +959,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public void setCoverItemAtSide(ForgeDirection side, ItemStack aCover) { - GregTech_API.getCoverBehavior(aCover).placeCover(side, aCover, this); + GregTech_API.getCoverBehaviorNew(aCover).placeCover(side, aCover, this); } @Override diff --git a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java index 75a3daacad..57c75640a6 100644 --- a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java @@ -14,18 +14,6 @@ import gtPlusPlus.api.objects.data.AutoMap; public class ArrayUtils { - public static <V> V[] expandArray(final V[] someArray, final V newValueToAdd) { - V[] series = someArray; - series = addElement(series, newValueToAdd); - return series; - } - - private static <V> V[] addElement(V[] series, final V newValueToAdd) { - series = Arrays.copyOf(series, series.length + 1); - series[series.length - 1] = newValueToAdd; - return series; - } - public static <V> V[] insertElementAtIndex(V[] aArray, int aIndex, V aObjectToInsert) { V[] newArray = Arrays.copyOf(aArray, aArray.length + 1); for (int i = 0; i < aIndex; i++) { @@ -38,13 +26,6 @@ public class ArrayUtils { return newArray; } - /* - * public static <V> Object getMostCommonElement(List<V> list) { Optional r = - * list.stream().map(V::getTextureSet).collect(Collectors.groupingBy(Function.identity(), - * Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey); return - * r.get(); } - */ - public static Object[] removeNulls(final Object[] v) { List<Object> list = new ArrayList<Object>(Arrays.asList(v)); list.removeAll(Collections.singleton((Object) null)); diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java index 187839e48a..e2922ee642 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java @@ -57,14 +57,6 @@ public class EntityUtils { return d; } - @Deprecated - public static Block findBlockUnderEntityNonBoundingBox(final Entity parEntity) { - final int blockX = MathHelper.floor_double(parEntity.posX); - final int blockY = MathHelper.floor_double(parEntity.posY - 0.2D - parEntity.yOffset); - final int blockZ = MathHelper.floor_double(parEntity.posZ); - return parEntity.worldObj.getBlock(blockX, blockY, blockZ); - } - public static Block findBlockUnderEntity(final Entity parEntity) { final int blockX = MathHelper.floor_double(parEntity.posX); final int blockY = MathHelper.floor_double(parEntity.boundingBox.minY) - 1; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java index f5920b5549..0646b26866 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -74,17 +74,6 @@ public class FluidUtils { return FluidUtils.getFluidStack("ic2superheatedsteam", amount); } - @Deprecated - /** - * Do not use - Gives third tier steam - Not implemented - * - * @param amount - * @return - */ - public static FluidStack getHyperSteam(final int amount) { - return FluidUtils.getFluidStack("water", amount); - } - public static FluidStack getUUA(final int amount) { return FluidUtils.getFluidStack("uuamplifier", amount); } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 6ecc4ab5df..0cfa4e7646 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -21,7 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; @@ -957,27 +956,6 @@ public class ItemUtils { return getItemStackOfAmountFromOreDictNoBroken(oredictName, amount); } - @Deprecated - public static ItemStack getGregtechOreStack(OrePrefixes mPrefix, Materials mMat, int mAmount) { - - ItemStack aTemp = getOrePrefixStack(mPrefix, mMat, mAmount); - if (aTemp != null) { - return aTemp; - } - - String mName = MaterialUtils.getMaterialName(mMat); - - String mItemName = mPrefix.name() + mName; - // Utils.LOG_INFO("[Component Maker] Trying to get "+mItemName+"."); - ItemStack gregstack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(mItemName, mAmount); - if (gregstack == null) { - // Utils.LOG_INFO("[Component Maker] Failed to get "+mItemName+"."); - return null; - } - // Utils.LOG_INFO("[Component Maker] Found "+mItemName+"."); - return (gregstack); - } - public static ItemStack getOrePrefixStack(OrePrefixes mPrefix, Material mMat, int mAmount) { String mName = Utils.sanitizeString(mMat.getLocalizedName()); @@ -1182,10 +1160,6 @@ public class ItemUtils { return aFluid != null ? aFluid.getFluid().getLocalizedName(aFluid) : "NULL"; } - public static String getFluidName(Fluid aFluid) { - return aFluid != null ? aFluid.getLocalizedName() : "NULL"; - } - public static String getItemName(ItemStack aStack) { if (aStack == null) { return "ERROR - Empty Stack"; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java index fc728960fd..eabaf46866 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java @@ -12,7 +12,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.LanguageRegistry; -import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -53,10 +52,6 @@ public class LangUtils { return false; } - public static String trans(String aNr, String aEnglish) { - return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_GTPP_" + aNr, aEnglish, false); - } - /** * Quick Block Name Lookup that is friendly to servers and locale. */ diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 78e6034b06..3fdef9f94f 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -31,7 +31,6 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; public class MaterialUtils { @@ -75,8 +74,7 @@ public class MaterialUtils { } try { - @SuppressWarnings("deprecation") - String name = material.name(); + String name = material.mName; final short[] rgba = (customRGB == null ? material.mRGBa : customRGB); final int melting = material.mMeltingPoint; final int boiling = material.mBlastFurnaceTemp; @@ -178,12 +176,12 @@ public class MaterialUtils { return M; } else { Logger.DEBUG_MATERIALS( - "Failed to generate GT++ material instance for " + material.name() + "Failed to generate GT++ material instance for " + material.mName + " | Valid RGB? " + (hasValidRGBA(rgba))); } } catch (Throwable t) { - Logger.DEBUG_MATERIALS("Failed to generate GT++ material instance for " + material.name()); + Logger.DEBUG_MATERIALS("Failed to generate GT++ material instance for " + material.mName); t.printStackTrace(); } return null; @@ -285,20 +283,10 @@ public class MaterialUtils { return null; } - @SuppressWarnings("deprecation") public static String getMaterialName(Materials mat) { - - String mName = null; - - try { - mName = (String) ReflectionUtils.getField(Materials.class, "mDefaultLocalName").get(mat); - if (mName == null) { - mName = (String) ReflectionUtils.getField(Materials.class, "mName").get(mat); - } - } catch (IllegalArgumentException | IllegalAccessException e) {} - + String mName = mat.mDefaultLocalName; if (mName == null || mName.equals("")) { - mName = mat.name(); + mName = mat.mName; } return mName; } @@ -315,12 +303,6 @@ public class MaterialUtils { } } return aCounter.getResults(); - /* - * Optional<TextureSet> r = - * list.stream().map(Material::getTextureSet).collect(Collectors.groupingBy(Function.identity(), - * Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey); - * TextureSet o = (r != null && r.isPresent() && r.get() != null) ? r.get() : null; return o; - */ } public static Materials getMaterial(String aMaterialName, String aFallbackMaterialName) { @@ -443,7 +425,7 @@ public class MaterialUtils { public static boolean isNullGregtechMaterial(Materials aGregtechMaterial) { if (aGregtechMaterial == Materials._NULL || aGregtechMaterial.equals(Materials._NULL) - || aGregtechMaterial.name().equals(Materials._NULL.name())) { + || aGregtechMaterial.mName.equals(Materials._NULL.mName)) { return true; } return false; diff --git a/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java index 7730a9a522..f3452dcbe8 100644 --- a/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java +++ b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java @@ -1,17 +1,14 @@ package gtPlusPlus.core.util.player; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Properties; import java.util.UUID; @@ -79,45 +76,6 @@ public class PlayerCache { } } - /** - * Reads a "properties" file, and returns it as a Map (a collection of key/value pairs). - * - * Credit due to Alvin Alexander - - * http://alvinalexander.com/java/java-properties-file-map-example?nocache=1#comment-8215 Changed slightly as the - * filename and delimiter are constant in my case. - * - * @param filename The properties filename to read. - * @param delimiter The string (or character) that separates the key from the value in the properties file. - * @return The Map that contains the key/value pairs. - * @throws Exception - */ - @Deprecated - public static Map<String, String> readPropertiesFileAsMapOld() throws Exception { - final String delimiter = "="; - @SuppressWarnings({ "rawtypes", "unchecked" }) - final Map<String, String> map = new HashMap<>(); - final BufferedReader reader = new BufferedReader(new FileReader(cache)); - String line; - while ((line = reader.readLine()) != null) { - if (line.trim().length() == 0) { - continue; - } - if (line.charAt(0) == '#') { - continue; - } - // assumption here is that proper lines are like "String : <a href="http://xxx.yyy.zzz/foo/bar"" - // title="http://xxx.yyy.zzz/foo/bar"">http://xxx.yyy.zzz/foo/bar"</a>, - // and the ":" is the delimiter - final int delimPosition = line.indexOf(delimiter); - final String key = line.substring(0, delimPosition - 1).trim(); - final String value = line.substring(delimPosition + 1).trim(); - map.put(key, value); - } - reader.close(); - CORE.PlayerCache = map; - return map; - } - public static HashMap<String, UUID> readPropertiesFileAsMap() { HashMap<String, UUID> map = null; try { diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index 1c238691ac..95e73a71f6 100644 --- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -464,11 +464,6 @@ public class ReflectionUtils { } } - @Deprecated - public static void setFinalStatic(Field field, Object newValue) throws Exception { - cacheAccessor(field).setValue(null, newValue); - } - public static void setByte(Object clazz, String fieldName, byte newValue) throws Exception { Field nameField = getField(clazz.getClass(), fieldName); cacheAccessor(nameField).setValue(null, newValue); @@ -775,18 +770,6 @@ public class ReflectionUtils { } } - @Deprecated - public static Method getMethodViaReflection(final Class<?> lookupClass, final String methodName, - final boolean invoke) throws Exception { - final Class<? extends Class> lookup = lookupClass.getClass(); - final Method m = lookup.getDeclaredMethod(methodName); - m.setAccessible(true); // Abracadabra - if (invoke) { - m.invoke(lookup); // now its OK - } - return m; - } - private static Method getMethod_Internal(Class<?> aClass, String aMethodName, Class<?>... aTypes) { Method m = null; try { diff --git a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java index 6fafb08a31..6567e75cfb 100644 --- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java +++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java @@ -212,13 +212,14 @@ public class ChunkProviderModded implements IChunkProvider { public void replaceBlocksForBiome(int p_147422_1_, int p_147422_2_, Block[] p_147422_3_, byte[] p_147422_4_, BiomeGenBase[] p_147422_5_) { - @SuppressWarnings("deprecation") ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks( this, p_147422_1_, p_147422_2_, p_147422_3_, - p_147422_5_); + new byte[256], + p_147422_5_, + null); MinecraftForge.EVENT_BUS.post(event); if (event.getResult() == cpw.mods.fml.common.eventhandler.Event.Result.DENY) return; diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java index fa34803054..b8e53047af 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java @@ -444,7 +444,6 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { ore4String = "unset"; Map<Materials, String> gtOreMap = new HashMap<Materials, String>(); - @SuppressWarnings("deprecation") public boolean setOreBlock(World aWorld, int aX, int aY, int aZ, Block aMetaData, boolean isSmallOre, boolean air) { if (!air) { aY = Math.min(aWorld.getActualHeight(), Math.max(aY, 1)); @@ -468,7 +467,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { if (this.mPrimaryMeta == aMetaData) { for (Materials f : Materials.values()) { if (!gtOreMap.containsKey(f)) { - gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase())); + gtOreMap.put(f, Utils.sanitizeString(f.mName.toLowerCase())); } fString = gtOreMap.get(f); if (fString.contains(ore1String)) { @@ -490,7 +489,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { if (this.mSecondaryMeta == aMetaData) { for (Materials f : Materials.values()) { if (!gtOreMap.containsKey(f)) { - gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase())); + gtOreMap.put(f, Utils.sanitizeString(f.mName.toLowerCase())); } fString = gtOreMap.get(f); if (fString.contains(ore2String)) { @@ -512,7 +511,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { if (this.mBetweenMeta == aMetaData) { for (Materials f : Materials.values()) { if (!gtOreMap.containsKey(f)) { - gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase())); + gtOreMap.put(f, Utils.sanitizeString(f.mName.toLowerCase())); } fString = gtOreMap.get(f); if (fString.contains(ore3String)) { @@ -534,7 +533,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { if (this.mSporadicMeta == aMetaData) { for (Materials f : Materials.values()) { if (!gtOreMap.containsKey(f)) { - gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase())); + gtOreMap.put(f, Utils.sanitizeString(f.mName.toLowerCase())); } fString = gtOreMap.get(f); if (fString.contains(ore4String)) { diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java index 17e0ccf4e9..399be59ff1 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java @@ -133,11 +133,6 @@ public class ItemAgrichemBase extends Item { } @Override - public int getDisplayDamage(ItemStack stack) { - return stack.getItemDamage(); - } - - @Override public int getItemEnchantability() { return 0; } diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java index 6aae34fdf1..0fab6a2c96 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java @@ -128,11 +128,6 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { } @Override - public int getDisplayDamage(ItemStack stack) { - return stack.getItemDamage(); - } - - @Override public boolean showDurabilityBar(ItemStack stack) { return false; } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index b839f52d02..3fb8229b7f 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -30,7 +30,6 @@ public class LeavesBase extends BlockLeaves { protected String[] treeType = new String[] {}; protected ItemStack[] bonusDrops; - @SuppressWarnings("deprecation") public LeavesBase(String blockNameLocalized, String blockNameUnlocalized, ItemStack[] bonusDrops) { this.bonusDrops = bonusDrops; String blockName = "block" + Utils.sanitizeString(blockNameLocalized) + "Leaves"; diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 3547c8b5bf..6c4ea6a556 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -26,7 +26,6 @@ public abstract class LogBase extends BlockLog { protected IIcon[] textureSide; protected IIcon[] textureTop; - @SuppressWarnings("deprecation") public LogBase(String blockNameLocalized, String blockNameUnlocalized, String[] treeTypes) { this.treeType = treeTypes; String blockName = "block" + Utils.sanitizeString(blockNameLocalized) + "Log"; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java index d27f478169..64b744aaf8 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java @@ -155,8 +155,8 @@ public class GTPP_Bees { } private Materials trySetValue(String material) { - Materials mTemp = Materials.valueOf(material); - if (mTemp != null) { + Materials mTemp = Materials.get(material); + if (mTemp != Materials._NULL) { return mTemp; } return Materials._NULL; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java index 70856235dd..e5d36d15e8 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java @@ -78,7 +78,7 @@ public class MB_ItemFrame extends Item implements IHiveFrame { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { if ((this.rarity_value == EnumRarity.uncommon) || (this.rarity_value == EnumRarity.common)) { return false; } diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java index 54cde6194c..8d3a79c74b 100644 --- a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java +++ b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java @@ -64,6 +64,7 @@ public class HandlerTooltip_GC { for (int aMapKey : RocketFuels.mValidRocketFuels.keySet()) { Fluid aFuel = RocketFuels.mValidRocketFuels.get(aMapKey); if (aFuel != null) { + // noinspection deprecation mFuelNames.put(aMapKey, aFuel.getLocalizedName()); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index e51b27f974..2343b6e76e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -651,18 +651,6 @@ public enum GregtechItemList implements GregtechItemContainer { // Auto TC Research Creator Thaumcraft_Researcher, - // Threaded Buffers - Automation_Threaded_SuperBuffer_ULV, - Automation_Threaded_SuperBuffer_LV, - Automation_Threaded_SuperBuffer_MV, - Automation_Threaded_SuperBuffer_HV, - Automation_Threaded_SuperBuffer_EV, - Automation_Threaded_SuperBuffer_IV, - Automation_Threaded_SuperBuffer_LuV, - Automation_Threaded_SuperBuffer_ZPM, - Automation_Threaded_SuperBuffer_UV, - Automation_Threaded_SuperBuffer_MAX, - // infinite Items Infinite_Item_Chest, @@ -769,19 +757,6 @@ public enum GregtechItemList implements GregtechItemContainer { Charger_UV, Charger_MAX, - // Tiny Fusion - /* Miniature_Fusion, */ - - // Component Makers - Machine_LV_Component_Maker, - Machine_MV_Component_Maker, - Machine_HV_Component_Maker, - Machine_EV_Component_Maker, - Machine_IV_Component_Maker, - Machine_LuV_Component_Maker, - Machine_ZPM_Component_Maker, - Machine_UV_Component_Maker, - // Reactor Processing Unit ReactorProcessingUnit_IV, ReactorProcessingUnit_ZPM, @@ -969,18 +944,6 @@ public enum GregtechItemList implements GregtechItemContainer { Cover_Overflow_Item_EV, Cover_Overflow_Item_IV, - // Fake Hull Covers - FakeMachineCasingPlate_ULV, - FakeMachineCasingPlate_LV, - FakeMachineCasingPlate_MV, - FakeMachineCasingPlate_HV, - FakeMachineCasingPlate_EV, - FakeMachineCasingPlate_IV, - FakeMachineCasingPlate_LuV, - FakeMachineCasingPlate_ZPM, - FakeMachineCasingPlate_UV, - FakeMachineCasingPlate_MAX, - // ---------------------------------------------------------------------------- ; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 96ff9f6aef..8812043cfe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -350,7 +350,7 @@ public enum GregtechOrePrefixes { + "' with the Prefix '" + this.name() + "' and the Material '" - + aMaterial.name() + + aMaterial.mName + "' at " + GT_Utility.getClassName(tRegistrator)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java index 680206596b..e194a4b3f5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java @@ -216,19 +216,6 @@ public interface IGregtech_RecipeAdder { FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aDuration, int aEUt); - /** - * Adds a Recipe for the Machine Component Assembler. (up to 6 Inputs) - * - * @param aInputs = ItemStack[] (not null, and respects StackSize) - * @param aFluidInput = Input of a fluid (can be null, and respects StackSize) - * @param aOutput1 = Output ItemStack (not null, and respects StackSize) - * @param aDuration = Duration (must be >= 0) - * @param aEUt = EU per tick needed for heating up (must be >= 0) - * @return true if the Recipe got added, otherwise false. - */ - boolean addComponentMakerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, - int aEUt); - boolean addMultiblockCentrifugeRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java index b5dd1ba16c..a66cce394d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java @@ -69,7 +69,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool */ public Gregtech_MetaTool(final String aUnlocalized) { super(aUnlocalized); - GT_ModHandler.registerBoxableItemToToolBox(this); + GT_ModHandler.registerBoxableItemToToolBox(new ItemStack(this)); this.setCreativeTab(AddToCreativeTab.tabMachines); this.setMaxStackSize(1); sInstances.put(this.getUnlocalizedName(), this); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java index 51596dd8cd..9a09ad6538 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java @@ -12,9 +12,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo */ public final byte mTier; - @Deprecated - public final String mDescription; - /** * A simple Description. */ @@ -30,7 +27,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo super(aID, aName, aNameRegional, aInvSlotCount); mTier = (byte) Math.max(0, Math.min(aTier, 9)); mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription }; - mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : ""; // must always be the last call! if (GT.isClientSide()) mTextures = getTextureSet(aTextures); else mTextures = null; @@ -41,7 +37,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo super(aID, aName, aNameRegional, aInvSlotCount); mTier = (byte) Math.max(0, Math.min(aTier, 9)); mDescriptionArray = aDescription == null ? new String[0] : aDescription; - mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : ""; // must always be the last call! if (GT.isClientSide()) mTextures = getTextureSet(aTextures); @@ -53,7 +48,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo super(aName, aInvSlotCount); mTier = (byte) aTier; mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription }; - mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : ""; mTextures = aTextures; } @@ -62,7 +56,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo super(aName, aInvSlotCount); mTier = (byte) aTier; mDescriptionArray = aDescription == null ? new String[0] : aDescription; - mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : ""; mTextures = aTextures; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java index cc5f1eff85..79975d3ac8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java @@ -6,6 +6,7 @@ import net.minecraft.world.World; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.SoundResource; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.CustomMetaTileBase; @@ -57,14 +58,7 @@ public abstract class MetaTileEntityCustomPower extends CustomMetaTileBase { short tY = this.getBaseMetaTileEntity().getYCoord(); int tZ = this.getBaseMetaTileEntity().getZCoord(); World tWorld = this.getBaseMetaTileEntity().getWorld(); - GT_Utility.sendSoundToPlayers( - tWorld, - (String) GregTech_API.sSoundList.get(Integer.valueOf(209)), - 1.0F, - -1.0F, - tX, - tY, - tZ); + GT_Utility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1.0F, tX, tY, tZ); tWorld.setBlock(tX, tY, tZ, Blocks.air); if (GregTech_API.sMachineExplosions) { tWorld.createExplosion( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java index 82174fad3a..7ceae20109 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java @@ -17,14 +17,14 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_F super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java index d2760ef106..235354f396 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java @@ -11,14 +11,18 @@ public class GT_MetaTileEntity_Hatch_AirIntake_Extreme extends GT_MetaTileEntity super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_AirIntake_Extreme(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_AirIntake_Extreme( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java index dacde53cdb..e85cc1f6c2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -48,7 +50,7 @@ public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; + return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java index 03a188be0b..1811ee6183 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java @@ -15,16 +15,11 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - /* - * public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription, - * final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - */ - @Override public ITexture[] getTexturesActive(final ITexture aBaseTexture) { return new ITexture[] { aBaseTexture, TexturesGtBlock.OVERLAYS_ENERGY_OUT_MULTI_BUFFER[this.mTier] }; @@ -47,11 +42,7 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return (MetaTileEntity) new GT_MetaTileEntity_Hatch_DynamoBuffer( - this.mName, - this.mTier, - this.mDescription, - this.mTextures); + return new GT_MetaTileEntity_Hatch_DynamoBuffer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java index c1e0095726..6a8b3a9af6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java @@ -20,7 +20,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -129,11 +128,6 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {} @Override - public String trans(String aKey, String aEnglish) { - return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false); - } - - @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { Logger.INFO("Checking if we can pull " + aStack.getDisplayName() + " from slot " + aIndex); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java index cd696fbf56..34eb5ccf16 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java @@ -33,7 +33,7 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_FluidGenerator(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_Hatch_FluidGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java index 8294e5f9b7..1fca67d295 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java @@ -6,6 +6,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -31,7 +33,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Chargeable Item Bus for Multiblocks"); } - public GT_MetaTileEntity_Hatch_InputBattery(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_InputBattery(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 4 : 16, aDescription, aTextures); } @@ -46,7 +48,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc } else { mSlots = 16; } - return new String[] { this.mDescription, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get()); } @Override @@ -111,7 +113,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_InputBattery(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_InputBattery(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java index 9dae243444..232d8a8c55 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java @@ -31,13 +31,6 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In initHatch(); } - public GT_MetaTileEntity_Hatch_Naquadah(final String aName, final String aDescription, - final ITexture[][][] aTextures) { - super(aName, 6, aDescription, aTextures); - mFluidCapacity = 32000; - initHatch(); - } - public GT_MetaTileEntity_Hatch_Naquadah(final String aName, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, 6, aDescription[0], aTextures); @@ -102,7 +95,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return (MetaTileEntity) new GT_MetaTileEntity_Hatch_Naquadah(this.mName, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_Naquadah(this.mName, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java index f46e9feece..502dd0ee0b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java @@ -6,6 +6,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -27,7 +29,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Dischargeable Item Bus for Multiblocks"); } - public GT_MetaTileEntity_Hatch_OutputBattery(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_OutputBattery(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 9 : 16, aDescription, aTextures); } @@ -42,7 +44,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat } else { mSlots = 16; } - return new String[] { this.mDescription, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get()); } @Override @@ -102,7 +104,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OutputBattery(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_OutputBattery(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java index eaf09ecbac..2e16d7783e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java @@ -17,14 +17,14 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_Reservoir(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_Hatch_Reservoir(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Reservoir(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_Reservoir(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java index 9631bbab6e..47e30ab50c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java @@ -20,7 +20,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; @@ -148,17 +147,12 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha disableSort = !disableSort; GT_Utility.sendChatToPlayer( aPlayer, - trans("200.1", "Automatic Item Shuffling: ") - + (disableSort ? trans("087", "Disabled") : trans("088", "Enabled"))); + GT_Utility.trans("200.1", "Automatic Item Shuffling: ") + + (disableSort ? GT_Utility.trans("087", "Disabled") : GT_Utility.trans("088", "Enabled"))); } } @Override - public String trans(String aKey, String aEnglish) { - return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false); - } - - @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java index 34501bed7a..e8ef0a454b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java @@ -8,12 +8,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -54,11 +57,14 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { @Override public String[] getDescription() { - return new String[] { this.mDescription, "Right Click with a soldering iron to reset controller link", + return ArrayUtils.addAll( + this.mDescriptionArray, + "Right Click with a soldering iron to reset controller link", "Right Click with a wrench to remove turbine", "Right Click with a screwdriver for technical information", "Sneak + Right Click with a wrench to rotate", - "Sneak + Right Click with a screwdriver to disable animations", CORE.GT_Tooltip.get() }; + "Sneak + Right Click with a screwdriver to disable animations", + CORE.GT_Tooltip.get()); } @Override @@ -391,7 +397,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { GT_Utility.sendChatToPlayer(aPlayer, tChat); GT_Utility.sendSoundToPlayers( g.getWorld(), - GregTech_API.sSoundList.get(101), + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1, g.getXCoord(), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java index 4ab5ccece8..226086a1ff 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java @@ -31,19 +31,18 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_TurbineProvider(String aName, int aTier, String aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - public GT_MetaTileEntity_Hatch_TurbineProvider(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription[0], aTextures); + super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_TurbineProvider(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_TurbineProvider( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java index 44174b4fc6..ac6cb4319a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java @@ -9,7 +9,6 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.util.extensions.ArrayExt; import gtPlusPlus.core.lib.CORE; public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_InputBus { @@ -34,11 +33,7 @@ public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_In @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SuperBus_Input( - this.mName, - this.mTier, - ArrayExt.of(this.mDescription), - this.mTextures); + return new GT_MetaTileEntity_SuperBus_Input(this.mName, this.mTier, mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java index 50b18382da..e109d065bd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java @@ -12,7 +12,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.util.GT_Utility; -import gregtech.api.util.extensions.ArrayExt; import gtPlusPlus.core.lib.CORE; public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_OutputBus { @@ -42,11 +41,7 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SuperBus_Output( - this.mName, - this.mTier, - ArrayExt.of(this.mDescription), - this.mTextures); + return new GT_MetaTileEntity_SuperBus_Output(this.mName, this.mTier, mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java index 79f8c4d381..67fbb22e92 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java @@ -1,6 +1,5 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; -import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.Dyes; @@ -29,7 +28,7 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid { public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess, GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) { - super(aID, aName, aNameRegional, aThickNess, null, aCapacity, aHeatResistance, aGasProof); + super(aID, aName, aNameRegional, aThickNess, null, aCapacity, aHeatResistance, aGasProof, aFluidTypes); this.mLastReceivedFrom = 0; this.oLastReceivedFrom = 0; this.mMaterial = aMaterial; @@ -37,7 +36,7 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid { public GregtechMetaPipeEntityFluid(String aName, float aThickNess, GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) { - super(aName, aThickNess, null, aCapacity, aHeatResistance, aGasProof); + super(aName, aThickNess, null, aCapacity, aHeatResistance, aGasProof, aFluidTypes); this.mLastReceivedFrom = 0; this.oLastReceivedFrom = 0; this.mMaterial = aMaterial; @@ -115,17 +114,4 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid { aMaterial.mIconSet.mTextures[OrePrefixes.pipeHuge.mTextureIndex], Dyes.getModulation(aColorIndex, aMaterial.mRGBa)); } - - @Override - public String[] getDescription() { - return new String[] { - EnumChatFormatting.BLUE + "Fluid Capacity: %%%" - + (mCapacity * 20) - + "%%% L/sec" - + EnumChatFormatting.GRAY, - EnumChatFormatting.RED + "Heat Limit: %%%" + mHeatResistance + "%%% K" + EnumChatFormatting.GRAY, - EnumChatFormatting.DARK_GREEN + "Gas Proof: " + (this.mGasProof) + EnumChatFormatting.GRAY, - // CORE.GT_Tooltip - }; - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java index acd2e316aa..627ef2d65b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java @@ -11,23 +11,13 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase { - @Override - public String[] getDescription() { - return new String[] { this.mDescription }; - } - public GregtechMetaTreeFarmerStructural(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier, 0, "Structural Blocks for the Tree Farmer."); } - public GregtechMetaTreeFarmerStructural(final int aID, final String aName, final String aNameRegional, - final int aTier, final int aInvSlotCount, final String aDescription) { - super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription); - } - public GregtechMetaTreeFarmerStructural(final String aName, final int aTier, final int aInvSlotCount, - final String aDescription, final ITexture[][][] aTextures) { + final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); } @@ -37,7 +27,7 @@ public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase this.mName, this.mTier, this.mInventory.length, - this.mDescription, + this.mDescriptionArray, this.mTextures); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java index 69a9c67d57..1aa319652f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java @@ -44,13 +44,6 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H } public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final String aName, - final String aDescription, final ITexture[][][] aTextures) { - super(aName, 6, 3, aDescription, aTextures); - this.mLockedFluid = aFluid; - this.mFluidCapacity = aAmount; - } - - public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final String aName, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, 6, 3, aDescription[0], aTextures); this.mLockedFluid = aFluid; @@ -202,7 +195,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H this.mLockedFluid, this.mFluidCapacity, this.mName, - this.mDescription, + this.mDescriptionArray, this.mTextures); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java index 34afa0b440..a9dd8d3a97 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java @@ -4,6 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -21,7 +23,7 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer super(aID, aName, aNameRegional, aTier, aDescription); } - public GregtechMetaTransformerHiAmp(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GregtechMetaTransformerHiAmp(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -80,13 +82,16 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTransformerHiAmp(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GregtechMetaTransformerHiAmp(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override public String[] getDescription() { - return new String[] { this.mDescription, "Accepts 4A and outputs 16A", - "Toggle 2A/8A half-mode with Screwdriver", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll( + this.mDescriptionArray, + "Accepts 4A and outputs 16A", + "Toggle 2A/8A half-mode with Screwdriver", + CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 11e2e8661b..6841f93ebb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -28,6 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -435,7 +436,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public void startSoundLoop(final byte aIndex, final double aX, final double aY, final double aZ) { super.startSoundLoop(aIndex, aX, aY, aZ); if (aIndex == 1) { - GT_Utility.doSoundAtClient(getSound(), 10, 1.0F, aX, aY, aZ); + GT_Utility.doSoundAtClient(new ResourceLocation(getSound()), 10, 1.0F, aX, aY, aZ); } } @@ -1443,7 +1444,6 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex /** * Enable Texture Casing Support if found in GT 5.09 */ - @SuppressWarnings("deprecation") public boolean updateTexture(final IMetaTileEntity aTileEntity, int aCasingID) { try { // gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch.updateTexture(int) @@ -1463,7 +1463,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex log("Bad Method Call for updateTexture."); if (GT_MetaTileEntity_Hatch.class.isInstance(aMetaTileEntity)) { if (aCasingID <= Byte.MAX_VALUE) { - ((GT_MetaTileEntity_Hatch) aTileEntity).mMachineBlock = (byte) aCasingID; + ((GT_MetaTileEntity_Hatch) aTileEntity).updateTexture(aCasingID); log( "Good Method Call for updateTexture. Used fallback method of setting mMachineBlock as casing id was <= 128."); return true; @@ -2451,7 +2451,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex mToolStacks.put( true + "SOFTHAMMER", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SOFTHAMMER, 1, GOOD, Materials.Tungsten, null)); + .getToolWithStats(GT_MetaGenerated_Tool_01.SOFTMALLET, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "SCREWDRIVER", GT_MetaGenerated_Tool_01.INSTANCE @@ -2480,7 +2480,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex mToolStacks.put( false + "SOFTHAMMER", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SOFTHAMMER, 1, BAD, Materials.Tungsten, null)); + .getToolWithStats(GT_MetaGenerated_Tool_01.SOFTMALLET, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "SCREWDRIVER", GT_MetaGenerated_Tool_01.INSTANCE diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java index 3217f4b8fb..dd063840c6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java @@ -12,6 +12,7 @@ import net.minecraftforge.fluids.IFluidHandler; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SoundResource; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -36,7 +37,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures); } - public GregtechMetaBoilerBase(final String aName, final int aTier, final String aDescription, + public GregtechMetaBoilerBase(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } @@ -166,7 +167,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank @Override public boolean allowCoverOnSide(final ForgeDirection side, final GT_ItemStack aCover) { - return GregTech_API.getCoverBehavior(aCover.toStack()).isSimpleCover(); + return GregTech_API.getCoverBehaviorNew(aCover.toStack()).isSimpleCover(); } @Override @@ -332,7 +333,7 @@ public abstract class GregtechMetaBoilerBase extends GT_MetaTileEntity_BasicTank @Override public void doSound(final byte aIndex, final double aX, final double aY, final double aZ) { if (aIndex == 1) { - GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(Integer.valueOf(4)), 2, 1.0F, aX, aY, aZ); + GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ); for (int l = 0; l < 8; l++) { this.getBaseMetaTileEntity().getWorld().spawnParticle( "largesmoke", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java index 5265b2572b..a64903e445 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java @@ -5,6 +5,8 @@ import static gregtech.api.enums.GT_Values.V; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.enums.Textures; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.interfaces.ITexture; @@ -24,7 +26,7 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures); } - public GregtechMetaSolarGenerator(final String aName, final int aTier, final String aDescription, + public GregtechMetaSolarGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @@ -59,7 +61,7 @@ public abstract class GregtechMetaSolarGenerator extends GT_MetaTileEntity_Basic @Override public String[] getDescription() { - return new String[] { this.mDescription, "Efficiency: " + this.getEfficiency() + "%" }; + return ArrayUtils.add(this.mDescriptionArray, "Efficiency: " + this.getEfficiency() + "%"); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java index 8abfdd3052..0200113e95 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java @@ -10,6 +10,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.enums.Textures; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.interfaces.ITexture; @@ -36,7 +38,7 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ * CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); } - public GregtechRocketFuelGeneratorBase(final String aName, final int aTier, final String aDescription, + public GregtechRocketFuelGeneratorBase(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); pollMin = (int) (CORE.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator @@ -76,8 +78,11 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ @Override public String[] getDescription() { String aPollution = "Causes between " + pollMin + " and " + pollMax + " Pollution per second"; - return new String[] { this.mDescription, "Fuel Efficiency: " + this.getEfficiency() + "%", aPollution, - CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll( + this.mDescriptionArray, + "Fuel Efficiency: " + this.getEfficiency() + "%", + aPollution, + CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java index 714eb561d9..a53915b3d6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java @@ -24,7 +24,6 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bUnbreakable = false; public int mSuccess = 0, mTargetStackSize = 0; public UUID ownerUUID; - private boolean value_last = false, value_current = false; public GregtechMetaSafeBlockBase(final int aID, final String aName, final String aNameRegional, final int aTier, final int aInvSlotCount, final String aDescription) { @@ -32,7 +31,7 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered } public GregtechMetaSafeBlockBase(final String aName, final int aTier, final int aInvSlotCount, - final String aDescription, final ITexture[][][] aTextures) { + final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java index de77f9b1a8..25e831d4ef 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java @@ -12,16 +12,13 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public abstract class GregtechMetaTreeFarmerBase extends GT_MetaTileEntity_TieredMachineBlock { - public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bUnbreakable = false; - public int mSuccess = 0, mTargetStackSize = 0; - public GregtechMetaTreeFarmerBase(final int aID, final String aName, final String aNameRegional, final int aTier, final int aInvSlotCount, final String aDescription) { super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription); } public GregtechMetaTreeFarmerBase(final String aName, final int aTier, final int aInvSlotCount, - final String aDescription, final ITexture[][][] aTextures) { + final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java index 486cd7205e..9bf0ad3f53 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java @@ -3,6 +3,8 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -18,12 +20,8 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N super(aID, aName, aNameRegional, 0, 16, "Dedicated Catalyst Storage", false); } - public GT_MetaTileEntity_Hatch_Catalysts(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, 0, 16, aDescription, false, aTextures); - } - public GT_MetaTileEntity_Hatch_Catalysts(String aName, String[] aDescription, ITexture[][][] aTextures) { - super(aName, 0, 16, aDescription[0], false, aTextures); + super(aName, 0, 16, aDescription, false, aTextures); } @Override @@ -38,7 +36,7 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N @Override public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; + return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java index 68f491e48f..240ed3624f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java @@ -3,6 +3,8 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -18,12 +20,8 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc super(aID, aName, aNameRegional, 6, 4, "Dedicated Milling Ball Storage", false); } - public GT_MetaTileEntity_Hatch_MillingBalls(String aName, String aDescription, ITexture[][][] aTextures) { - super(aName, 6, 4, aDescription, false, aTextures); - } - public GT_MetaTileEntity_Hatch_MillingBalls(String aName, String[] aDescription, ITexture[][][] aTextures) { - super(aName, 6, 4, aDescription[0], false, aTextures); + super(aName, 6, 4, aDescription, false, aTextures); } @Override @@ -38,7 +36,7 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc @Override public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; + return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java index e4e72d4b63..5555d1ff09 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java @@ -38,14 +38,6 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE mAllowDuplicateUsageTypes = aAllowDuplicateTypes; } - public GT_MetaTileEntity_Hatch_NbtConsumable(String aName, int aTier, int aInputSlots, String aDescription, - boolean aAllowDuplicateTypes, ITexture[][][] aTextures) { - super(aName, aTier, aInputSlots * 2, aDescription, aTextures); - mInputslotCount = getInputSlotCount(); - mTotalSlotCount = getInputSlotCount() * 2; - mAllowDuplicateUsageTypes = aAllowDuplicateTypes; - } - public GT_MetaTileEntity_Hatch_NbtConsumable(String aName, int aTier, int aInputSlots, String[] aDescription, boolean aAllowDuplicateTypes, ITexture[][][] aTextures) { super(aName, aTier, aInputSlots * 2, aDescription, aTextures); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java index d532459a70..2af07b1ea2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java @@ -1,7 +1,6 @@ package gtPlusPlus.xmod.gregtech.common; import java.lang.reflect.Constructor; -import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -19,8 +18,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.ArrayUtils; - import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; @@ -50,7 +47,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.LangUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity; import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.BaseCustomPower_MTE; import gtPlusPlus.xmod.gregtech.common.covers.CoverManager; @@ -356,27 +352,6 @@ public class Meta_GT_Proxy { } } - public static boolean setTileEntityClassAsBlacklistedInWorldAccelerator(String aClassName) { - Class aMainModClass = ReflectionUtils.getClass("com.dreammaster.main.MainRegistry"); - Class aCoreModConfig = ReflectionUtils.getClass("com.dreammaster.config"); - if (aMainModClass != null && aCoreModConfig != null) { - Field aCoreConfig = ReflectionUtils.getField(aMainModClass, "CoreConfig"); - if (aCoreConfig != null) { - Field aBlackList = ReflectionUtils.getField(aCoreModConfig, "BlacklistedTileEntiyClassNames"); - Object aInstance = ReflectionUtils.getFieldValue(aCoreConfig); - if (aBlackList != null && aInstance != null) { - String[] aBlackListValue = (String[]) ReflectionUtils.getFieldValue(aBlackList, aInstance); - if (aBlackListValue != null) { - aBlackListValue = ArrayUtils.add(aBlackListValue, aClassName); - ReflectionUtils.setField(aInstance, aBlackList, aBlackListValue); - return true; - } - } - } - } - return false; - } - public static void setValidHeatingCoilMetas() { for (int i = 0; i <= 6; i++) { GT_ValidHeatingCoilMetas.put(i); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java index e99feff75a..af80b7c684 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java @@ -21,7 +21,6 @@ import gregtech.api.util.GT_Utility; import gregtech.api.util.ISerializableObject; import gregtech.common.gui.modularui.widget.CoverDataControllerWidget; import gregtech.common.gui.modularui.widget.CoverDataFollower_TextFieldWidget; -import gtPlusPlus.core.util.minecraft.LangUtils; public class GTPP_Cover_Overflow extends GT_CoverBehavior { @@ -86,7 +85,7 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { } GT_Utility.sendChatToPlayer( aPlayer, - LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L")); + GT_Utility.trans("322", "Overflow point: ") + aCoverVariable + GT_Utility.trans("323", "L")); return aCoverVariable; } @@ -107,8 +106,8 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { } GT_Utility.sendChatToPlayer( aPlayer, - LangUtils.trans("322", "Overflow point: ") + aCoverVariable + trans("323", "L")); - aTileEntity.setCoverDataAtSide(side, aCoverVariable); + GT_Utility.trans("322", "Overflow point: ") + aCoverVariable + GT_Utility.trans("323", "L")); + aTileEntity.setCoverDataAtSide(side, new ISerializableObject.LegacyCoverData(aCoverVariable)); return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java index f7657de5a9..2366bbe87f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java @@ -12,10 +12,11 @@ import net.minecraftforge.fluids.Fluid; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_CoverBehavior; +import gregtech.api.util.GT_Utility; +import gregtech.api.util.ISerializableObject; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.api.objects.random.XSTR; -import gtPlusPlus.core.util.minecraft.LangUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior { @@ -40,7 +41,7 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior { public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { PlayerUtils - .messagePlayer(aPlayer, LangUtils.trans("756", "Connectable: ") + getConnectionState(aCoverVariable)); + .messagePlayer(aPlayer, GT_Utility.trans("756", "Connectable: ") + getConnectionState(aCoverVariable)); return super.onCoverRightclick(side, aCoverID, aCoverVariable, aTileEntity, aPlayer, aX, aY, aZ); } @@ -77,10 +78,6 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior { return getConnectionState(aCoverVariable); } - public String getDescription(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { - return LangUtils.trans("756", "Connectable: ") + getConnectionState(aCoverVariable); - } - public int getTickRate(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return 1; } @@ -158,11 +155,8 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior { private static final void trySetState(ForgeDirection side, int aState, ICoverable aTile) { // Try set cover state directly - if (aTile instanceof IGregTechTileEntity) { - IGregTechTileEntity gTileEntity = (IGregTechTileEntity) aTile; - if (gTileEntity != null) { - gTileEntity.setCoverDataAtSide(side, aState); - } + if (aTile instanceof IGregTechTileEntity gTileEntity) { + gTileEntity.setCoverDataAtSide(side, new ISerializableObject.LegacyCoverData(aState)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java index bb88429645..6ed8c7ed0a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java @@ -1,280 +1,12 @@ package gtPlusPlus.xmod.gregtech.common.helpers; -import static gregtech.api.enums.Mods.Forestry; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableTreeFarmerParticles; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Queue; -import java.util.Set; -import java.util.Stack; -import java.util.concurrent.ConcurrentHashMap; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockAir; -import net.minecraft.block.IGrowable; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.network.play.server.S23PacketBlockChange; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.ChunkPosition; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.BonemealEvent; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import com.google.common.collect.Lists; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import gnu.trove.set.hash.THashSet; -import gregtech.api.enums.Mods; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.Textures; -import gregtech.api.enums.ToolDictNames; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.players.FakeFarmer; import gtPlusPlus.core.slots.SlotBuzzSaw.SAWTOOL; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.particles.BlockBreakParticles; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; public class TreeFarmHelper { - public static final FluidStack fertT1 = FluidUtils.getFluidStack("fluid.fertiliser", 3); - public static final FluidStack fertT2 = FluidUtils.getFluidStack("fluid.un18fertiliser", 2); - public static final FluidStack fertT3 = FluidUtils.getFluidStack("fluid.un32fertiliser", 1); - private static final int sawOreId = OreDictionary.getOreID(ToolDictNames.craftingToolSaw.name()); - - public static ITexture[][][] getTextureSet() { - final ITexture[][][] rTextures = new ITexture[10][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = TreeFarmHelper.getFront(i); - rTextures[1][i + 1] = TreeFarmHelper.getBack(i); - rTextures[2][i + 1] = TreeFarmHelper.getBottom(i); - rTextures[3][i + 1] = TreeFarmHelper.getTop(i); - rTextures[4][i + 1] = TreeFarmHelper.getSides(i); - rTextures[5][i + 1] = TreeFarmHelper.getFrontActive(i); - rTextures[6][i + 1] = TreeFarmHelper.getBackActive(i); - rTextures[7][i + 1] = TreeFarmHelper.getBottomActive(i); - rTextures[8][i + 1] = TreeFarmHelper.getTopActive(i); - rTextures[9][i + 1] = TreeFarmHelper.getSidesActive(i); - } - return rTextures; - } - - public static ITexture[] getFront(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] }; - } - - public static ITexture[] getBack(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] }; - } - - public static ITexture[] getBottom(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] }; - } - - public static ITexture[] getTop(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] }; - } - - public static ITexture[] getSides(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][aColor + 1] }; - } - - public static ITexture[] getFrontActive(final byte aColor) { - return getFront(aColor); - } - - public static ITexture[] getBackActive(final byte aColor) { - return getBack(aColor); - } - - public static ITexture[] getBottomActive(final byte aColor) { - return getBottom(aColor); - } - - public static ITexture[] getTopActive(final byte aColor) { - return getTop(aColor); - } - - public static ITexture[] getSidesActive(final byte aColor) { - return getSides(aColor); - } - - public static boolean applyBonemeal(final EntityPlayer player, final World world, final int intX, final int intY, - final int intZ, final short multiplier) { - final Block block = world.getBlock(intX, intY, intZ); - - int roll; - int rollNeeded; - - if (multiplier == 1) { - roll = MathUtils.randInt(1, 15); - rollNeeded = 15; - } else if (multiplier == 2) { - roll = MathUtils.randInt(1, 10); - rollNeeded = 10; - } else { - roll = MathUtils.randInt(1, 5); - rollNeeded = 5; - } - - if (roll != rollNeeded) { - return false; - } - - // EntityPlayer player = FakePlayerFactory.getMinecraft((WorldServer)world); - if (!world.isRemote) { - if (enableTreeFarmerParticles) { - world.playAuxSFX(2005, intX, intY, intZ, 0); - } - } - final BonemealEvent event = new BonemealEvent(player, world, block, intX, intY, intZ); - if (MinecraftForge.EVENT_BUS.post(event)) { - Logger.MACHINE_INFO("Not sure why this returned false"); - return false; - } - if (event.getResult() == Result.ALLOW) { - if (!world.isRemote) { - world.playAuxSFX(2005, intX, intY, intZ, 0); - } - return true; - } - if (block instanceof IGrowable) { - final IGrowable igrowable = (IGrowable) block; - if (igrowable.func_149851_a(world, intX, intY, intZ, world.isRemote)) { - if (!world.isRemote) { - if (igrowable.func_149852_a(world, CORE.RANDOM, intX, intY, intZ)) { - igrowable.func_149853_b(world, CORE.RANDOM, intX, intY, intZ); - } - } - return true; - } - } - return false; - } - - public static boolean cleanUp(final IGregTechTileEntity aBaseMetaTileEntity) { - Logger.MACHINE_INFO("called cleanUp()"); - int cleanedUp = 0; - final int xDir = aBaseMetaTileEntity.getBackFacing().offsetX * 11; - final int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ * 11; - - for (int h = 1; h < 175; h++) { - for (int i = -11; i <= 11; i++) { - for (int j = -11; j <= 11; j++) { - - final Block testBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j); - - if ((((i == -8) || (i == 8)) || ((i == -9) || (i == 9)) - || ((i == -10) || (i == 10)) - || ((i == -11) || (i == 11))) - && (((j == -8) || (j == 8)) || ((j == -9) || (j == 9)) - || ((j == -10) || (j == 10)) - || ((j == -11) || (j == 11)))) { - - if (!testBlock.getUnlocalizedName().toLowerCase().contains("air") - || !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) { - // Logger.WARNING("5:"+testBlock.getUnlocalizedName()); - } else { - aBaseMetaTileEntity.getWorld().setBlock( - aBaseMetaTileEntity.getXCoord() + xDir + i, - aBaseMetaTileEntity.getYCoord() + h, - aBaseMetaTileEntity.getZCoord() + zDir + j, - Blocks.bookshelf); - } - } - - // If not in the middle - don't know how else to check this one without lots of != - if ((i != 7) && (i != -7) - && (j != 7) - && (j != -7) - && (i != 6) - && (i != -6) - && (j != 6) - && (j != -6) - && (i != 5) - && (i != -5) - && (j != 5) - && (j != -5) - && (i != 4) - && (i != -4) - && (j != 4) - && (j != -4) - && (i != 3) - && (i != -3) - && (j != 3) - && (j != -3) - && (i != 2) - && (i != -2) - && (j != 2) - && (j != -2) - && (i != 1) - && (i != -1) - && (j != 1) - && (j != -1) - && (i != 0) - && (j != 0)) { - - if (!testBlock.getUnlocalizedName().toLowerCase().contains("air") - || !testBlock.getUnlocalizedName().toLowerCase().contains("pumpkin")) { - // Logger.WARNING("0:"+testBlock.getUnlocalizedName()); - } else { - aBaseMetaTileEntity.getWorld().setBlock( - aBaseMetaTileEntity.getXCoord() + xDir + i, - aBaseMetaTileEntity.getYCoord() + h, - aBaseMetaTileEntity.getZCoord() + zDir + j, - Blocks.melon_block); - } - - if (isLeaves(testBlock) || isWoodLog(testBlock)) { - // Logger.WARNING("1:"+testBlock.getUnlocalizedName()); - int posiX, posiY, posiZ; - posiX = aBaseMetaTileEntity.getXCoord() + xDir + i; - posiY = aBaseMetaTileEntity.getYCoord() + h; - posiZ = aBaseMetaTileEntity.getZCoord() + zDir + j; - // Utils.LOG_MACHINE_INFO("Cleaning Up some leftovers."); - cleanedUp++; - aBaseMetaTileEntity.getWorld().setBlockToAir(posiX, posiY, posiZ); - new BlockBreakParticles(aBaseMetaTileEntity.getWorld(), posiX, posiY, posiZ, Blocks.dirt); - } else { - // Utils.LOG_WARNING("2:"+testBlock.getUnlocalizedName()); - } - } else { - // Utils.LOG_WARNING("1"); - } - } - } - } - Logger.MACHINE_INFO("cleaning up | " + cleanedUp); - return true; - } - public static boolean isValidForGUI(final ItemStack aStack) { return isCorrectMachinePart(aStack) != SAWTOOL.NONE; } @@ -297,751 +29,4 @@ public class TreeFarmHelper { return SAWTOOL.NONE; } - public static ToolType getPartType(final ItemStack aStack) { - if (aStack != null) { - // Utils.LOG_WARNING("Found "+aStack.getDisplayName()+" in the GUI slot."); - - if (aStack.getItem() == MetaGeneratedGregtechItems.INSTANCE) { - int aDmg = aStack.getItemDamage(); - if (aDmg >= 32120 && aDmg <= 32128) { - return ToolType.Unbreakable; - } - Logger.INFO("bad Tool in Slot 2 | " + aStack.getUnlocalizedName().toLowerCase() + " | " + aDmg); - return null; - } - - if (aStack.getItem() instanceof GT_MetaGenerated_Tool) { - if (Arrays.stream(OreDictionary.getOreIDs(aStack)).anyMatch(i -> i == sawOreId)) - return ToolType.Breakable; - } - } - Logger.INFO("bad Tool in Slot 4"); - return null; - } - - public static boolean isHumusLoaded = false; - public static boolean isForestryLogsLoaded = false; - public static boolean isForestryFenceLoaded = false; - public static boolean isForestrySaplingsLoaded = false; - public static boolean isForestryLeavesLoaded = false; - public static Block blockHumus; - - public static boolean isForestryValid() { - if (!Forestry.isModLoaded()) { - return false; - } - if (ReflectionUtils.doesClassExist("forestry.core.blocks.BlockSoil")) { - isHumusLoaded = true; - } - if (ReflectionUtils.doesClassExist("forestry.arboriculture.blocks.BlockLog")) { - isForestryLogsLoaded = true; - } - if (ReflectionUtils.doesClassExist("forestry.arboriculture.blocks.BlockArbFence")) { - isForestryFenceLoaded = true; - } - if (ReflectionUtils.doesClassExist("forestry.arboriculture.blocks.BlockSapling")) { - isForestrySaplingsLoaded = true; - } - if (ReflectionUtils.doesClassExist("forestry.arboriculture.blocks.BlockForestryLeaves")) { - isForestryLeavesLoaded = true; - } - return true; - } - - @Optional.Method(modid = Mods.Names.FORESTRY) - public static Block getHumus() { - if (blockHumus != null) { - return blockHumus; - } else if (isHumusLoaded) { - final Class<?> humusClass = ReflectionUtils.getClass("forestry.core.blocks.BlockSoil"); - final ItemStack humusStack = ItemUtils.getCorrectStacktype("Forestry:soil", 1); - if (humusClass != null) { - blockHumus = Block.getBlockFromItem(humusStack.getItem()); - return Block.getBlockFromItem(humusStack.getItem()); - } - } - return null; - } - - public static boolean isWoodLog(final Block log) { - final String tTool = log.getHarvestTool(0); - - if ((log == Blocks.log) || (log == Blocks.log2)) { - return true; - } - - // Forestry/General Compat - if (log.getClass().getName().toLowerCase().contains("blocklog")) { - return true; - } - - // IC2 Rubber Tree Compat - if (log.getClass().getName().toLowerCase().contains("rubwood") - || log.getClass().getName().toLowerCase().contains("rubleaves")) { - return true; - } - - return (OrePrefixes.log.contains(new ItemStack(log, 1)) && ((tTool != null) && (tTool.equals("axe")))) - || (log.getMaterial() != Material.wood) ? false - : (OrePrefixes.fence.contains(new ItemStack(log, 1)) ? false : true); - } - - public static boolean isLeaves(final Block log) { - if (log.getUnlocalizedName().toLowerCase().contains("leaf")) { - return true; - } - if (log.getUnlocalizedName().toLowerCase().contains("leaves")) { - return true; - } - if (log.getLocalizedName().toLowerCase().contains("leaf")) { - return true; - } - if (log.getLocalizedName().toLowerCase().contains("leaves")) { - return true; - } - return OrePrefixes.leaves.contains(new ItemStack(log, 1)) || log.getMaterial() == Material.leaves - || OrePrefixes.treeLeaves.contains(new ItemStack(log, 1)) - || log.getMaterial() == Material.vine - || OrePrefixes.mushroom.contains(new ItemStack(log, 1)) - || log.getMaterial() == Material.cactus; - } - - public static boolean isSapling(final Block log) { - if (log != null) { - if (OrePrefixes.sapling.contains(new ItemStack(log, 1))) { - // Logger.WARNING(""+log.getLocalizedName()); - } - if (log.getLocalizedName().toLowerCase().contains("sapling")) { - // Logger.WARNING(""+log.getLocalizedName()); - return true; - } - } - return OrePrefixes.sapling.contains(new ItemStack(log, 1)); - } - - public static boolean isDirtBlock(final Block dirt) { - return (dirt == Blocks.dirt ? true - : (dirt == Blocks.grass ? true : (getHumus() == null ? false : (dirt == blockHumus ? true : false)))); - } - - public static boolean isFenceBlock(final Block fence) { - return (fence == Blocks.fence ? true - : (fence == Blocks.fence_gate ? true - : (fence == Blocks.nether_brick_fence ? true - : (OrePrefixes.fence.contains(new ItemStack(fence, 1)) ? true : false)))); - } - - public static boolean isAirBlock(final Block air) { - if (air.getLocalizedName().toLowerCase().contains("air")) { - return true; - } - if (air.getClass().getName().toLowerCase().contains("residual") - || air.getClass().getName().toLowerCase().contains("heat")) { - return true; - } - return (air == Blocks.air ? true : (air instanceof BlockAir ? true : false)); - } - - /* - * public static boolean isSaplingBlock(Block sapling){ return (sapling == Blocks.sapling ? true : (sapling == - * Blocks.)) } - */ - - public static BlockPos checkForLogsInGrowArea(final IGregTechTileEntity aBaseMetaTileEntity) { - final int xDir = aBaseMetaTileEntity.getBackFacing().offsetX * 7; - final int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ * 7; - for (int i = -7; i <= 7; i++) { - for (int j = -7; j <= 7; j++) { - for (int h = 0; h <= 1; h++) { - // Farm Floor inner 14x14 - if (((i != -7) && (i != 7)) && ((j != -7) && (j != 7))) { - if (h == 1) { - if (TreeFarmHelper.isWoodLog(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j))) { - Logger.INFO("Found a Log"); - return new BlockPos( - aBaseMetaTileEntity.getXCoord() + xDir + i, - aBaseMetaTileEntity.getYCoord() + h, - aBaseMetaTileEntity.getZCoord() + zDir + j, - aBaseMetaTileEntity.getWorld()); - } - } - } - } - } - } - return null; - } - - public static ItemStack[] findTreeFromBase(World world, BlockPos h) { - int HARD_LIMIT = 10000; - int mCount = 0; - Logger.INFO("Finding Rest of Tree."); - BlockPos mFirstSpot = h; - Set<BlockPos> mSearchedSpaces = new HashSet<BlockPos>(); - Set<BlockPos> mTreeSet = getConnectedBlocks(world, mFirstSpot, mSearchedSpaces); - Set<Set<BlockPos>> mTreeSet2 = new HashSet<Set<BlockPos>>(); - Set<BlockPos> mFinalTree = new HashSet<BlockPos>(); - Iterator<BlockPos> it = mTreeSet.iterator(); - - Logger.INFO("Running first iteration."); - while (it.hasNext()) { - BlockPos G = it.next(); - mSearchedSpaces.add(G); - mTreeSet2.add(getConnectedBlocks(world, G, mSearchedSpaces)); - mCount++; - Logger.INFO("First Search: " + G.getLocationString()); - if (mCount > HARD_LIMIT) { - break; - } - } - - mCount = 0; - Iterator<Set<BlockPos>> it2 = mTreeSet2.iterator(); - Iterator<BlockPos> it3; - Logger.INFO("Running second iteration."); - while (it2.hasNext()) { - Set<BlockPos> G = it2.next(); - it3 = G.iterator(); - while (it3.hasNext()) { - BlockPos G2 = it3.next(); - mSearchedSpaces.add(G2); - mFinalTree.add(G2); - mCount++; - Logger.INFO("Second Search: " + G2.getLocationString()); - if (mCount > HARD_LIMIT) { - break; - } - } - if (mCount > HARD_LIMIT) { - break; - } - } - - if (mFinalTree.size() > 0) { - Logger.INFO("Queuing " + mFinalTree.size() + " to Harvest Manager."); - TreeCutter harvestManager = new TreeCutter(world); - - Iterator<BlockPos> ith = mFinalTree.iterator(); - while (ith.hasNext()) { - BlockPos G = ith.next(); - harvestManager.queue(G); - mCount++; - Logger.INFO("Queued: " + G.getLocationString()); - if (mCount > HARD_LIMIT) { - break; - } - } - - if (harvestManager.isValid) { - ItemStack[] loot = harvestManager.getDrops(); - if (loot.length > 0) { - // Logger.INFO("Returning Drops from harvestManager Queue."); - return loot; - } - } - } - return new ItemStack[] {}; - } - - public static Set<BlockPos> getConnectedBlocks(World W, BlockPos P, Set<BlockPos> checkedSpaces) { - int HARD_LIMIT = 1000; - int mCount = 0; - Logger.INFO("Finding blocks connected to " + P.getLocationString() + "."); - Set<BlockPos> mCheckedSpaces = checkedSpaces; - Set<BlockPos> mStartSearch = searchSixFaces(W, P, mCheckedSpaces, false); - Set<BlockPos> mSecondSearch = new HashSet<BlockPos>(); - Set<BlockPos> mThirdSearch = new HashSet<BlockPos>(); - Iterator<BlockPos> it = mStartSearch.iterator(); - while (it.hasNext()) { - Logger.INFO("Running first iteration. [II]"); - BlockPos G = it.next(); - mCheckedSpaces.add(G); - Set<BlockPos> mBranchSearch = searchSixFaces(W, G, mCheckedSpaces, true); - Iterator<BlockPos> it2 = mBranchSearch.iterator(); - while (it2.hasNext()) { - Logger.INFO("Running second iteration. [II]"); - BlockPos G2 = it2.next(); - mCheckedSpaces.add(G2); - mSecondSearch.add(G2); - mCount++; - if (mCount > HARD_LIMIT) { - break; - } - } - if (mCount > HARD_LIMIT) { - break; - } - } - mCount = 0; - Iterator<BlockPos> itx = mSecondSearch.iterator(); - while (itx.hasNext()) { - BlockPos G = itx.next(); - mCheckedSpaces.add(G); - Set<BlockPos> mBranchSearch = searchSixFaces(W, G, mCheckedSpaces, true); - Iterator<BlockPos> it2 = mBranchSearch.iterator(); - while (it2.hasNext()) { - BlockPos G2 = it2.next(); - mCheckedSpaces.add(G2); - mThirdSearch.add(G2); - mCount++; - if (mCount > HARD_LIMIT) { - break; - } - } - if (mCount > HARD_LIMIT) { - break; - } - } - return mThirdSearch; - } - - public static Set<BlockPos> searchSixFaces(World W, BlockPos P, Set<BlockPos> checkedSpaces, boolean checkLeaves) { - Set<BlockPos> mConnected = new HashSet<BlockPos>(); - int x = P.xPos; - int y = P.yPos; - int z = P.zPos; - if (checkLeaves) { - if (isWoodLog(W.getBlock(x - 1, y, z)) || isLeaves(W.getBlock(x - 1, y, z))) { - BlockPos L = new BlockPos(x - 1, y, z, W); - if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - } - } - if (isWoodLog(W.getBlock(x + 1, y, z)) || isLeaves(W.getBlock(x + 1, y, z))) { - BlockPos L = new BlockPos(x + 1, y, z, W); - if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - } - } - if (isWoodLog(W.getBlock(x, y - 1, z)) || isLeaves(W.getBlock(x, y - 1, z))) { - BlockPos L = new BlockPos(x, y - 1, z, W); - if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - } - } - if (isWoodLog(W.getBlock(x, y + 1, z)) || isLeaves(W.getBlock(x, y + 1, z))) { - BlockPos L = new BlockPos(x, y + 1, z, W); - if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - } - } - if (isWoodLog(W.getBlock(x, y, z - 1)) || isLeaves(W.getBlock(x, y, z - 1))) { - BlockPos L = new BlockPos(x, y, z - 1, W); - if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - } - } - if (isWoodLog(W.getBlock(x, y, z + 1)) || isLeaves(W.getBlock(x, y, z + 1))) { - BlockPos L = new BlockPos(x, y, z + 1, W); - if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - } - } - } else { - if (isWoodLog(W.getBlock(x - 1, y, z))) { - BlockPos L = new BlockPos(x - 1, y, z, W); - // if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - // } - } - if (isWoodLog(W.getBlock(x + 1, y, z))) { - BlockPos L = new BlockPos(x + 1, y, z, W); - // if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - // } - } - if (isWoodLog(W.getBlock(x, y - 1, z))) { - BlockPos L = new BlockPos(x, y - 1, z, W); - // if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - // } - } - if (isWoodLog(W.getBlock(x, y + 1, z))) { - BlockPos L = new BlockPos(x, y + 1, z, W); - // if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - // } - } - if (isWoodLog(W.getBlock(x, y, z - 1))) { - BlockPos L = new BlockPos(x, y, z - 1, W); - // if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - // } - } - if (isWoodLog(W.getBlock(x, y, z + 1))) { - BlockPos L = new BlockPos(x, y, z + 1, W); - // if (!checkedSpaces.contains(L)) { - mConnected.add(L); - Logger.INFO("Found Connected. [III]"); - // } - } - } - return mConnected; - } - - public enum ToolType { - Unbreakable, - Breakable - } - - /** - * Tree Cutting - */ - public static class TreeCutter { - - private final World mWorld; - private Map<String, BlockPos> mQueue = new ConcurrentHashMap<String, BlockPos>(); - private AutoMap<ItemStack[]> mDrops = new AutoMap<ItemStack[]>(); - private boolean isValid = true; - - public TreeCutter(World world) { - this.mWorld = world; - } - - public boolean queue(BlockPos pos) { - if (isValid && pos != null) { - // Logger.INFO("Queued: "+pos.getLocationString()); - String hash = Utils.calculateChecksumMD5(pos); - if (hash != null && !mQueue.containsKey(hash)) { - mQueue.put(hash, pos); - return true; - } - } - return false; - } - - private boolean emptyQueue() { - if (isValid) { - Logger.INFO("Emptying Queue."); - if (this.mQueue.size() > 0) { - int totalRemoved = 0; - for (BlockPos h : mQueue.values()) { - final Block block = mWorld.getBlock(h.xPos, h.yPos, h.zPos); - if (block != null) { - final int dropMeta = mWorld.getBlockMetadata(h.xPos, h.yPos, h.zPos); - final ArrayList<ItemStack> blockDrops = block - .getDrops(mWorld, h.xPos, h.yPos, h.zPos, dropMeta, 0); - final ItemStack[] drops = ItemUtils.getBlockDrops(blockDrops); - mDrops.put(drops); - // Remove drop that was added to the bus. - mWorld.setBlockToAir(h.xPos, h.yPos, h.zPos); - // new BlockBreakParticles(mWorld, h.xPos, h.yPos, h.zPos, block); - totalRemoved++; - } - } - if (totalRemoved > 0 && mDrops.size() > 0) { - return true; - } - } - } - return false; - } - - public ItemStack[] getDrops() { - // If Queue is successfully cleared and drops are created, let us continue. - if (isValid && emptyQueue()) { - AutoMap<ItemStack> mCollective = new AutoMap<ItemStack>(); - // Iterate ALL of the arrays, add output to a collective. - for (ItemStack[] i : this.mDrops) { - // Array is not null. - if (i != null) { - // Iterate this array. - for (int d = 0; d < i.length; d++) { - // Put Output into collective if valid - if (i[d] != null && i[d].stackSize > 0) { - mCollective.put(i[d]); - } - } - } - } - // Build an ItemStack array. - ItemStack[] drops = new ItemStack[mCollective.size()]; - for (int m = 0; m < drops.length; m++) { - drops[m] = mCollective.get(m); - } - // Return drops array if it's valid. - if (drops.length > 0) { - isValid = false; - return drops; - } - } - // Invalid or no drops, return empty array. - isValid = false; - return new ItemStack[] {}; - } - } - - /** - * Farm AI - */ - private static EntityPlayerMP farmerAI; - - public EntityPlayerMP getFakePlayer(World world) { - return farmerAI = checkFakePlayer(world); - } - - public static EntityPlayerMP checkFakePlayer(World world) { - if (farmerAI == null) { - return new FakeFarmer(MinecraftServer.getServer().worldServerForDimension(world.provider.dimensionId)); - } - return farmerAI; - } - - public static boolean onBlockStartBreak(int x, int y, int z, World world) { - final Block wood = world.getBlock(x, y, z); - if (wood == null) { - return false; - } - if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge) if (detectTree(world, x, y, z)) { - TreeChopTask chopper = new TreeChopTask(new ChunkPosition(x, y, z), checkFakePlayer(world), 128); - FMLCommonHandler.instance().bus().register(chopper); - // custom block breaking code, don't call vanilla code - return true; - } - // return onBlockStartBreak(stack, x, y, z, player); - return false; - } - - public static boolean detectTree(World world, int pX, int pY, int pZ) { - ChunkPosition pos = null; - Stack<ChunkPosition> candidates = new Stack<>(); - candidates.add(new ChunkPosition(pX, pY, pZ)); - - while (!candidates.isEmpty()) { - ChunkPosition candidate = candidates.pop(); - int curX = candidate.chunkPosX, curY = candidate.chunkPosY, curZ = candidate.chunkPosZ; - - Block block = world.getBlock(curX, curY, curZ); - if ((pos == null || candidate.chunkPosY > pos.chunkPosY) && block.isWood(world, curX, curY, curZ)) { - pos = new ChunkPosition(curX, candidate.chunkPosY + 1, curZ); - // go up - while (world.getBlock(curX, pos.chunkPosY, curZ).isWood(world, curX, pos.chunkPosY, curZ)) { - pos = new ChunkPosition(curX, pos.chunkPosY + 1, curZ); - } - // check if we still have a way diagonally up - candidates.add(new ChunkPosition(curX + 1, pos.chunkPosY + 1, curZ)); - candidates.add(new ChunkPosition(curX, pos.chunkPosY + 1, curZ + 1)); - candidates.add(new ChunkPosition(curX - 1, pos.chunkPosY + 1, curZ)); - candidates.add(new ChunkPosition(curX, pos.chunkPosY + 1, curZ - 1)); - } - } - - // not even one match, so there were no logs. - if (pos == null) { - return false; - } - - // check if there were enough leaves around the last position - // pos now contains the block above the topmost log - // we want at least 5 leaves in the surrounding 26 blocks - int d = 3; - int leaves = 0; - for (int offX = 0; offX < d; offX++) { - for (int offY = 0; offY < d; offY++) { - for (int offZ = 0; offZ < d; offZ++) { - int xPos = pos.chunkPosX - 1 + offX, yPos = pos.chunkPosY - 1 + offY, - zPos = pos.chunkPosZ - 1 + offZ; - Block leaf = world.getBlock(xPos, yPos, zPos); - if (leaf != null && leaf.isLeaves(world, xPos, yPos, zPos)) { - if (++leaves >= 5) { - return true; - } - } - } - } - } - - // not enough leaves. sorreh - return false; - } - - public static class TreeChopTask { - - public final World world; - public final EntityPlayer player; - public final int blocksPerTick; - - public Queue<ChunkPosition> blocks = Lists.newLinkedList(); - public Set<ChunkPosition> visited = new THashSet<>(); - - public TreeChopTask(ChunkPosition start, EntityPlayer player, int blocksPerTick) { - this.world = player.getEntityWorld(); - this.player = player; - this.blocksPerTick = blocksPerTick; - - this.blocks.add(start); - } - - private void queueCoordinate(int x, int y, int z) { - ChunkPosition pos = new ChunkPosition(x, y, z); - if (!visited.contains(pos)) { - blocks.add(pos); - } - } - - @SubscribeEvent - public void onWorldTick(TickEvent.WorldTickEvent event) { - if (event.side.isClient()) { - finish(); - return; - } - // only if same dimension - if (event.world.provider.dimensionId != world.provider.dimensionId) { - return; - } - - // setup - int left = blocksPerTick; - // NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - - // continue running - ChunkPosition pos; - while (left > 0) { - // completely done or can't do our job anymore?! - if (blocks.isEmpty() /* || tags.getBoolean("Broken") */) { - finish(); - return; - } - - pos = blocks.remove(); - if (!visited.add(pos)) { - continue; - } - int x = pos.chunkPosX, y = pos.chunkPosY, z = pos.chunkPosZ; - - Block block = world.getBlock(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - - // can we harvest the block and is effective? - if (!block.isWood(world, x, y, z) || !isWoodLog(block)) { - continue; - } - - // save its neighbors - queueCoordinate(x + 1, y, z); - queueCoordinate(x, y, z + 1); - queueCoordinate(x - 1, y, z); - queueCoordinate(x, y, z - 1); - - // also add the layer above.. stupid acacia trees - for (int offX = 0; offX < 3; offX++) { - for (int offZ = 0; offZ < 3; offZ++) { - queueCoordinate(x - 1 + offX, y + 1, z - 1 + offZ); - } - } - - // break it, wooo! - breakExtraBlock(player.worldObj, x, y, z, 0, player, x, y, z); - left--; - } - } - - private void finish() { - // goodbye cruel world - FMLCommonHandler.instance().bus().unregister(this); - } - } - - public static void breakExtraBlock(World world, int x, int y, int z, int sidehit, EntityPlayer playerEntity, - int refX, int refY, int refZ) { - // prevent calling that stuff for air blocks, could lead to unexpected behaviour since it fires events - if (world.isAirBlock(x, y, z)) return; - - // what? - if (!(playerEntity instanceof EntityPlayerMP)) return; - EntityPlayerMP player = (EntityPlayerMP) playerEntity; - - // check if the block can be broken, since extra block breaks shouldn't instantly break stuff like obsidian - // or precious ores you can't harvest while mining stone - Block block = world.getBlock(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - - // only effective materials - if (!isWoodLog(block)) return; - - Block refBlock = world.getBlock(refX, refY, refZ); - float refStrength = ForgeHooks.blockStrength(refBlock, player, world, refX, refY, refZ); - float strength = ForgeHooks.blockStrength(block, player, world, x, y, z); - - // only harvestable blocks that aren't impossibly slow to harvest - if (!ForgeHooks.canHarvestBlock(block, player, meta) || refStrength / strength > 10f) return; - - // send the blockbreak event - BlockEvent.BreakEvent event = ForgeHooks - .onBlockBreakEvent(world, player.theItemInWorldManager.getGameType(), player, x, y, z); - if (event.isCanceled()) return; - - if (player.capabilities.isCreativeMode) { - block.onBlockHarvested(world, x, y, z, meta, player); - if (block.removedByPlayer(world, player, x, y, z, false)) - block.onBlockDestroyedByPlayer(world, x, y, z, meta); - - // send update to client - if (!world.isRemote) { - player.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world)); - } - return; - } - - // callback to the tool the player uses. Called on both sides. This damages the tool n stuff. - player.getCurrentEquippedItem().func_150999_a(world, block, x, y, z, player); - - // server sided handling - if (!world.isRemote) { - // serverside we reproduce ItemInWorldManager.tryHarvestBlock - - // ItemInWorldManager.removeBlock - block.onBlockHarvested(world, x, y, z, meta, player); - - if (block.removedByPlayer(world, player, x, y, z, true)) // boolean is if block can be harvested, checked - // above - { - block.onBlockDestroyedByPlayer(world, x, y, z, meta); - block.harvestBlock(world, player, x, y, z, meta); - block.dropXpOnBlockBreak(world, x, y, z, event.getExpToDrop()); - } - - // always send block update to client - player.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world)); - } - // client sided handling - else { - // PlayerControllerMP pcmp = Minecraft.getMinecraft().playerController; - // clientside we do a "this clock has been clicked on long enough to be broken" call. This should not send - // any new packets - // the code above, executed on the server, sends a block-updates that give us the correct state of the block - // we destroy. - - // following code can be found in PlayerControllerMP.onPlayerDestroyBlock - world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); - if (block.removedByPlayer(world, player, x, y, z, true)) { - block.onBlockDestroyedByPlayer(world, x, y, z, meta); - } - // callback to the tool - ItemStack itemstack = player.getCurrentEquippedItem(); - if (itemstack != null) { - itemstack.func_150999_a(world, block, x, y, z, player); - - if (itemstack.stackSize == 0) { - player.destroyCurrentEquippedItem(); - } - } - - // send an update to the server, so we get an update back - // if(PHConstruct.extraBlockUpdates) - // Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C07PacketPlayerDigging(2, x,y,z, - // Minecraft.getMinecraft().objectMouseOver.sideHit)); - } - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index cc4503e46e..b53daf4f31 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.items; +import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.client.GT_TooltipHandler.Tier.*; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; import static gtPlusPlus.core.util.Utils.getTcAspectStack; @@ -16,6 +17,7 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_MultiTexture; import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_FoodStat; import gregtech.api.util.GT_ModHandler; import gregtech.common.covers.GT_Cover_Arm; @@ -35,7 +37,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow; -import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual; public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { @@ -386,31 +387,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { getTcAspectStack(TC_Aspects.POTENTIA, 8L) })); this.setElectricStats(32000 + tLastID, GT_Values.V[9] * 10 * 60 * 20, GT_Values.V[8], 8L, -3L, false); - String aTierName; - int aFirstMachineCasingID = 130; - GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { GregtechItemList.FakeMachineCasingPlate_ULV, - GregtechItemList.FakeMachineCasingPlate_LV, GregtechItemList.FakeMachineCasingPlate_MV, - GregtechItemList.FakeMachineCasingPlate_HV, GregtechItemList.FakeMachineCasingPlate_EV, - GregtechItemList.FakeMachineCasingPlate_IV, GregtechItemList.FakeMachineCasingPlate_LuV, - GregtechItemList.FakeMachineCasingPlate_ZPM, GregtechItemList.FakeMachineCasingPlate_UV, - GregtechItemList.FakeMachineCasingPlate_MAX, }; - for (int i = 0; i < 10; i++) { - if (i == 10) { - break; - } else { - aTierName = GT_Values.VN[i]; - mMachineCasingCovers[i].set( - this.addItem( - aFirstMachineCasingID++, - aTierName + " Machine Plate Cover", - "Deprecated - Shapeless Craft to new version", - new Object[] {})); - GregTech_API.registerCover( - mMachineCasingCovers[i].get(1L), - new GT_MultiTexture(new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[i][0] }), - new GTPP_Cover_ToggleVisual()); - } - } GregtechItemList.Laser_Lens_WoodsGlass.set( this.addItem( 140, @@ -513,19 +489,19 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { new GT_MultiTexture( new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }), - new GT_Cover_Pump(8)); + new GT_Cover_Pump(8, TextureFactory.of(OVERLAY_PUMP))); GregTech_API.registerCover( GregtechItemList.Conveyor_Module_ULV.get(1L), new GT_MultiTexture( new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }), - new GT_Cover_Conveyor(1600)); + new GT_Cover_Conveyor(1600, 1, TextureFactory.of(OVERLAY_CONVEYOR))); GregTech_API.registerCover( GregtechItemList.Robot_Arm_ULV.get(1L), new GT_MultiTexture( new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }), - new GT_Cover_Arm(1600)); + new GT_Cover_Arm(1600, TextureFactory.of(OVERLAY_ARM))); return true; } @@ -595,19 +571,19 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { new GT_MultiTexture( new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }), - new GT_Cover_Pump(524288)); + new GT_Cover_Pump(524288, TextureFactory.of(OVERLAY_PUMP))); GregTech_API.registerCover( GregtechItemList.Conveyor_Module_MAX.get(1L), new GT_MultiTexture( new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }), - new GT_Cover_Conveyor(4)); + new GT_Cover_Conveyor(4, 1, TextureFactory.of(OVERLAY_CONVEYOR))); GregTech_API.registerCover( GregtechItemList.Robot_Arm_MAX.get(1L), new GT_MultiTexture( new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }), - new GT_Cover_Arm(4)); + new GT_Cover_Arm(4, TextureFactory.of(OVERLAY_ARM))); return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java index a5d09bcbd9..db3638a4e0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import codechicken.lib.math.MathHelper; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Utility; @@ -46,7 +46,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) { GT_Utility.sendSoundToPlayers( aPlayer.worldObj, - (String) GregTech_API.sSoundList.get(6), + SoundResource.FIRE_IGNITE, 1.0F, 1.0F, MathHelper.floor_double(aEntity.posX), @@ -102,14 +102,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { Logger.WARNING("Preparing Lighter b"); if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) { Logger.WARNING("Preparing Lighter c"); - GT_Utility.sendSoundToPlayers( - aWorld, - (String) GregTech_API.sSoundList.get(6), - 1.0F, - 1.0F, - aX, - aY, - aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, Blocks.fire); rOutput = true; // ItemNBT.setLighterFuel(aStack, tFuelAmount); @@ -162,14 +155,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { Logger.WARNING("Preparing Lighter b"); if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) { Logger.WARNING("Preparing Lighter c"); - GT_Utility.sendSoundToPlayers( - aWorld, - (String) GregTech_API.sSoundList.get(6), - 1.0F, - 1.0F, - aX, - aY, - aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.FIRE_IGNITE, 1.0F, 1.0F, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, Blocks.fire); rOutput = true; // ItemNBT.setLighterFuel(aStack, tFuelAmount); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java index 78f77a7b33..7fd7de322c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java @@ -13,6 +13,7 @@ import net.minecraftforge.fluids.IFluidBlock; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.objects.ItemData; @@ -52,14 +53,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { GT_Utility.sendChatToPlayer( aPlayer, "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore."); - GT_Utility.sendSoundToPlayers( - aWorld, - GregTech_API.sSoundList.get(Integer.valueOf(1)), - 1.0F, - -1.0F, - aX, - aY, - aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ); return true; } if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) @@ -69,14 +63,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.grass))) { if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { - GT_Utility.sendSoundToPlayers( - aWorld, - GregTech_API.sSoundList.get(Integer.valueOf(1)), - 1.0F, - -1.0F, - aX, - aY, - aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.RANDOM_ANVIL_USE, 1.0F, -1.0F, aX, aY, aZ); int tX = aX; int tY = aY; int tZ = aZ; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java index df83976033..ae3a40cff9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java @@ -7,14 +7,12 @@ import java.io.InputStream; import java.net.URL; import java.util.Date; import java.util.List; -import java.util.UUID; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.potion.Potion; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -22,8 +20,6 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import org.apache.commons.io.IOUtils; import org.lwjgl.opengl.GL11; -import com.mojang.authlib.GameProfile; - import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -233,56 +229,6 @@ public class GTPP_CapeRenderer extends RenderPlayer { return false; } - @SuppressWarnings("unused") - @Deprecated - /** - * Should be able to get the username from a UUID - * - * @param name - Players Name - * @param uuid - Players known UUID - * @return - The newest Player name - */ - private String getPlayerName(String name, String uuid) { - try { - Logger.WORLD("[Capes++] Trying to UUID check " + name + "."); - if (uuid != null) { - if (uuid.length() > 0) { - UUID g = UUID.fromString(uuid); - if (g != null) { - Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + "."); - GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152652_a(g); - if (profile != null) { - Logger.WARNING("[Capes++] Found for UUID check: " + profile.getName() + "."); - return profile.getName(); - } - } else { - g = UUID.fromString(uuid.replace("-", "")); - if (g != null) { - Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + "."); - GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152652_a(g); - if (profile != null) { - Logger.WARNING("[Capes++] Found for UUID check 2: " + profile.getName() + "."); - return profile.getName(); - } - } - } - } - } - if (name != null) { - if (name.length() > 0) { - Logger.WORLD("[Capes++] Mojang/Cache checking for " + name + "."); - GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152655_a(name); - if (profile != null) { - Logger.WARNING("[Capes++] Found for name check: " + profile.getName() + "."); - return profile.getName(); - } - } - } - Logger.WORLD("[Capes++] Failed UUID check for " + name + "."); - } catch (Throwable t) {} - return name; - } - private static class CapeUtils { private static char SPLIT_CHARACTER = '§'; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java index e1c591f33b..8c7ca4c9e1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java @@ -55,7 +55,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")"; } - public GT_MetaTileEntity_ElectricAutoWorkbench(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_ElectricAutoWorkbench(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 30, aDescription, aTextures); } @@ -148,7 +148,11 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ElectricAutoWorkbench(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_ElectricAutoWorkbench( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override @@ -214,7 +218,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B for (byte i = 19; i < 28; i++) { if (mInventory[i] != null && mInventory[i].isItemStackDamageable() - && mInventory[i].getItem().hasContainerItem()) { + && mInventory[i].getItem().hasContainerItem(mInventory[i])) { mInventory[i].setItemDamage(OreDictionary.WILDCARD_VALUE); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java index e797810ab8..2c9a50dfa5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java @@ -16,6 +16,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.ModularUITextures; import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.screen.ModularWindow; @@ -61,7 +63,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")"; } - public GT_MetaTileEntity_ElectricInventoryManager(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_ElectricInventoryManager(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 16, aDescription, aTextures); } @@ -167,7 +169,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit return new GT_MetaTileEntity_ElectricInventoryManager( this.mName, this.mTier, - this.mDescription, + this.mDescriptionArray, this.mTextures); } @@ -437,7 +439,8 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit @Override public String[] getDescription() { - return new String[] { "It's simpler than you think. I promise.", this.mDescription, CORE.GT_Tooltip.get() }; + return ArrayUtils + .addAll(this.mDescriptionArray, "It's simpler than you think. I promise.", CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java index af20b51c20..2427cb12ae 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java @@ -19,6 +19,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IDigitalChest; @@ -50,14 +52,14 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi super(aID, aName, aNameRegional, aTier, 3, ""); } - public GT_MetaTileEntity_TesseractGenerator(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_TesseractGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TesseractGenerator(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_TesseractGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -620,11 +622,13 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi @Override public String[] getDescription() { - return new String[] { this.mDescription, "Generates a Tesseract for the attached Inventory", + return ArrayUtils.addAll( + this.mDescriptionArray, + "Generates a Tesseract for the attached Inventory", "Connect with pipes to insert items", "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers", "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers", - CORE.GT_Tooltip.get() }; + CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java index 0ecee3b45d..18314c059f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java @@ -12,6 +12,8 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -39,14 +41,14 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic super(aID, aName, aNameRegional, aTier, 3, ""); } - public GT_MetaTileEntity_TesseractTerminal(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_TesseractTerminal(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TesseractTerminal(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_TesseractTerminal(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -484,11 +486,14 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public String[] getDescription() { - return new String[] { this.mDescription, "Accesses Tesseract Generators remotely", - "Connect with pipes to extract items or fluids", "Outputs from the back face", + return ArrayUtils.addAll( + this.mDescriptionArray, + "Accesses Tesseract Generators remotely", + "Connect with pipes to extract items or fluids", + "Outputs from the back face", "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers", "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers", - CORE.GT_Tooltip.get() }; + CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java index 7d58df65b2..402065f7a9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java @@ -5,6 +5,8 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidTankInfo; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.drawable.UITexture; @@ -39,7 +41,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { this.tier = tier; } - public GT_MetaTileEntity_Boiler_Base(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Boiler_Base(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); this.steamPerSecond = (CORE.ConfigSwitches.boilerSteamPerSecond * aTier); this.tier = aTier; @@ -47,10 +49,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { @Override public String[] getDescription() { - return new String[] { this.mDescription, "Produces " + getPollution() + " pollution/sec", + return ArrayUtils.addAll( + this.mDescriptionArray, + "Produces " + getPollution() + " pollution/sec", "Consumes fuel only when temperature is less than 100C", - "Fuel with burn time greater than 500 is more efficient.", "Doesn't explode if there's no water", - CORE.GT_Tooltip.get() }; + "Fuel with burn time greater than 500 is more efficient.", + "Doesn't explode if there's no water", + CORE.GT_Tooltip.get()); } public ITexture getOverlayIcon() { @@ -246,7 +251,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_Base(this.mName, tier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Boiler_Base(this.mName, tier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java index d2a924009f..da6ef21dd3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java @@ -13,13 +13,13 @@ public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base { super(aID, aNameRegional, aBoilerTier); } - public GT_MetaTileEntity_Boiler_HV(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Boiler_HV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_HV(this.mName, 3, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Boiler_HV(this.mName, 3, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java index 98dd73a13c..13d3e6ae87 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java @@ -13,13 +13,13 @@ public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base { super(aID, aNameRegional, aBoilerTier); } - public GT_MetaTileEntity_Boiler_LV(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Boiler_LV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_LV(this.mName, 1, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Boiler_LV(this.mName, 1, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java index cb2a5fbbd8..b8214b0bbd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java @@ -13,13 +13,13 @@ public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base { super(aID, aNameRegional, aBoilerTier); } - public GT_MetaTileEntity_Boiler_MV(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Boiler_MV(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Boiler_MV(this.mName, 2, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Boiler_MV(this.mName, 2, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java index 9410486dff..030f000710 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java @@ -3,6 +3,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; @@ -25,17 +27,12 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi public int mEfficiency; - /* - * public GT_MetaTileEntity_SemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) { super(aID, - * aName, aNameRegional, aTier); onConfigLoad(); } - */ - public GT_MetaTileEntity_SemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, "Requires semi-fluid Fuel", new ITexture[0]); onConfigLoad(); } - public GT_MetaTileEntity_SemiFluidGenerator(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_SemiFluidGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); onConfigLoad(); @@ -61,7 +58,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SemiFluidGenerator(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_SemiFluidGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -72,8 +69,11 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi @Override public String[] getDescription() { - return new String[] { this.mDescription, "Produces " + (this.getPollution()) + " pollution/sec", - "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll( + this.mDescriptionArray, + "Produces " + (this.getPollution()) + " pollution/sec", + "Fuel Efficiency: " + this.getEfficiency() + "%", + CORE.GT_Tooltip.get()); } @Override @@ -100,7 +100,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi Logger.WARNING("Bad Fuel?"); return 0; } - int rValue = Math.max(GT_ModHandler.getFuelCanValue(aStack) * 6 / 5, super.getFuelValue(aStack)); + int rValue = Math.max(GT_ModHandler.getFuelValue(aStack) * 6 / 5, super.getFuelValue(aStack)); if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) { rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java index 50f25951be..601dddb651 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java @@ -4,6 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; @@ -30,7 +32,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity this.onConfigLoad(); } - public GregtechMetaTileEntityGeothermalGenerator(final String aName, final int aTier, final String aDescription, + public GregtechMetaTileEntityGeothermalGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); this.onConfigLoad(); @@ -39,8 +41,11 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity @Override public String[] getDescription() { String aPollution = "Causes " + this.getPollution() + " Pollution per second"; - return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - aPollution, CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll( + this.mDescriptionArray, + "Generates power at " + this.getEfficiency() + "% Efficiency per tick", + aPollution, + CORE.GT_Tooltip.get()); } @Override @@ -69,7 +74,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity @Override public int getFuelValue(final ItemStack aStack) { - int rValue = Math.max((GT_ModHandler.getFuelCanValue(aStack) * 6) / 5, super.getFuelValue(aStack)); + int rValue = Math.max((GT_ModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack)); if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) { rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3); } @@ -83,7 +88,11 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntityGeothermalGenerator(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GregtechMetaTileEntityGeothermalGenerator( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java index 25ec3468f8..53f009b430 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java @@ -28,7 +28,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue this.onConfigLoad(); } - public GregtechMetaTileEntityRocketFuelGenerator(final String aName, final int aTier, final String aDescription, + public GregtechMetaTileEntityRocketFuelGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); this.onConfigLoad(); @@ -41,8 +41,11 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - // Logger.INFO("Valid Fuels: "+Recipe_GT.Gregtech_Recipe_Map.sRocketFuels.mRecipeList.size()); - return new GregtechMetaTileEntityRocketFuelGenerator(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GregtechMetaTileEntityRocketFuelGenerator( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override @@ -70,7 +73,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue @Override public int getFuelValue(final ItemStack aStack) { - int rValue = Math.max((GT_ModHandler.getFuelCanValue(aStack) * 6) / 5, super.getFuelValue(aStack)); + int rValue = Math.max((GT_ModHandler.getFuelValue(aStack) * 6) / 5, super.getFuelValue(aStack)); if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) { rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java index 8dbcc09789..440fb72789 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java @@ -4,6 +4,8 @@ import static gregtech.api.enums.GT_Values.V; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.ProgressBar; @@ -30,7 +32,7 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener this.onConfigLoad(); } - public GregtechMetaTileEntitySolarGenerator(final String aName, final int aTier, final String aDescription, + public GregtechMetaTileEntitySolarGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); this.onConfigLoad(); @@ -38,8 +40,11 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener @Override public String[] getDescription() { - return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll( + this.mDescriptionArray, + "Generates power at " + this.getEfficiency() + "% Efficiency per tick", + "Output Voltage: " + this.getOutputTier() + " EU/t", + CORE.GT_Tooltip.get()); } @Override @@ -49,7 +54,7 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntitySolarGenerator(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GregtechMetaTileEntitySolarGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } public void onConfigLoad() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java index 9bc980b45e..51d7b4d186 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java @@ -7,6 +7,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -173,10 +175,13 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator @Override public String[] getDescription() { - return new String[] { this.mDescription, "Fuel is measured in minecraft days (Check with Scanner)", + return ArrayUtils.addAll( + this.mDescriptionArray, + "Fuel is measured in minecraft days (Check with Scanner)", "RTG changes output voltage depending on fuel", "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip.get() }; + "Output Voltage: " + this.getOutputTier() + " EU/t", + CORE.GT_Tooltip.get()); } public GregtechMetaTileEntity_RTG(int aID, String aName, String aNameRegional, int aTier) { @@ -197,7 +202,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator return 0; } - public GregtechMetaTileEntity_RTG(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GregtechMetaTileEntity_RTG(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -209,7 +214,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntity_RTG(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GregtechMetaTileEntity_RTG(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -329,7 +334,6 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator } ReflectionUtils.setByte(this, "mTier", mTier2); this.mNewTier = mTier2; - // ReflectionUtils.setFinalStatic(mTier2, GT_Values.V[0]); } catch (Exception e) { Logger.WARNING("Failed setting mTier."); e.printStackTrace(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java index 67e00342dd..8696c97ee6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java @@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; import static gregtech.api.enums.GT_Values.V; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.interfaces.ITexture; @@ -16,15 +18,18 @@ public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_ULV_CombustionGenerator(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_ULV_CombustionGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public String[] getDescription() { - return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec", - "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll( + this.mDescriptionArray, + "Produces " + (this.getPollution() * 20) + " pollution/sec", + "Fuel Efficiency: " + this.getEfficiency() + "%", + CORE.GT_Tooltip.get()); } @Override @@ -34,7 +39,11 @@ public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ULV_CombustionGenerator(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_ULV_CombustionGenerator( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java index 3de1f0c1f8..e0d13325e9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java @@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; import static gregtech.api.enums.GT_Values.V; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.interfaces.IIconContainer; @@ -15,18 +17,23 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbine { + private static final int EFFICIENCY_DEFAULT = 95; + public GT_MetaTileEntity_ULV_GasTurbine(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier); + super(aID, aName, aNameRegional, aTier, EFFICIENCY_DEFAULT); } - public GT_MetaTileEntity_ULV_GasTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); + public GT_MetaTileEntity_ULV_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures, EFFICIENCY_DEFAULT); } @Override public String[] getDescription() { - return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec", - "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll( + this.mDescriptionArray, + "Produces " + (this.getPollution() * 20) + " pollution/sec", + "Fuel Efficiency: " + this.getEfficiency() + "%", + CORE.GT_Tooltip.get()); } @Override @@ -36,7 +43,7 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -47,7 +54,7 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi @Override public void onConfigLoad() { this.mEfficiency = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, 95); + .get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, EFFICIENCY_DEFAULT); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java index 9dc531edd9..db107fa5cd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java @@ -13,6 +13,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -62,7 +64,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank aDescription); } - public GT_MetaTileEntity_CropHarvestor(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_CropHarvestor(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 21, aDescription, aTextures); } @@ -140,7 +142,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_CropHarvestor(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_CropHarvestor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -508,13 +510,16 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank public String[] getDescription() { int aRadius = 10 + getRange(this.mTier); int aSide = (aRadius - 1) / 2; - return new String[] { this.mDescription, "Secondary mode can Hydrate/Fertilize/Weed-EX", + return ArrayUtils.addAll( + this.mDescriptionArray, + "Secondary mode can Hydrate/Fertilize/Weed-EX", "Consumes " + powerUsage() + "eu per harvest", "Consumes " + powerUsageSecondary() + "eu per secondary operation", "Can harvest 2 blocks above and below", "Radius: " + aSide + " each side (" + aRadius + "x3x" + aRadius + ")", - "Has " + (this.mTier * 5) + "% chance for extra drops", "Holds " + this.getCapacity() + "L of Water", - CORE.GT_Tooltip.get() }; + "Has " + (this.mTier * 5) + "% chance for extra drops", + "Holds " + this.getCapacity() + "L of Water", + CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java deleted file mode 100644 index 9a26ea57ec..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java +++ /dev/null @@ -1,311 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Mods.GregTech; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.BlockIcons.CustomIcon; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.PlayerUtils; - -public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_TieredMachineBlock { - - public static String[] BlacklistedTileEntiyClassNames; - - private byte mMode = 0; // 0: RandomTicks around 1: TileEntities with range - // 1 - private static CustomIcon _mGTIco_Norm_Idle; - private static CustomIcon _mGTIco_Norm_Active; - private static CustomIcon _mGTIco_TE_Idle; - private static CustomIcon _mGTIco_TE_Active; - private static int[] mAccelerateStatic = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 512, 512, 512, 512, 512, 512 }; - - @Override - public void registerIcons(IIconRegister aBlockIconRegister) { - super.registerIcons(aBlockIconRegister); - _mGTIco_Norm_Idle = new CustomIcon("iconsets/OVERLAY_ACCELERATOR"); - _mGTIco_Norm_Active = new CustomIcon("iconsets/OVERLAY_ACCELERATOR_ACTIVE"); - _mGTIco_TE_Idle = new CustomIcon("iconsets/OVERLAY_ACCELERATOR_TE"); - _mGTIco_TE_Active = new CustomIcon("iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE"); - } - - @SideOnly(Side.CLIENT) - @Override - public void onValueUpdate(byte aValue) { - mMode = aValue; - } - - @Override - public byte getUpdateData() { - return mMode; - } - - public GT_MetaTileEntity_WorldAccelerator(int pID, String pName, String pNameRegional, int pTier) { - super(pID, pName, pNameRegional, pTier, 0, ""); - } - - @Override - public String[] getDescription() { - return new String[] { - String.format( - "Accelerating things (Radius: %d EU/t: %d Speed Bonus: x%d)", - mTier, - getEnergyDemand(mTier, false), - mAccelerateStatic[mTier]), - "Use a screwdriver to change mode", "To accelerate TileEntities, this machine has to be adjacent to it", - "This machine accepts up to 8 Amps", "Accelerating TileEntities doubles Energy-Demand" }; - } - - public GT_MetaTileEntity_WorldAccelerator(String pName, int pTier, int pInvSlotCount, String pDescription, - ITexture[][][] pTextures) { - super(pName, pTier, pInvSlotCount, pDescription, pTextures); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity pTileEntity) { - return new GT_MetaTileEntity_WorldAccelerator(mName, mTier, mInventory.length, mDescription, mTextures); - } - - @Override - public ITexture[][][] getTextureSet(ITexture[] pTextures) { - return new ITexture[0][0][0]; - } - - @Override - public ITexture[] getTexture(IGregTechTileEntity pBaseMetaTileEntity, ForgeDirection side, ForgeDirection sacing, - int pColorIndex, boolean pActive, boolean pRedstone) { - if (mMode == 0) return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], - (side.offsetY != 0) ? null - : pActive ? new GT_RenderedTexture(_mGTIco_Norm_Active) - : new GT_RenderedTexture(_mGTIco_Norm_Idle) }; - else return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], (side.offsetY != 0) - ? null - : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle) }; - } - - @Override - public boolean allowPullStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, ForgeDirection side, - ItemStack pStack) { - return false; - } - - @Override - public boolean allowPutStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, ForgeDirection side, - ItemStack pStack) { - return false; - } - - @Override - public void saveNBTData(NBTTagCompound pNBT) { - pNBT.setByte("mAccelMode", mMode); - } - - public static long getEnergyDemand(int pTier, boolean pIsAcceleratingTEs) { - return V[pTier] * (pIsAcceleratingTEs ? 6 : 3); - } - - @Override - public void loadNBTData(NBTTagCompound pNBT) { - mMode = pNBT.getByte("mAccelMode"); - } - - @Override - public boolean isAccessAllowed(EntityPlayer pPlayer) { - return true; - } - - @Override - public boolean isSimpleMachine() { - return false; - } - - @Override - public boolean isFacingValid(ForgeDirection facing) { - return true; - } - - @Override - public boolean isEnetInput() { - return true; - } - - @Override - public boolean isInputFacing(ForgeDirection side) { - return true; - } - - @Override - public boolean isTeleporterCompatible() { - return false; - } - - @Override - public long getMinimumStoredEU() { - return 512; - } - - @Override - public long maxEUStore() { - return 512 + V[mTier] * 50; - } - - @Override - public long maxEUInput() { - return V[mTier]; - } - - @Override - public long maxAmperesIn() { - return 8; - } - - private static String[] mModeStr = { "Blocks", "TileEntities" }; - - @Override - public void onScrewdriverRightClick(ForgeDirection pSide, EntityPlayer pPlayer, float pX, float pY, float pZ) { - mMode = (byte) (mMode == 0x00 ? 0x01 : 0x00); - markDirty(); - PlayerUtils.messagePlayer(pPlayer, String.format("Switched mode to: %s", mModeStr[mMode])); - } - - @Override - public void onPostTick(IGregTechTileEntity pBaseMetaTileEntity, long pTick) { - try { - if (!pBaseMetaTileEntity.isServerSide()) return; - - long tEnergyDemand = getEnergyDemand(mTier, (mMode == 1)); - - // Do we have enough energy to run? Or are we not allowed to run? - if (pBaseMetaTileEntity.getStoredEU() < tEnergyDemand || !pBaseMetaTileEntity.isAllowedToWork()) { - // Check if machine was active before - if (pBaseMetaTileEntity.isActive()) pBaseMetaTileEntity.setActive(false); // Then disable it now - } else { - // Continue to drain power - if (pBaseMetaTileEntity.decreaseStoredEnergyUnits(tEnergyDemand, false)) { - World tWorld = pBaseMetaTileEntity.getWorld(); - // Limit the random ticks to once per second - if (mMode == 0) { - if (pTick % 20 == 0) doAccelerateNormalBlocks(pBaseMetaTileEntity, tWorld); - } else doAccelerateTileEntities(pBaseMetaTileEntity, tWorld); - - } else { - // Energy drain failed. Disable machine - if (pBaseMetaTileEntity.isActive()) pBaseMetaTileEntity.setActive(false); - } - } - } catch (Exception e) { - Logger.ERROR("GT_MetaTileEntity_WorldAccelerator.onPostTick.crash"); - Logger.ERROR(e.getMessage()); - } - } - - private void doAccelerateTileEntities(IGregTechTileEntity pBaseMetaTileEntity, World pWorld) { - try { - if (!pBaseMetaTileEntity.isActive()) getBaseMetaTileEntity().setActive(true); - - for (ForgeDirection tDir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tTile = pBaseMetaTileEntity.getTileEntityAtSide(tDir); - if (isTEBlackListed(tTile)) continue; - - long tMaxTime = System.nanoTime() + 1000000; - for (int j = 0; j < mAccelerateStatic[mTier]; j++) { - tTile.updateEntity(); - if (System.nanoTime() > tMaxTime) break; - } - } - } catch (Exception e) { - Logger.ERROR("GT_MetaTileEntity_WorldAccelerator.doAccelerateTileEntities.crash"); - Logger.ERROR(e.getMessage()); - } - } - - private static List<String> _mBlacklistedTileEntities = new ArrayList<String>(); - - // Inspired by ChromatiCraft's TileAccelerator - private boolean isTEBlackListed(TileEntity pTile) { - if (pTile == null) return true; // Obvious - if (!pTile.canUpdate()) return true; // Skip if TE can't update at all - if (pTile.isInvalid()) return true; // Obvious - - String tSimpleClassName = pTile.getClass().getSimpleName().toLowerCase(); - String tCanonicalName = pTile.getClass().getCanonicalName().toLowerCase(); - if (tSimpleClassName.contains("conduit") || tSimpleClassName.contains("wire") - || tSimpleClassName.contains("cable")) - return true; - if (tCanonicalName.contains("appeng") || tCanonicalName.contains(GregTech.ID)) - // Don't accelerate ANY Gregtech machines! - return true; - for (String tS : BlacklistedTileEntiyClassNames) { - if (tCanonicalName.equalsIgnoreCase(tS)) return true; - } - - return false; - } - - /** - * Accelerate normal blocks. Eats some power and adds randomTicks to every block within its working area - * (Tier-Number = radius) This does only affect blocks that implement the "RandomTick" method; Which is mostly used - * for grass growth and plants. - * - * @param pBaseMetaTileEntity - */ - private void doAccelerateNormalBlocks(IGregTechTileEntity pBaseMetaTileEntity, World pWorld) { - if (!pBaseMetaTileEntity.isActive()) getBaseMetaTileEntity().setActive(true); - - Random rnd = new Random(); - int tX = pBaseMetaTileEntity.getXCoord(); - int tY = pBaseMetaTileEntity.getYCoord(); - int tZ = pBaseMetaTileEntity.getZCoord(); - - int tX1 = tX - mTier; - int tX2 = tX + mTier; - int tY1 = Math.max(tY - mTier, 0); // Limit to bedrock - int tY2 = Math.min(tY + mTier, 255); // Limit to build height - int tZ1 = tZ - mTier; - int tZ2 = tZ + mTier; - - for (int xi = tX1; xi <= tX2; xi++) for (int yi = tY1; yi <= tY2; yi++) - for (int zi = tZ1; zi <= tZ2; zi++) tryTickBlock(pWorld, xi, yi, zi, rnd); - } - - /** - * Send a tick to the target block - * - * @param pWorld - * @param pX - * @param pY - * @param pZ - * @param pRnd - */ - private void tryTickBlock(World pWorld, int pX, int pY, int pZ, Random pRnd) { - try { - for (int j = 0; j < mTier; j++) { - Block tBlock = pWorld.getBlock(pX, pY, pZ); - if (tBlock.getTickRandomly()) tBlock.updateTick(pWorld, pX, pY, pZ, pRnd); - } - } catch (Exception e) { - Logger.ERROR("GT_MetaTileEntity_WorldAccelerator.tryTickBlock.crash"); - Logger.ERROR(e.getMessage()); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java index 0e8106dd2a..2e95830a41 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java @@ -20,8 +20,8 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.interfaces.ITexture; @@ -89,8 +89,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi mPollutionEnabled = PollutionUtils.isPollutionEnabled(); } - public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String aDescription, ITexture[][][] aTextures, - String aGUIName, String aNEIName) { + public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription, + ITexture[][][] aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName, aNEIName); mPollutionEnabled = PollutionUtils.isPollutionEnabled(); } @@ -106,7 +106,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi return new GregtechMetaAtmosphericReconditioner( this.mName, this.mTier, - this.mDescription, + this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName); @@ -117,7 +117,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi boolean highTier = this.mTier >= 7; - String[] A = new String[] { this.mDescription, + String[] A = ArrayUtils.addAll( + this.mDescriptionArray, highTier ? "Will attempt to remove 1/4 pollution from 8 surrounding chunks" : "", highTier ? "If these chunks are not loaded, they will be ignored" : "", "Requires a turbine rotor and an Air Filter [T1/T2] to run.", @@ -126,7 +127,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi "Low Efficiency: Removes half pollution, Turbine takes 50% dmg", "High Efficiency: Removes full pollution, Turbine takes 100% dmg", "Turbine Rotor will not break in LE mode", - "Insert an equal tier Conveyor Module to enable automation" }; + "Insert an equal tier Conveyor Module to enable automation"); if (!mPollutionEnabled) { String[] B = new String[] { "===============================================", "Pollution is disabled, scrubbers will now have a bonus use", @@ -781,20 +782,9 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi @Override public void doSound(byte aIndex, double aX, double aY, double aZ) { if (aIndex == -120) { - GT_Utility.doSoundAtClient( - (String) GregTech_API.sSoundList.get(Integer.valueOf(103)), - MathUtils.randInt(5, 50), - 0.05F, - aX, - aY, - aZ); - } else if (aIndex == -121 || aIndex == -122) { - // GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(108)), 0, 0.5F, aX, aY, - // aZ); - } /* - * else if (aIndex == -122) { GT_Utility.doSoundAtClient((String) - * GregTech_API.sSoundList.get(Integer.valueOf(6)), 100, 1.0F, aX, aY, aZ); } - */ else { + GT_Utility + .doSoundAtClient(SoundResource.IC2_TOOLS_BATTERY_USE, MathUtils.randInt(5, 50), 0.05F, aX, aY, aZ); + } else { super.doSound((byte) 0, aX, aY, aZ); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java index 1ff0f8eef6..910c3120b3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java @@ -4,6 +4,8 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; @@ -31,15 +33,18 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAd super(aID, aName, aNameRegional, "A Steam condenser - [IC2->Steam]", new ITexture[0]); } - public GregtechMetaCondensor(final String aName, final int aTier, final String aDescription, + public GregtechMetaCondensor(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public String[] getDescription() { - return new String[] { this.mDescription, "IC2 Steam + Water = Normal Steam.", - "Requires no power to run, although it's not very fast.", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll( + this.mDescriptionArray, + "IC2 Steam + Water = Normal Steam.", + "Requires no power to run, although it's not very fast.", + CORE.GT_Tooltip.get()); } @Override @@ -80,7 +85,7 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAd @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaCondensor(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GregtechMetaCondensor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java index 84cef090fc..5412f0108e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java @@ -48,7 +48,7 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa new ITexture[] {}); } - public GregtechMetaTileEntityChunkLoader(String aName, int aTier, String aDescription, ITexture[][][] aTextures, + public GregtechMetaTileEntityChunkLoader(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 4, aDescription, aTextures, 0, 0, aGUIName, aNEIName); } @@ -190,7 +190,7 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa return new GregtechMetaTileEntityChunkLoader( this.mName, this.mTier, - this.mDescription, + this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java index d14121e116..d0c63f5aad 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java @@ -5,6 +5,8 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.api.math.Size; @@ -53,7 +55,7 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB) }); } - public GregtechMetaTileEntity_AutoChisel(String aName, int aTier, String aDescription, ITexture[][][] aTextures, + public GregtechMetaTileEntity_AutoChisel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); } @@ -63,7 +65,7 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa return new GregtechMetaTileEntity_AutoChisel( this.mName, this.mTier, - this.mDescription, + this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName); @@ -71,10 +73,11 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa @Override public String[] getDescription() { - String[] A = new String[] { this.mDescription, "What you want to chisel goes in slot 1", + return ArrayUtils.addAll( + this.mDescriptionArray, + "What you want to chisel goes in slot 1", "What you want to get goes in the special slot (bottom right)", - "If special slot is empty, first chisel result is used" }; - return A; + "If special slot is empty, first chisel result is used"); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java index f97a831590..d75730b2a0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java @@ -4,6 +4,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -38,20 +40,15 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER) }); } - public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String aDescription, ITexture[][][] aTextures, + public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); } - /* - * public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, ITexture[][][] - * aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, - * aNEIName); } - */ - @Override public String[] getDescription() { - return new String[] { this.mDescription, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip.get() }; + return ArrayUtils + .addAll(this.mDescriptionArray, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip.get()); } @Override @@ -59,7 +56,7 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM return new GregtechMetaTileEntity_BasicWasher( this.mName, this.mTier, - this.mDescription, + this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java index b5bbc86b7e..b6911e29f7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java @@ -4,6 +4,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -38,14 +40,14 @@ public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_Ba new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP) }); } - public GregtechMetaTileEntity_ReactorColdTrap(String aName, int aTier, String aDescription, + public GregtechMetaTileEntity_ReactorColdTrap(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 1, aDescription, aTextures, 2, 9, aGUIName, aNEIName); } @Override public String[] getDescription() { - return new String[] { this.mDescription, "Does not require ice cubes", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll(this.mDescriptionArray, "Does not require ice cubes", CORE.GT_Tooltip.get()); } @Override @@ -53,7 +55,7 @@ public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_Ba return new GregtechMetaTileEntity_ReactorColdTrap( this.mName, this.mTier, - this.mDescription, + this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java index 22f449b0c2..c3303bf2db 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java @@ -4,6 +4,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -38,14 +40,14 @@ public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEnt new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP) }); } - public GregtechMetaTileEntity_ReactorProcessingUnit(String aName, int aTier, String aDescription, + public GregtechMetaTileEntity_ReactorProcessingUnit(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 1, aDescription, aTextures, 2, 9, aGUIName, aNEIName); } @Override public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; + return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); } @Override @@ -53,7 +55,7 @@ public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEnt return new GregtechMetaTileEntity_ReactorProcessingUnit( this.mName, this.mTier, - this.mDescription, + this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java index e705d0a156..c8e947fbb5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java @@ -96,9 +96,9 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon .addInfo("500% faster than using single block machines of the same voltage") .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes 16 items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front center").addCasingInfo("Supply Depot Casings", 10).addInputBus("Any casing", 1) - .addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1) - .addMufflerHatch("Any casing", 1).toolTipFinisher("GT++"); + .addController("Front center").addCasingInfoMin("Supply Depot Casings", 10, false) + .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1).toolTipFinisher("GT++"); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java index ae0096cad5..e77e5b7b60 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java @@ -94,7 +94,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase<Gregtech .addInfo("Enemies within " + this.mRange + "m are blasted with a high energy plasma.") .addInfo("This uses 5,000,000EU per blast.") .addInfo("Can screwdriver to toggle mode between Players and all Entities.").addSeparator() - .beginStructureBlock(1, 7, 1, false).addController("Top Middle").addCasingInfo("Casing", 360) + .beginStructureBlock(1, 7, 1, false).addController("Top Middle").addCasingInfoMin("Casing", 360, false) .addOtherStructurePart("Rotor Assembly", "Any 1 dot hint", 1).addInputBus("Any 4 dot hint (min 1)", 4) .addInputHatch("Any 4 dot hint(min 1)", 4).addOutputHatch("Any 4 dot hint(min 1)", 4) .addEnergyHatch("Any 4 dot hint(min 1)", 4).addMaintenanceHatch("Any 4 dot hint(min 1)", 4) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java index cb88bd8562..8e5db11003 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java @@ -119,8 +119,8 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends .addInfo("Gains one parallel per voltage tier").addInfo("Gains one multiplier per coil tier") .addInfo("Parallel = Tier * Coil Tier").addInfo("Gains 5% speed bonus per coil tier") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 5, 3, true) - .addController("Bottom center").addCasingInfo("Inconel Reinforced Casings", 8) - .addCasingInfo("Integral Encasement V", 8).addCasingInfo("Heating Coils", 16) + .addController("Bottom center").addCasingInfoMin("Inconel Reinforced Casings", 8, false) + .addCasingInfoMin("Integral Encasement V", 8, false).addCasingInfoMin("Heating Coils", 16, true) .addInputBus("Any Inconel Reinforced Casing", 1).addOutputBus("Any Inconel Reinforced Casing", 1) .addEnergyHatch("Any Inconel Reinforced Casing", 1) .addMaintenanceHatch("Any Inconel Reinforced Casing", 1) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java index aca2826c4a..3d55bc9d2f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java @@ -23,7 +23,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -75,10 +75,10 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace extends .addInfo("Processes 8 items per voltage tier * W/L") .addInfo("Max Size required to process Plasma recipes").addPollutionAmount(getPollutionPerSecond(null)) .addSeparator().addController("Top center").addStructureInfo("Size: nx3xn [WxHxL] (Hollow)") - .addStructureInfo("n can be 3, 5 or 7").addCasingInfo(mCasingName, 10).addInputBus("Any Casing", 1) - .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) - .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addStructureInfo("n can be 3, 5 or 7").addCasingInfoMin(mCasingName, 10, false) + .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) + .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) + .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } @@ -177,7 +177,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace extends @Override public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(207)); + return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java index f98942d595..fc98a793a9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java @@ -76,7 +76,7 @@ public class GregtechMetaTileEntity_IndustrialCentrifuge extends .addInfo("Disable animations with a screwdriver").addInfo("Only uses 90% of the EU/t normally required") .addInfo("Processes six items per voltage tier").addPollutionAmount(getPollutionPerSecond(null)) .addSeparator().beginStructureBlock(3, 3, 3, true).addController("Front Center") - .addCasingInfo("Centrifuge Casings", 10).addInputBus("Any Casing except front", 1) + .addCasingInfoMin("Centrifuge Casings", 10, false).addInputBus("Any Casing except front", 1) .addOutputBus("Any Casing except front", 1).addInputHatch("Any Casing except front", 1) .addOutputHatch("Any Casing except front", 1).addEnergyHatch("Any Casing except front", 1) .addMaintenanceHatch("Any Casing except front", 1).addMufflerHatch("Any Casing except front", 1) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java index 949231424a..f2b82f7220 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java @@ -78,9 +78,10 @@ public class GregtechMetaTileEntity_IndustrialChisel .addInfo("If no target is provided for common buses, the result of the first chisel is used") .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 16") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front center").addCasingInfo("Sturdy Printer Casing", 10).addInputBus("Any casing", 1) - .addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1) - .addMufflerHatch("Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addController("Front center").addCasingInfoMin("Sturdy Printer Casing", 10, false) + .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1) + .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java index 5532180944..4c90e93176 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java @@ -20,7 +20,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -70,8 +70,8 @@ public class GregtechMetaTileEntity_IndustrialCokeOven extends .addInfo("Process 12x materials with Heat Resistant Casings") .addInfo("Or 24x materials with Heat Proof Casings").addPollutionAmount(getPollutionPerSecond(null)) .addSeparator().beginStructureBlock(3, 3, 3, true).addController("Front middle at bottom") - .addCasingInfo("Structural Coke Oven Casings", 8) - .addCasingInfo("Heat Resistant/Proof Coke Oven Casings", 8).addInputBus("Any Casing", 1) + .addCasingInfoMin("Structural Coke Oven Casings", 8, false) + .addCasingInfoMin("Heat Resistant/Proof Coke Oven Casings", 8, false).addInputBus("Any Casing", 1) .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); @@ -144,7 +144,7 @@ public class GregtechMetaTileEntity_IndustrialCokeOven extends @Override public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(207)); + return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java index d9176057a1..c45621414d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java @@ -69,9 +69,9 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends .addInfo("200% faster than using single block machines of the same voltage") .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes four items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 5, true) - .addController("Front Center").addCasingInfo("Cutting Factory Frames", 26).addInputBus("Any Casing", 1) - .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1) - .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) + .addController("Front Center").addCasingInfoMin("Cutting Factory Frames", 26, false) + .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) + .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index 5a9a523e4c..dc1442c0e6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -78,7 +78,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator extends .addInfo("Each 1800K over the min. Heat Capacity allows for one upgraded overclock") .addInfo("Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 5, 3, true) - .addController("Bottom Center").addCasingInfo(mCasingName, 5).addInputBus("Any Casing", 1) + .addController("Bottom Center").addCasingInfoMin(mCasingName, 5, false).addInputBus("Any Casing", 1) .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java index 58a88a0db2..b3f448d425 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java @@ -63,10 +63,10 @@ public class GregtechMetaTileEntity_IndustrialElectrolyzer extends .addInfo("180% faster than using single block machines of the same voltage") .addInfo("Only uses 90% of the EU/t normally required").addInfo("Processes two items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front Center").addCasingInfo("Electrolyzer Casings", 10).addInputBus("Any Casing", 1) - .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) - .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addController("Front Center").addCasingInfoMin("Electrolyzer Casings", 10, false) + .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) + .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) + .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java index 0d07b9f94e..9e00cdecae 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java @@ -21,7 +21,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -69,7 +69,7 @@ public class GregtechMetaTileEntity_IndustrialExtruder extends .addInfo("Each Input Bus can have a different shape!") .addInfo("You can use several input buses per multiblock") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 5, true) - .addController("Front Center").addCasingInfo("Inconel Reinforced Casings", 14) + .addController("Front Center").addCasingInfoMin("Inconel Reinforced Casings", 14, false) .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Back Center", 2) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); @@ -116,7 +116,7 @@ public class GregtechMetaTileEntity_IndustrialExtruder extends @Override public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(203)); + return SoundResource.IC2_MACHINES_COMPRESSOR_OP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java index 0550cc8809..1fa2f99425 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialFluidHeater.java @@ -64,8 +64,8 @@ public class GregtechMetaTileEntity_IndustrialFluidHeater extends .addInfo("Only uses 90% of the EU/t normally required") .addInfo("Processes eight items per voltage tier").addPollutionAmount(getPollutionPerSecond(null)) .addSeparator().beginStructureBlock(5, 6, 5, true).addController("Front Center") - .addCasingInfo("Top/Bottom layer: Multi-use Casings", 34) - .addCasingInfo("Middle layers: Thermal Containment Casing", 47) + .addCasingInfoMin("Top/Bottom layer: Multi-use Casings", 34, false) + .addCasingInfoMin("Middle layers: Thermal Containment Casing", 47, false) .addInputBus("Bottom Layer (optional)", 1).addInputHatch("Bottom Layer", 1) .addOutputBus("Top Layer (optional)", 1).addOutputHatch("Top Layer", 1) .addEnergyHatch("Any Multi-use Casing", 1).addMaintenanceHatch("Any Multi-use Casing", 1) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java index d5e79e3c16..ceffb921f7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java @@ -34,7 +34,7 @@ import com.gtnewhorizon.structurelib.structure.ITierConverter; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -91,7 +91,7 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends } tt.addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front Center").addCasingInfo("Forge Casing", 10).addInputBus("Any Casing", 1) + .addController("Front Center").addCasingInfoMin("Forge Casing", 10, false).addInputBus("Any Casing", 1) .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) .addOtherStructurePart("Anvil", "In the center of 3x3x3 structure", 2) @@ -171,7 +171,7 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends @Override public String getSound() { - return GregTech_API.sSoundList.get(1); + return SoundResource.RANDOM_ANVIL_USE.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java index 06d55cf7fb..074ac0be41 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java @@ -26,6 +26,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -74,8 +75,8 @@ public class GregtechMetaTileEntity_IndustrialMacerator extends .addInfo("Maximum of n*tier parallels, LV = Tier 1, MV = Tier 2, etc.") .addInfo("n=2 initially. n=8 after inserting Maceration Upgrade Chip.") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 6, 3, true) - .addController("Bottom center").addCasingInfo("Maceration Stack Casings (After upgrade)", 26) - .addCasingInfo("Stable Titanium Casings (Before upgrade)", 26).addInputBus("Bottom casing", 1) + .addController("Bottom center").addCasingInfoMin("Maceration Stack Casings (After upgrade)", 26, false) + .addCasingInfoMin("Stable Titanium Casings (Before upgrade)", 26, false).addInputBus("Bottom casing", 1) .addEnergyHatch("Bottom casing", 1).addMaintenanceHatch("Bottom casing", 1) .addOutputBus("One per layer except bottom layer", 2) .addMufflerHatch("Any casing except bottom layer", 2).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); @@ -240,7 +241,7 @@ public class GregtechMetaTileEntity_IndustrialMacerator extends @Override public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(201)); + return SoundResource.IC2_MACHINES_MACERATOR_OP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java index ffd913f55b..67a6a17384 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java @@ -27,6 +27,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -92,10 +93,10 @@ public class GregtechMetaTileEntity_IndustrialMixer .addInfo("250% faster than using single block machines of the same voltage") .addInfo("Processes eight recipes per voltage tier").addPollutionAmount(getPollutionPerSecond(null)) .addSeparator().beginStructureBlock(3, 4, 3, false).addController("Second Layer Center") - .addCasingInfo(mCasingName, 6).addCasingInfo(mCasingName2, 2).addInputBus("Any Casing", 1) - .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) - .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addCasingInfoMin(mCasingName, 6, false).addCasingInfoMin(mCasingName2, 2, false) + .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) + .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) + .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } @@ -138,7 +139,7 @@ public class GregtechMetaTileEntity_IndustrialMixer @Override public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(203)); + return SoundResource.IC2_MACHINES_COMPRESSOR_OP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java index 69a70eced9..ca445d2332 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMolecularTransformer.java @@ -64,10 +64,13 @@ public class GregtechMetaTileEntity_IndustrialMolecularTransformer tt.addMachineType(getMachineType()).addInfo("Changes the structure of items to produce new ones") .addInfo("Maximum 1x of each bus/hatch.").addPollutionAmount(getPollutionPerSecond(null)).addSeparator() .beginStructureBlock(7, 7, 7, false).addController("Top Center") - .addCasingInfo("Robust Tungstensteel Machine Casing", 40).addCasingInfo("Tungstensteel Coils", 16) - .addCasingInfo("Molecular Containment Casing", 52).addCasingInfo("High Voltage Current Capacitor", 32) - .addCasingInfo("Particle Containment Casing", 4).addCasingInfo("Resonance Chamber I", 5) - .addCasingInfo("Modulator I", 4).addInputBus("Any Robust Tungstensteel Machine Casing", 1) + .addCasingInfoMin("Robust Tungstensteel Machine Casing", 40, false) + .addCasingInfoMin("Tungstensteel Coils", 16, false) + .addCasingInfoMin("Molecular Containment Casing", 52, false) + .addCasingInfoMin("High Voltage Current Capacitor", 32, false) + .addCasingInfoMin("Particle Containment Casing", 4, false) + .addCasingInfoMin("Resonance Chamber I", 5, false).addCasingInfoMin("Modulator I", 4, false) + .addInputBus("Any Robust Tungstensteel Machine Casing", 1) .addOutputBus("Any Robust Tungstensteel Machine Casing", 1) .addEnergyHatch("Any Robust Tungstensteel Machine Casing", 1) .addMaintenanceHatch("Any Robust Tungstensteel Machine Casing", 1) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 129a1c1330..8e9fc47c2b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -121,10 +121,10 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends + EnumChatFormatting.RESET) .addInfo("Read Multi-Machine Manual for extra information") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front Center").addCasingInfo("Multi-Use Casings", 6).addInputBus("Any Casing", 1) - .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) - .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addController("Front Center").addCasingInfoMin("Multi-Use Casings", 6, false) + .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) + .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) + .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java index 3bda4c8e08..02b28bb911 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java @@ -23,7 +23,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -71,7 +71,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends .addInfo("Processes four items per voltage tier").addInfo("Circuit for recipe goes in the Input Bus") .addInfo("Each Input Bus can have a different Circuit/Shape!") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front Center").addCasingInfo("Material Press Machine Casings", 10) + .addController("Front Center").addCasingInfoMin("Material Press Machine Casings", 10, false) .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); @@ -117,7 +117,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends @Override public String getSound() { - return GregTech_API.sSoundList.get(203); + return SoundResource.IC2_MACHINES_COMPRESSOR_OP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java index 87d4a7b736..d714dfca6b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java @@ -65,10 +65,11 @@ public class GregtechMetaTileEntity_IndustrialSifter .addInfo("400% faster than single-block machines of the same voltage") .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes four items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(5, 3, 5, false) - .addController("Bottom Center").addCasingInfo("Sieve Grate", 18).addCasingInfo("Sieve Casings", 35) - .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) - .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) - .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addController("Bottom Center").addCasingInfoMin("Sieve Grate", 18, false) + .addCasingInfoMin("Sieve Casings", 35, false).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1) + .addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1) + .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) + .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java index 6c4814ab7b..9317917ad3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java @@ -66,8 +66,8 @@ public class GregtechMetaTileEntity_IndustrialThermalCentrifuge .addInfo("Only uses 80% of the EU/t normally required") .addInfo("Processes eight items per voltage tier").addPollutionAmount(getPollutionPerSecond(null)) .addSeparator().beginStructureBlock(3, 2, 3, false).addController("Front Center") - .addCasingInfo("Thermal Processing Casings/Noise Hazard Sign Blocks", 8).addInputBus("Bottom Casing", 1) - .addOutputBus("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1) + .addCasingInfoMin("Thermal Processing Casings/Noise Hazard Sign Blocks", 8, false) + .addInputBus("Bottom Casing", 1).addOutputBus("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1) .addMaintenanceHatch("Bottom Casing", 1).addMufflerHatch("Bottom Casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java index 1e6c1d8070..1ce6e5e72e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java @@ -81,7 +81,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends .addInfo("Consumes 1L of " + mCryoFuelName + "/t during operation") .addInfo("Constructed exactly the same as a normal Vacuum Freezer") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front Center").addCasingInfo(mCasingName, 10).addStructureHint(mHatchName, 1) + .addController("Front Center").addCasingInfoMin(mCasingName, 10, false).addStructureHint(mHatchName, 1) .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java index da52ee2745..e51cab5a92 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java @@ -82,10 +82,10 @@ public class GregtechMetaTileEntity_IndustrialWashPlant extends .addInfo("Always requires an Input Hatch full of water to refill structure") .addInfo("Need to be filled with water.").addInfo("Will automatically fill water from input hatch.") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(5, 3, 7, true) - .addController("Front Center").addCasingInfo("Wash Plant Casings", 40).addInputBus("Any Casing", 1) - .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) - .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addController("Front Center").addCasingInfoMin("Wash Plant Casings", 40, false) + .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) + .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) + .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java index c98526b80a..c155a9e609 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java @@ -26,7 +26,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -73,9 +73,10 @@ public class GregtechMetaTileEntity_IndustrialWireMill extends .addInfo("200% faster than using single block machines of the same voltage") .addInfo("Only uses 75% of the EU/t normally required").addInfo("Processes four items per voltage tier") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 5, true) - .addController("Front Center").addCasingInfo("Wire Factory Casings", 20).addInputBus("Any Casing", 1) - .addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) - .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addController("Front Center").addCasingInfoMin("Wire Factory Casings", 20, false) + .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1) + .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) + .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } @@ -119,7 +120,7 @@ public class GregtechMetaTileEntity_IndustrialWireMill extends @Override public String getSound() { - return GregTech_API.sSoundList.get(204); + return SoundResource.IC2_MACHINES_RECYCLER_OP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java index a9a64807c0..4d122f3619 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java @@ -137,7 +137,7 @@ public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity impl @Override public boolean allowCoverOnSide(final ForgeDirection side, final GT_ItemStack aCoverID) { - return (GregTech_API.getCoverBehavior(aCoverID.toStack()).isSimpleCover()) + return (GregTech_API.getCoverBehaviorNew(aCoverID.toStack()).isSimpleCover()) && (super.allowCoverOnSide(side, aCoverID)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java index 0a168b2d99..46a978aa3b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java @@ -82,7 +82,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< tt.addMachineType(getMachineType()).addInfo("Controller Block for the Large Grinding Machine") .addInfo("Grind ores.").addPollutionAmount(getPollutionPerSecond(null)).addSeparator() .beginStructureBlock(3, 3, 7, false).addController("Front Center") - .addCasingInfo("IsaMill Exterior Casing", 40) + .addCasingInfoMin("IsaMill Exterior Casing", 40, false) .addOtherStructurePart("IsaMill Gearbox", "5x, Inner Blocks") .addOtherStructurePart("IsaMill Piping", "8x, ring around controller") .addStructureInfo("IsaMill Pipings must not be obstructed in front (only air blocks)") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java index 7f61ad1eb8..64cce876c0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java @@ -228,7 +228,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB this.mOutputFluids = new FluidStack[] {}; this.mLastRecipe = tRecipe; - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + calculateOverclockedNessMulti((long) tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); int aDevProgress = this.mMaxProgresstime / 10; this.mMaxProgresstime = Math.max(1, aDevProgress); this.mOutputItems = new ItemStack[] {}; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java index 870430543b..8fd6c0bd5c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java @@ -177,8 +177,8 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends .addInfo("Max parallel dictated by tower tier and mode").addInfo("DTower Mode: T1=4, T2=12") .addInfo("Distilery Mode: Tower Tier * (4*InputTier)") .addInfo("Distilery Mode require a full height tower").addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator().addCasingInfo("Clean Stainless Steel Machine Casing", 7).addInputBus("Bottom Casing", 1) - .addOutputBus("Bottom Casing", 1).addInputHatch("Bottom Casing", 1) + .addSeparator().addCasingInfoMin("Clean Stainless Steel Machine Casing", 7, false) + .addInputBus("Bottom Casing", 1).addOutputBus("Bottom Casing", 1).addInputHatch("Bottom Casing", 1) .addMaintenanceHatch("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1) .addOutputHatch("One per layer except bottom", 2).addMufflerHatch("Top Casing", 3) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 422f3de857..48a3673cca 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -87,7 +87,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< .addInfo("Speed: +120% | EU Usage: 90% | Parallel: 8") .addInfo("Consumes 10L of " + mHotFuelName + " per second during operation") .addInfo("Constructed exactly the same as a normal EBF").addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator().addController("Bottom center").addCasingInfo(mCasingName, 8) + .addSeparator().addController("Bottom center").addCasingInfoMin(mCasingName, 8, false) .addInputHatch("Any Casing", 1).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1) .addOutputHatch("Any Casing", 1).addStructureHint(mHatchName, 1).addEnergyHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java index 9a353793ad..fde072842a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java @@ -54,7 +54,8 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it").addSeparator() .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed") - .addCasingInfo("Fusion Machine Casings MK III", 79).addStructureInfo("Cover the coils with casing") + .addCasingInfoMin("Fusion Machine Casings MK III", 79, false) + .addStructureInfo("Cover the coils with casing") .addOtherStructurePart("Advanced Fusion Coils", "Center part of the ring") .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be UHV or better") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java index bb86c94d08..a7966d1a8c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK5.java @@ -54,7 +54,8 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK5 extends GT_MetaTileEntity_Fus .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it").addSeparator() .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed") - .addCasingInfo("Fusion Machine Casings MK IV", 79).addStructureInfo("Cover the coils with casing") + .addCasingInfoMin("Fusion Machine Casings MK IV", 79, false) + .addStructureInfo("Cover the coils with casing") .addOtherStructurePart("Advanced Fusion Coils II", "Center part of the ring") .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be UEV or better") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java index ff47520fcc..7f583a892e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java @@ -135,7 +135,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger .addInfo("A circuit in the controller lowers the SH Steam threshold and efficiency") .addInfo("2400 L/s reduction and 1.5% efficiency loss per circuit config over 1").addSeparator() .beginStructureBlock(5, 9, 5, false).addController("Front bottom") - .addCasingInfo("Reinforced Heat Exchanger Casing", 90) + .addCasingInfoMin("Reinforced Heat Exchanger Casing", 90, false) .addOtherStructurePart("Tungstensteel Pipe Casing", "Center 3x5x3 (45 blocks)") .addMaintenanceHatch("Any casing", 1).addInputHatch("Hot fluid, bottom center", 2) .addInputHatch("Distilled water, any bottom layer casing", 1) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java index bb40aceed4..e89830cefe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java @@ -8,11 +8,12 @@ import static gregtech.api.GregTech_API.sBlockCasings4; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -59,7 +60,7 @@ public class GregtechMetaTileEntity_Adv_Implosion .addInfo("Speed: +100% | EU Usage: 100% | Parallel: ((Tier/2)+1)") .addInfo("Constructed exactly the same as a normal Implosion Compressor") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front center").addCasingInfo("Robust TungstenSteel Casing", 10) + .addController("Front center").addCasingInfoMin("Robust TungstenSteel Casing", 10, false) .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1) .addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); @@ -150,13 +151,13 @@ public class GregtechMetaTileEntity_Adv_Implosion public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) { super.startSoundLoop(aIndex, aX, aY, aZ); if (aIndex == 20) { - GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(5)), 10, 1.0F, aX, aY, aZ); + GT_Utility.doSoundAtClient(new ResourceLocation(getSound()), 10, 1.0F, aX, aY, aZ); } } @Override public String getSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(5)); + return SoundResource.RANDOM_EXPLODE.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java index 6ecb7ed08d..d5607ae2e3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java @@ -63,8 +63,8 @@ public class GregtechMetaTileEntity_SteamCompressor GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType(getMachineType()).addInfo("Controller Block for the Steam Compressor") .addInfo("Compresses " + getMaxParallelRecipes() + " things at a time").addSeparator() - .beginStructureBlock(3, 3, 4, true).addController("Front center").addCasingInfo(mCasingName, 28) - .addOtherStructurePart(TT_steaminputbus, "Any casing", 1) + .beginStructureBlock(3, 3, 4, true).addController("Front center") + .addCasingInfoMin(mCasingName, 28, false).addOtherStructurePart(TT_steaminputbus, "Any casing", 1) .addOtherStructurePart(TT_steamoutputbus, "Any casing", 1) .addOtherStructurePart(TT_steamhatch, "Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java index eb05973425..ad50d51c3a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java @@ -67,8 +67,8 @@ public class GregtechMetaTileEntity_SteamMacerator GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType(getMachineType()).addInfo("Controller Block for the Steam Macerator") .addInfo("Macerates " + getMaxParallelRecipes() + " ores at a time").addSeparator() - .beginStructureBlock(3, 3, 3, true).addController("Front center").addCasingInfo(mCasingName, 14) - .addOtherStructurePart(TT_steaminputbus, "Any casing", 1) + .beginStructureBlock(3, 3, 3, true).addController("Front center") + .addCasingInfoMin(mCasingName, 14, false).addOtherStructurePart(TT_steaminputbus, "Any casing", 1) .addOtherStructurePart(TT_steamoutputbus, "Any casing", 1) .addOtherStructurePart(TT_steamhatch, "Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java index b21ad61e0a..87037e89ae 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java @@ -256,7 +256,7 @@ public class GT4Entity_ThermalBoiler extends GregtechMeta_MultiBlockBase<GT4Enti .addInfo("Converts Water & Heat into Steam").addInfo("Explodes if water is not supplied") .addInfo("Consult user manual for more information").addPollutionAmount(getPollutionPerSecond(null)) .addSeparator().beginStructureBlock(3, 3, 3, true).addController("Front Center") - .addCasingInfo("Thermal Containment Casings", 10).addInputBus("Any Casing", 1) + .addCasingInfoMin("Thermal Containment Casings", 10, false).addInputBus("Any Casing", 1) .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java index 890ed018bf..8d970f5492 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java @@ -80,14 +80,16 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase .addInfo("Speed: +100% | EU Usage: 100% | Parallel: 8 * Tier").addInfo("Maximum 1x of each bus/hatch.") .addInfo("Does not require both Output Hatch & Bus").addPollutionAmount(getPollutionPerSecond(null)) .addSeparator().beginStructureBlock(9, 6, 9, true).addController("Top Center") - .addCasingInfo("Elemental Confinement Shell", 138).addCasingInfo("Matter Fabricator Casing", 24) - .addCasingInfo("Particle Containment Casing", 24).addCasingInfo("Matter Generation Coil", 24) - .addCasingInfo("High Voltage Current Capacitor", 20).addCasingInfo("Resonance Chamber III", 24) - .addCasingInfo("Modulator III", 16).addOtherStructurePart("Data Orb Repository", "1x", 1) - .addInputHatch("Any 1 dot hint", 1).addOutputBus("Any 1 dot hint", 1) - .addOutputHatch("Any 1 dot hint", 1).addEnergyHatch("Any 1 dot hint", 1) - .addMaintenanceHatch("Any 1 dot hint", 1).addMufflerHatch("Any 1 dot hint", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addCasingInfoMin("Elemental Confinement Shell", 138, false) + .addCasingInfoMin("Matter Fabricator Casing", 24, false) + .addCasingInfoMin("Particle Containment Casing", 24, false) + .addCasingInfoMin("Matter Generation Coil", 24, false) + .addCasingInfoMin("High Voltage Current Capacitor", 20, false) + .addCasingInfoMin("Resonance Chamber III", 24, false).addCasingInfoMin("Modulator III", 16, false) + .addOtherStructurePart("Data Orb Repository", "1x", 1).addInputHatch("Any 1 dot hint", 1) + .addOutputBus("Any 1 dot hint", 1).addOutputHatch("Any 1 dot hint", 1) + .addEnergyHatch("Any 1 dot hint", 1).addMaintenanceHatch("Any 1 dot hint", 1) + .addMufflerHatch("Any 1 dot hint", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java index 1594774b9b..86eb10d2b4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java @@ -24,7 +24,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -70,16 +70,16 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase< tt.addMachineType(getMachineType()).addInfo("Process that milled ore!") .addInfo("You can only ever process one type of material per controller") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(7, 9, 7, true) - .addController("Front Center").addCasingInfo("Inconel Reinforced Casing", 68) - .addCasingInfo("Flotation Casing", 52).addInputBus("Bottom Casing", 1).addInputHatch("Bottom Casing", 1) - .addOutputHatch("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1) + .addController("Front Center").addCasingInfoMin("Inconel Reinforced Casing", 68, false) + .addCasingInfoMin("Flotation Casing", 52, false).addInputBus("Bottom Casing", 1) + .addInputHatch("Bottom Casing", 1).addOutputHatch("Bottom Casing", 1).addEnergyHatch("Bottom Casing", 1) .addMaintenanceHatch("Bottom Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } @Override public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(207)); + return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java index e77842cfd5..5ebdb4103b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java @@ -91,11 +91,11 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg .addInfo("Outputs U233 every 10 seconds, on average, while the reactor is running") .addInfo("Check NEI to see the other 3 outputs - they differ between fuels") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(7, 4, 7, true) - .addController("Bottom Center").addCasingInfo("Hastelloy-N Reactor Casing", 27) - .addCasingInfo("Zeron-100 Reactor Shielding", 26).addInputHatch("Top or bottom layer edges", 1) - .addOutputHatch("Top or bottom layer edges", 1).addDynamoHatch("Top or bottom layer edges", 1) - .addMaintenanceHatch("Top or bottom layer edges", 1).addMufflerHatch("Top 3x3", 2) - .addStructureInfo("All dynamos must be between EV and LuV tier.") + .addController("Bottom Center").addCasingInfoMin("Hastelloy-N Reactor Casing", 27, false) + .addCasingInfoMin("Zeron-100 Reactor Shielding", 26, false) + .addInputHatch("Top or bottom layer edges", 1).addOutputHatch("Top or bottom layer edges", 1) + .addDynamoHatch("Top or bottom layer edges", 1).addMaintenanceHatch("Top or bottom layer edges", 1) + .addMufflerHatch("Top 3x3", 2).addStructureInfo("All dynamos must be between EV and LuV tier.") .addStructureInfo("All other hatches must be IV+ tier.") .addStructureInfo("4x Output Hatches, 2x Input Hatches, 4x Dynamo Hatches") .addStructureInfo("2x Maintenance Hatches, 4x Mufflers").toolTipFinisher(CORE.GT_Tooltip_Builder.get()); @@ -298,27 +298,27 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg // TODO if (this.mDynamoHatches != null) { for (final GT_MetaTileEntity_Hatch_Dynamo hatch : this.mDynamoHatches) { - hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); + hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12)); } } if (this.mMufflerHatches != null) { for (final GT_MetaTileEntity_Hatch_Muffler hatch : this.mMufflerHatches) { - hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); + hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12)); } } if (this.mOutputHatches != null) { for (final GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { - hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); + hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12)); } } if (this.mInputHatches != null) { for (final GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { - hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); + hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12)); } } if (this.mMaintenanceHatches != null) { for (final GT_MetaTileEntity_Hatch_Maintenance hatch : this.mMaintenanceHatches) { - hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); + hatch.updateTexture(status ? TAE.GTPP_INDEX(13) : TAE.GTPP_INDEX(12)); } } return true; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java index 55ed8fefb6..1ca346d3c0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java @@ -72,7 +72,7 @@ public class GregtechMetaTileEntityGeneratorArray .addInfo("Runs supplied generators as if placed in the world") .addInfo("Place up to 16 Single Block GT Generators into the Controller").addSeparator() .beginStructureBlock(3, 3, 3, true).addController("Front center") - .addCasingInfo("Robust Tungstensteel Machine Casings", 10).addInputBus("Any casing", 1) + .addCasingInfoMin("Robust Tungstensteel Machine Casings", 10, false).addInputBus("Any casing", 1) .addOutputBus("Any casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) .addDynamoHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index bb15f52aff..7f7b321ff2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -121,9 +121,10 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< .addInfo("When fertilizer is supplied, produces saplings instead of logs") .addInfo("Forestry saplings can get increased production") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front center").addCasingInfo("Sterile Farm Casing", 8).addInputBus("Any casing", 1) - .addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1) - .addMufflerHatch("Any casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addController("Front center").addCasingInfoMin("Sterile Farm Casing", 8, false) + .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1) + .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java index 5941992780..7bc6b0628e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java @@ -28,7 +28,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -89,8 +89,8 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter extends .addInfo("Allows Complex GT++ alloys to be created").addInfo("Accepts only one Energy Hatch") .addInfo("Circuit for recipe goes in the Input Bus or GUI slot") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 4, 3, true) - .addController("Bottom Center").addCasingInfo("Blast Smelter Casings", 5) - .addCasingInfo("Blast Smelter Heat Containment Coils", 16).addInputBus("Any Casing", 1) + .addController("Bottom Center").addCasingInfoMin("Blast Smelter Casings", 5, false) + .addCasingInfoMin("Blast Smelter Heat Containment Coils", 16, false).addInputBus("Any Casing", 1) .addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); @@ -136,7 +136,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter extends @Override public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(208)); + return SoundResource.IC2_MACHINES_INDUCTION_LOOP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java index 62a0fc3496..fdc893d9df 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java @@ -28,10 +28,6 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GTPP_Recipe; @@ -170,10 +166,11 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas .addInfo("Any external casing can be a hatch/bus, unlike Fusion") .addInfo("Cyclotron Machine Casings around Cyclotron Coil Blocks") .addInfo("All Hatches must be IV or better").addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator().addCasingInfo("Cyclotron Machine Casings", 40).addCasingInfo("Cyclotron Coil", 32) - .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) - .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) - .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addSeparator().addCasingInfoMin("Cyclotron Machine Casings", 40, false) + .addCasingInfoMin("Cyclotron Coil", 32, false).addInputBus("Any Casing", 1) + .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1) + .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) + .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } @@ -361,31 +358,6 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas return 1; } - @SuppressWarnings("deprecation") - public boolean turnCasingActive(final boolean status) { - if (this.mEnergyHatches != null) { - for (final GT_MetaTileEntity_Hatch_Muffler hatch : this.mMufflerHatches) { - hatch.mMachineBlock = status ? (byte) 44 : (byte) 44; - } - } - if (this.mOutputHatches != null) { - for (final GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { - hatch.mMachineBlock = status ? (byte) 44 : (byte) 44; - } - } - if (this.mInputHatches != null) { - for (final GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { - hatch.mMachineBlock = status ? (byte) 44 : (byte) 44; - } - } - if (this.mMaintenanceHatches != null) { - for (final GT_MetaTileEntity_Hatch_Maintenance hatch : this.mMaintenanceHatches) { - hatch.mMachineBlock = status ? (byte) 44 : (byte) 44; - } - } - return true; - } - @Override public boolean doesBindPlayerInventory() { return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java index 4c748f3b80..598c559272 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -92,9 +92,9 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends .addInfo("Circuit 14 for Fish").addInfo("Circuit 15 for Junk").addInfo("Circuit 16 for Treasure") .addInfo("Need to be filled with water.").addInfo("Will automatically fill water from input hatch.") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(9, 3, 9, true) - .addController("Front Center").addCasingInfo("Aquatic Casings", 64).addInputBus("Any Casing", 1) - .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1) - .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) + .addController("Front Center").addCasingInfoMin("Aquatic Casings", 64, false) + .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) + .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java index 156bcd3294..6d5a049b3c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java @@ -10,7 +10,6 @@ import static gregtech.api.enums.GT_HatchElement.Maintenance; import static gregtech.api.enums.GT_HatchElement.Muffler; import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.enums.GT_Values.E; -import static gregtech.api.enums.GT_Values.RES_PATH_GUI; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -26,9 +25,9 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -80,8 +79,8 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 8").addInfo("Circuit goes in the GUI slot") .addInfo("1 = cobble, 2 = stone, 3 = obsidian").addInfo("Supply Water/Lava") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 4, 3, true) - .addController("Bottom Center").addCasingInfo("Thermal Processing Casing", 9) - .addCasingInfo("Thermal Containment Casing", 16).addInputBus("Any Casing", 1) + .addController("Bottom Center").addCasingInfoMin("Thermal Processing Casing", 9, false) + .addCasingInfoMin("Thermal Containment Casing", 16, false).addInputBus("Any Casing", 1) .addInputHatch("Any Casing", 1).addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); @@ -131,7 +130,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends @Override public String getSound() { - return GregTech_API.sSoundList.get(208); + return SoundResource.IC2_MACHINES_INDUCTION_LOOP.toString(); } @Override @@ -154,7 +153,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends "gt.recipe.fakerockbreaker", "Rock Breaker", "smelting", - RES_PATH_GUI + "basicmachines/E_Furnace", + "", 1, 1, 0, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java index 4391bbd888..841d112156 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java @@ -109,9 +109,10 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends .addInfo("- 50% of max fuel efficiency at 69k or 207k EU/t output energy") .addInfo("- 25% of max fuel efficiency at 98k or 294k EU/t output energy") .addInfo("formula: x = input of energy (30000^(1/3)/ x^(1/3)) * (80000^(1/3)/ x^(1/3))").addSeparator() - .beginStructureBlock(3, 3, 10, false).addController("Front Center").addCasingInfo(mCasingName, 64) - .addCasingInfo(mGearboxName, 8).addStructureHint("Air Intake Hatch", 1) - .addInputBus("Side center line", 1).addInputHatch("Side center line", 1) + .beginStructureBlock(3, 3, 10, false).addController("Front Center") + .addCasingInfoMin(mCasingName, 64, false).addCasingInfoMin(mGearboxName, 8, false) + .addStructureHint("Air Intake Hatch", 1).addInputBus("Side center line", 1) + .addInputHatch("Side center line", 1) .addMaintenanceHatch("Any Block Touching Inconel Reinforced Casing", 1) .addDynamoHatch("Top center line", 2).addMufflerHatch("Back Center", 3) .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java index 88becb055b..32f18d5841 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java @@ -67,10 +67,11 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends .addInfo("Default: Produces 2048EU/t at 100% efficiency") .addInfo("Boosted: Produces 6144EU/t at 150% efficiency") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, false) - .addController("Front Center").addCasingInfo("Stable Titanium Machine Casing", 16) - .addCasingInfo("Steel Gear Box Machine Casing", 2).addCasingInfo("Engine Intake Machine Casing", 8) - .addInputHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) - .addDynamoHatch("Back Center", 2).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addController("Front Center").addCasingInfoMin("Stable Titanium Machine Casing", 16, false) + .addCasingInfoMin("Steel Gear Box Machine Casing", 2, false) + .addCasingInfoMin("Engine Intake Machine Casing", 8, false).addInputHatch("Any Casing", 1) + .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1).addDynamoHatch("Back Center", 2) + .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java index 8e161656f4..03e3ed1928 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java @@ -112,11 +112,11 @@ public class GregtechMetaTileEntity_MassFabricator .addInfo("Speed: +0% | EU Usage: 80%").addInfo("Parallel: Scrap = 64 | UU = 8 * Tier") .addInfo("Produces UU-A, UU-M & Scrap").addInfo("Change mode with screwdriver") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(5, 4, 5, true) - .addController("Front Center").addCasingInfo(mCasingName3, 9).addCasingInfo(mCasingName2, 24) - .addCasingInfo(mCasingName1, 40).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1) - .addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1) - .addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1) - .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addController("Front Center").addCasingInfoMin(mCasingName3, 9, false) + .addCasingInfoMin(mCasingName2, 24, false).addCasingInfoMin(mCasingName1, 40, false) + .addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) + .addOutputHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1) + .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java index 767228fc20..e8f2819368 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java @@ -44,7 +44,6 @@ import com.gtnewhorizon.structurelib.structure.StructureUtility; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.TAE; @@ -261,11 +260,13 @@ public class GregtechMetaTileEntity_QuantumForceTransformer .addInfo("Pulse Manipulators: Recipe Tier Allowed (check NEI for the tier of each recipe)") .addInfo("Shielding Cores: Focusing Tier (equal to or higher than recipe tier to allow focus)") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(15, 21, 15, true) - .addController("Bottom Center").addCasingInfo("Bulk Production Frame", 80) - .addCasingInfo("Quantum Force Conductor", 177).addCasingInfo("Force Field Glass", 224) - .addCasingInfo("Neutron Pulse Manipulators", 233).addCasingInfo("Neutron Shielding Cores", 142) - .addInputBus("Bottom Layer", 4).addInputHatch("Bottom Layer", 4).addOutputHatch("Top Layer", 5) - .addOutputBus("Top Layer", 5).addEnergyHatch("Bottom Layer", 4).addMaintenanceHatch("Bottom Layer", 4) + .addController("Bottom Center").addCasingInfoMin("Bulk Production Frame", 80, false) + .addCasingInfoMin("Quantum Force Conductor", 177, false) + .addCasingInfoMin("Force Field Glass", 224, false) + .addCasingInfoMin("Neutron Pulse Manipulators", 233, false) + .addCasingInfoMin("Neutron Shielding Cores", 142, false).addInputBus("Bottom Layer", 4) + .addInputHatch("Bottom Layer", 4).addOutputHatch("Top Layer", 5).addOutputBus("Top Layer", 5) + .addEnergyHatch("Bottom Layer", 4).addMaintenanceHatch("Bottom Layer", 4) .addStructureInfo("Neptunium Plasma Hatch: Left side of Controller") .addStructureInfo("Fermium Plasma Hatch: Right side of Controller").toolTipFinisher( GT_Values.AuthorBlueWeabo + EnumChatFormatting.RESET @@ -405,10 +406,6 @@ public class GregtechMetaTileEntity_QuantumForceTransformer return mFocusingTier; } - public String getSound() { - return GregTech_API.sSoundList.get(208); - } - protected IIconContainer getActiveOverlay() { return TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java index 64d4a12df6..b3aa2ad34b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java @@ -63,9 +63,10 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase .addInfo("Only one Energy Hatch is allowed per Processing Unit") .addInfo("All recipe times in this multi are very long, watch out!") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 9, 3, false) - .addController("Bottom Center").addCasingInfo("Hastelloy-X Structural Block", 7) - .addCasingInfo("Incoloy-DS Fluid Containment Block", 5).addCasingInfo("Zeron-100 Reactor Shielding", 4) - .addCasingInfo("Hastelloy-N Sealant Blocks", 17).addInputHatch("Base platform", 1) + .addController("Bottom Center").addCasingInfoMin("Hastelloy-X Structural Block", 7, false) + .addCasingInfoMin("Incoloy-DS Fluid Containment Block", 5, false) + .addCasingInfoMin("Zeron-100 Reactor Shielding", 4, false) + .addCasingInfoMin("Hastelloy-N Sealant Blocks", 17, false).addInputHatch("Base platform", 1) .addOutputHatch("Base platform", 1).addOutputBus("Base platform", 1).addMufflerHatch("Base platform", 1) .addMaintenanceHatch("Base platform", 1).addEnergyHatch("Base platform", 1) .addStructureInfo("Muffler's Tier must be IV+") diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java index 24e0d6acd5..af7a7591e1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java @@ -24,7 +24,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -94,10 +94,12 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa .addInfo("Total number of reflectors based on how many rings are built:") .addInfo("1 ring = 36, 2 rings = 88, 3 rings = 156, 4 rings = 240, 5 rings = 340").addSeparator() .beginVariableStructureBlock(15, 31, 28, 28, 15, 31, false).addController("Top Middle") - .addCasingInfo("Structural Solar Casing", 229).addCasingInfo("Thermally Insulated Casing", 60) - .addCasingInfo("Salt Containment Casing", 66).addCasingInfo("Thermal Containment Casing", 60) - .addInputHatch("Any 2 dot hint(min 1)", 2).addOutputHatch("Any 2 dot hint(min 1)", 2) - .addMaintenanceHatch("Any 2 dot hint", 2).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addCasingInfoMin("Structural Solar Casing", 229, false) + .addCasingInfoMin("Thermally Insulated Casing", 60, false) + .addCasingInfoMin("Salt Containment Casing", 66, false) + .addCasingInfoMin("Thermal Containment Casing", 60, false).addInputHatch("Any 2 dot hint(min 1)", 2) + .addOutputHatch("Any 2 dot hint(min 1)", 2).addMaintenanceHatch("Any 2 dot hint", 2) + .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } @@ -398,7 +400,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa @Override public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(212)); + return SoundResource.IC2_MACHINES_MAGNETIZER_LOOP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java index 7807f9130f..a175a2681b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java @@ -21,6 +21,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.TAE; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -84,9 +85,10 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt .addInfo("All Buses/Hatches must, at least, match the tier of the Casings") .addInfo("Fill Input Hatch with Water to fill the inside of the multiblock.") .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(9, 3, 9, true) - .addController("Front Center").addCasingInfo("Machine Casings", 64) - .addCasingInfo("Sterile Farm Casings", 64).addInputBus("Any Casing", 1).addOutputBus("Any Casing", 1) - .addInputHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get()); + .addController("Front Center").addCasingInfoMin("Machine Casings", 64, true) + .addCasingInfoMin("Sterile Farm Casings", 64, false).addInputBus("Any Casing", 1) + .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1) + .toolTipFinisher(CORE.GT_Tooltip_Builder.get()); return tt; } @@ -161,7 +163,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt @Override public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(207)); + return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 0c21e1f838..4334c8675c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -36,6 +36,7 @@ import com.gtnewhorizon.structurelib.structure.StructureUtility; import gregtech.api.GregTech_API; import gregtech.api.enums.HeatingCoilLevel; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -428,7 +429,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt @Override public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(207)); + return SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java index 6c28b2defc..90a4016f2f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java @@ -103,7 +103,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends .addInfo("XL Steam Turbines can use Loose Mode with either Slow or Fast Mode") .addPollutionAmount(getPollutionPerSecond(null)).addInfo("Pollution is 3x higher in Fast Mode") .addSeparator().beginStructureBlock(7, 9, 7, false).addController("Top Middle") - .addCasingInfo(getCasingName(), 360).addCasingInfo("Rotor Shaft", 30) + .addCasingInfoMin(getCasingName(), 360, false).addCasingInfoMin("Rotor Shaft", 30, false) .addOtherStructurePart("Rotor Assembly", "Any 1 dot hint", 1).addInputBus("Any 4 dot hint (min 1)", 4) .addInputHatch("Any 4 dot hint(min 1)", 4); if (requiresOutputHatch()) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 7114bed42f..9596aebcd7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -127,7 +127,7 @@ public class GregtechMetaTileEntity_PowerSubStationController .addInfo("Hatches can be placed nearly anywhere") .addInfo("HV Energy/Dynamo Hatches are the lowest tier you can use") .addInfo("Supports voltages >= UHV using MAX tier components.").addSeparator() - .addController("Bottom Center").addCasingInfo("Sub-Station External Casings", 10) + .addController("Bottom Center").addCasingInfoMin("Sub-Station External Casings", 10, false) .addDynamoHatch("Any Casing", 1).addEnergyHatch("Any Casing", 1) .addSubChannelUsage("capacitor", "Vanadium Capacitor Cell Tier") .addSubChannelUsage("height", "Height of structure").toolTipFinisher(CORE.GT_Tooltip_Builder.get()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java index 0a3736bee4..720fcbffff 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -29,14 +31,14 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock super(aID, aName, aNameRegional, aTier, aSlotCount, aDescription); } - public TileEntitySolarHeater(final String aName, final int aTier, final String aDescription, + public TileEntitySolarHeater(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures, final int aSlotCount) { super(aName, aTier, aSlotCount, aDescription, aTextures); } @Override public String[] getDescription() { - return new String[] { this.mDescription, "Point me at a Solar Tower", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll(this.mDescriptionArray, "Point me at a Solar Tower", CORE.GT_Tooltip.get()); } @Override @@ -115,7 +117,7 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new TileEntitySolarHeater(this.mName, this.mTier, this.mDescription, this.mTextures, 0); + return new TileEntitySolarHeater(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, 0); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java index 3a070ec781..5b103191f2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; @@ -25,11 +27,6 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures); } - public GT_MetaTileEntity_RedstoneBase(String aName, int aTier, int aInvSlotCount, String aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, aInvSlotCount, aDescription, aTextures); - } - public GT_MetaTileEntity_RedstoneBase(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); @@ -109,6 +106,6 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T @Override public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; + return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java index f76154b1c6..2b3ec158d8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java @@ -34,14 +34,14 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red "Right-click with Screwdriver to change Button Design"); } - public GT_MetaTileEntity_RedstoneButtonPanel(final String aName, String aDescription, + public GT_MetaTileEntity_RedstoneButtonPanel(final String aName, String[] aDescription, final ITexture[][][] aTextures) { super(aName, 5, 0, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RedstoneButtonPanel(this.mName, mDescription, this.mTextures); + return new GT_MetaTileEntity_RedstoneButtonPanel(this.mName, mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java index 933e7f1b75..8fa38ac694 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java @@ -40,6 +40,7 @@ import gregtech.api.util.GT_CircuitryBehavior; import gregtech.api.util.GT_CoverBehavior; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; +import gregtech.api.util.ISerializableObject; import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -53,14 +54,14 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re super(aID, "redstone.circuit", "Redstone Circuit Block", 1, 5, "Computes Redstone"); } - public GT_MetaTileEntity_RedstoneCircuitBlock(final String aName, String aDescription, + public GT_MetaTileEntity_RedstoneCircuitBlock(final String aName, String[] aDescription, final ITexture[][][] aTextures) { super(aName, 1, 5, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RedstoneCircuitBlock(this.mName, mDescription, this.mTextures); + return new GT_MetaTileEntity_RedstoneCircuitBlock(this.mName, mDescriptionArray, this.mTextures); } @Override @@ -395,7 +396,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re @Override public GT_CoverBehavior getCover(ForgeDirection side) { - return getBaseMetaTileEntity().getCoverBehaviorAtSide(side); + return (GT_CoverBehavior) getBaseMetaTileEntity().getCoverBehaviorAtSideNew(side); } @Override @@ -405,7 +406,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re @Override public int getCoverVariable(ForgeDirection side) { - return getBaseMetaTileEntity().getCoverDataAtSide(side); + return ((ISerializableObject.LegacyCoverData) getBaseMetaTileEntity().getComplexCoverDataAtSide(side)).get(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java index 1180ffe6b9..5a97a6da90 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java @@ -24,13 +24,13 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa super(aID, "redstone.lamp", "Redstone Controlled Lamp", 0, 0, "Redstone Controlled Lamp"); } - public GT_MetaTileEntity_RedstoneLamp(final String aName, String aDescription, final ITexture[][][] aTextures) { + public GT_MetaTileEntity_RedstoneLamp(final String aName, String[] aDescription, final ITexture[][][] aTextures) { super(aName, 0, 0, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RedstoneLamp(this.mName, mDescription, this.mTextures); + return new GT_MetaTileEntity_RedstoneLamp(this.mName, mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java index 681cc9278f..c69ccf9181 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java @@ -27,14 +27,14 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity super(aID, aUnlocal, aLocal, 5, 0, aDescription); } - public GT_MetaTileEntity_RedstoneStrengthDisplay(final String aName, String aDescription, + public GT_MetaTileEntity_RedstoneStrengthDisplay(final String aName, String[] aDescription, final ITexture[][][] aTextures) { super(aName, 5, 0, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RedstoneStrengthDisplay(this.mName, mDescription, this.mTextures); + return new GT_MetaTileEntity_RedstoneStrengthDisplay(this.mName, mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java index 00c2d9cc9a..bf794650ec 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java @@ -25,14 +25,14 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R super(aID, "redstone.display.scale", "Redstone Scale", "Redstone Strength on a Scale"); } - public GT_MetaTileEntity_RedstoneStrengthScale(final String aName, String aDescription, + public GT_MetaTileEntity_RedstoneStrengthScale(final String aName, String[] aDescription, final ITexture[][][] aTextures) { super(aName, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_RedstoneStrengthScale(this.mName, mDescription, this.mTextures); + return new GT_MetaTileEntity_RedstoneStrengthScale(this.mName, mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java index 6fba128833..5927f08ca9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java @@ -12,6 +12,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.PacketBuffer; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -54,7 +56,7 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B mLocalName = aNameRegional; } - public GT_MetaTileEntity_AdvancedCraftingTable(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_AdvancedCraftingTable(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 35, aDescription, aTextures); } @@ -136,7 +138,11 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_AdvancedCraftingTable(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_AdvancedCraftingTable( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override @@ -470,8 +476,11 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B @Override public String[] getDescription() { - return new String[] { isAdvanced() ? "For the very large Projects" : "For the smaller Projects", - "Hold Shift in GUI to see slot usage", this.mDescription, CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll( + this.mDescriptionArray, + isAdvanced() ? "For the very large Projects" : "For the smaller Projects", + "Hold Shift in GUI to see slot usage", + CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java index 8899827aac..e4fdb869ab 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java @@ -21,7 +21,7 @@ public class GT_MetaTileEntity_BronzeCraftingTable extends GT_MetaTileEntity_Adv super(aID, aName, aNameRegional, aTier, aDescription); } - public GT_MetaTileEntity_BronzeCraftingTable(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_BronzeCraftingTable(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -38,13 +38,16 @@ public class GT_MetaTileEntity_BronzeCraftingTable extends GT_MetaTileEntity_Adv @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_BronzeCraftingTable(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_BronzeCraftingTable( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } - @SuppressWarnings("deprecation") @Override public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { - return GregTech_API.getCoverBehavior(aStack.toStack()).isSimpleCover(); + return GregTech_API.getCoverBehaviorNew(aStack.toStack()).isSimpleCover(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java index b3aac7b33e..9a073e9e30 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java @@ -80,13 +80,14 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered new ITexture[0]); } - public GT_MetaTileEntity_ConnectableCrate(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_ConnectableCrate(String aName, int aTier, String[] aDescription, + ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @Override public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; + return org.apache.commons.lang3.ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); } @Override @@ -110,7 +111,7 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ConnectableCrate(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_ConnectableCrate(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } public int getOppositeSide(int side) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java index fa4ee205ae..f0c91ec34f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; @@ -40,18 +42,13 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi new ITexture[0]); } - public GT_MetaTileEntity_TieredChest(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } - /* - * public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - * super(aName, aTier, 3, aDescription, aTextures); } - */ - @Override public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; + return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); } @Override @@ -75,7 +72,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TieredChest(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_TieredChest(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java index 82f43aab1b..6c263b6836 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.storage; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -30,24 +32,20 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { super(aID, aName, aNameRegional, aTier, 3, "Stores " + ((int) (Math.pow(2, aTier) * 32000)) + "L of fluid"); } - public GT_MetaTileEntity_TieredTank(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_TieredTank(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { - super(aName, aTier, 3, "Stores " + ((int) (Math.pow(2, aTier) * 32000)) + "L of fluid", aTextures); + super(aName, aTier, 3, aDescription, aTextures); } @Override public String[] getDescription() { - String[] aTip; - - String aTankPortableness = "portable"; - - if (this.mFluid == null) { - aTip = new String[] { this.mDescription, "A " + aTankPortableness + " tank.", CORE.GT_Tooltip.get() }; - } else { - aTip = new String[] { this.mDescription, "A " + aTankPortableness + " tank.", - "Fluid: " + mFluid.getLocalizedName() + " " + mFluid.amount + "L", CORE.GT_Tooltip.get() }; + List<String> description = new ArrayList<>(Arrays.asList(this.mDescriptionArray)); + description.add("A portable tank."); + if (this.mFluid != null) { + description.add("Fluid: " + mFluid.getLocalizedName() + " " + mFluid.amount + "L"); } - return aTip; + description.add(CORE.GT_Tooltip.get()); + return description.toArray(new String[0]); } @Override @@ -144,7 +142,7 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_TieredTank(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_TieredTank(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java index bc9964301d..7d87d186b5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java @@ -131,34 +131,6 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange) }; } - /* - * @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new - * ITexture[2][17][]; for (byte i = -1; i < 16; i++) { rTextures[0][i + 1] = new ITexture[] { new - * GT_RenderedTexture( Textures.BlockIcons.MACHINE_HEATPROOFCASING) }; rTextures[1][i + 1] = new ITexture[] { new - * GT_RenderedTexture( Textures.BlockIcons.MACHINE_HEATPROOFCASING), mInventory.length > 4 ? - * Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier] : Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] }; } return - * rTextures; } - */ - - /* - * @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new - * ITexture[5][17][]; for (byte i = -1; i < 16; i = (byte) (i + 1)) { ITexture[] tmp0 = { new GT_RenderedTexture( - * Textures.BlockIcons.MACHINE_STEEL_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] = - * tmp0; ITexture[] tmp1 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_TOP) }; rTextures[1][(i + 1)] - * = tmp1; ITexture[] tmp2 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i, - * Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[2][(i + 1)] = tmp2; - * ITexture[] tmp4 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i, - * Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; rTextures[3][(i + 1)] = tmp4; - * ITexture[] tmp5 = { new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i, - * Dyes._NULL.mRGBa)), new GT_RenderedTexture( Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; rTextures[4][(i + 1)] = - * tmp5; } return rTextures; } - */ - - /* - * @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte - * aColorIndex, boolean aActive, boolean aRedstone) { return mTextures[side == facing ? 1 : 0][aColorIndex+1]; } - */ - @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { return new GregtechMetaEnergyBuffer( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java index 7f70731e3c..9e7b7d03e5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.storage; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.ButtonWidget; @@ -24,19 +26,14 @@ public class GregtechMetaSafeBlock extends GregtechMetaSafeBlockBase implements super(aID, aName, aNameRegional, aTier, 28, "Protecting your items from sticky fingers."); } - public GregtechMetaSafeBlock(final int aID, final String aName, final String aNameRegional, final int aTier, - final int aInvSlotCount, final String aDescription) { - super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription); - } - public GregtechMetaSafeBlock(final String aName, final int aTier, final int aInvSlotCount, - final String aDescription, final ITexture[][][] aTextures) { + final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); } @Override public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; + return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); } @Override @@ -45,7 +42,7 @@ public class GregtechMetaSafeBlock extends GregtechMetaSafeBlockBase implements this.mName, this.mTier, this.mInventory.length, - this.mDescription, + this.mDescriptionArray, this.mTextures); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java index 2e8c438221..53892cd841 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java @@ -7,7 +7,6 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest; @@ -18,17 +17,12 @@ public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_Tier super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_InfiniteItemHolder(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_InfiniteItemHolder(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override - public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; - } - - @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { if (aBaseMetaTileEntity.getWorld().isRemote) { return false; @@ -92,6 +86,6 @@ public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_Tier @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_InfiniteItemHolder(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_InfiniteItemHolder(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java index 1fa208ae98..aeea5b33e8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java @@ -6,6 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -24,7 +26,6 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIco public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric { public byte mType = 0; - public String mOldDesc = ""; public boolean mLocked = false; protected byte mIndex = (byte) MathUtils.randInt(1, 3); public static GT_RenderedTexture texBottom = new GT_RenderedTexture( @@ -36,12 +37,10 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric { public GT4Entity_Shelf(final int aID, final String aName, final String aNameRegional, final String aDescription) { super(aID, aName, aNameRegional, 0, aDescription); - mOldDesc = aDescription; } - public GT4Entity_Shelf(final String aName, final String aDescription, final ITexture[][][] aTextures) { + public GT4Entity_Shelf(final String aName, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, 0, aDescription, aTextures); - mOldDesc = aDescription; } @Override @@ -49,10 +48,6 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric { return true; } - public int getInvSize() { - return 1; - } - @Override public boolean isFacingValid(ForgeDirection facing) { return facing.offsetY == 0; @@ -178,7 +173,7 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf(this.mName, this.mDescription, this.mTextures); + return new GT4Entity_Shelf(this.mName, this.mDescriptionArray, this.mTextures); } @Override @@ -213,8 +208,12 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric { @Override public String[] getDescription() { - return new String[] { mOldDesc, "Decorative Item Storage", "Right click to store/remove something", - "Ctrl + Rmb to check contents", "Ctrl + Rmb with a screwdriver to lock", }; + return ArrayUtils.addAll( + mDescriptionArray, + "Decorative Item Storage", + "Right click to store/remove something", + "Ctrl + Rmb to check contents", + "Ctrl + Rmb with a screwdriver to lock"); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java index 6167bcede9..fec96cbdd4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java @@ -16,13 +16,13 @@ public class GT4Entity_Shelf_Compartment extends GT4Entity_Shelf { super(aID, aName, aNameRegional, aDescription); } - public GT4Entity_Shelf_Compartment(String mName, String mDescriptionArray, ITexture[][][] mTextures) { + public GT4Entity_Shelf_Compartment(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) { super(mName, mDescriptionArray, mTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf_Compartment(this.mName, this.mDescription, this.mTextures); + return new GT4Entity_Shelf_Compartment(this.mName, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java index b8bc4bf427..e486292995 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java @@ -13,13 +13,13 @@ public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf { super(aID, aName, aNameRegional, aDescription); } - public GT4Entity_Shelf_Desk(String mName, String mDescriptionArray, ITexture[][][] mTextures) { + public GT4Entity_Shelf_Desk(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) { super(mName, mDescriptionArray, mTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf_Desk(this.mName, this.mDescription, this.mTextures); + return new GT4Entity_Shelf_Desk(this.mName, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java index 502bb62b1f..60fc4d511e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java @@ -16,7 +16,7 @@ public class GT4Entity_Shelf_FileCabinet extends GT4Entity_Shelf { super(aID, aName, aNameRegional, aDescription); } - public GT4Entity_Shelf_FileCabinet(String mName, String mDescriptionArray, ITexture[][][] mTextures) { + public GT4Entity_Shelf_FileCabinet(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) { super(mName, mDescriptionArray, mTextures); } @@ -30,7 +30,7 @@ public class GT4Entity_Shelf_FileCabinet extends GT4Entity_Shelf { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf_FileCabinet(this.mName, this.mDescription, this.mTextures); + return new GT4Entity_Shelf_FileCabinet(this.mName, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java index 22f8aaf769..e870113951 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java @@ -11,13 +11,13 @@ public class GT4Entity_Shelf_Iron extends GT4Entity_Shelf { super(aID, aName, aNameRegional, aDescription); } - public GT4Entity_Shelf_Iron(String mName, String mDescriptionArray, ITexture[][][] mTextures) { + public GT4Entity_Shelf_Iron(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) { super(mName, mDescriptionArray, mTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf_Iron(this.mName, this.mDescription, this.mTextures); + return new GT4Entity_Shelf_Iron(this.mName, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java index 17464c5333..c2fd2674d8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java @@ -36,7 +36,7 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf { this.mItemStack = null; } - public GT4Entity_Shelf_Large(String mName, String mDescriptionArray, final int aSize, ITexture[][][] mTextures) { + public GT4Entity_Shelf_Large(String mName, String[] mDescriptionArray, final int aSize, ITexture[][][] mTextures) { super(mName, mDescriptionArray, mTextures); this.mSize = aSize; this.mItemCount = 0; @@ -45,13 +45,9 @@ public class GT4Entity_Shelf_Large extends GT4Entity_Shelf { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf_Large(this.mName, this.mDescription, mSize, this.mTextures); + return new GT4Entity_Shelf_Large(this.mName, this.mDescriptionArray, mSize, this.mTextures); } - /* - * @Override public int getInvSize() { return (mSize > 0 && mSize < 255 ? mSize : 255); } - */ - @Override public boolean isGivingInformation() { return true; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java index 8fb3cd9886..357cd74cbc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java @@ -16,8 +16,8 @@ import net.minecraft.util.IChatComponent; import net.minecraftforge.event.world.BlockEvent; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -80,17 +80,12 @@ public class TOOL_Gregtech_AngleGrinder extends GT_Tool { @Override public String getCraftingSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(1)); + return SoundResource.RANDOM_ANVIL_USE.toString(); } @Override public String getEntityHitSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(2)); - } - - @Override - public String getBreakingSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(0)); + return SoundResource.RANDOM_ANVIL_BREAK.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java index a1d424c618..be943cd398 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java @@ -18,7 +18,7 @@ import net.minecraft.util.IChatComponent; import net.minecraftforge.event.world.BlockEvent; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_Recipe; @@ -82,17 +82,12 @@ public class TOOL_Gregtech_Choocher extends GT_Tool { @Override public String getCraftingSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(1)); + return SoundResource.RANDOM_ANVIL_USE.toString(); } @Override public String getEntityHitSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(2)); - } - - @Override - public String getBreakingSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(0)); + return SoundResource.RANDOM_ANVIL_BREAK.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java index c7e978e5bc..dbae822abd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java @@ -16,8 +16,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -80,17 +80,12 @@ public class TOOL_Gregtech_ElectricButcherKnife extends GT_Tool { @Override public String getCraftingSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(1)); + return SoundResource.RANDOM_ANVIL_USE.toString(); } @Override public String getEntityHitSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(2)); - } - - @Override - public String getBreakingSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(0)); + return SoundResource.RANDOM_ANVIL_BREAK.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java index e464c41abe..46720bb4f2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java @@ -15,8 +15,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -79,17 +79,12 @@ public class TOOL_Gregtech_ElectricLighter extends GT_Tool { @Override public String getCraftingSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(1)); + return SoundResource.RANDOM_ANVIL_USE.toString(); } @Override public String getEntityHitSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(2)); - } - - @Override - public String getBreakingSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(0)); + return SoundResource.RANDOM_ANVIL_BREAK.toString(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java index 77b41790b9..6a0339e043 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java @@ -62,7 +62,7 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato && (!aMaterial.contains(SubTag.FLAMMABLE)) && (!aMaterial.contains(SubTag.MAGICAL)) && (!aMaterial.contains(SubTag.NO_SMELTING))) { - Logger.WARNING("Found " + aMaterial.name() + " as a valid Skookum Choocher Material."); + Logger.WARNING("Found " + aMaterial.mName + " as a valid Skookum Choocher Material."); // Input 1 final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); final ItemStack ingot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L); @@ -93,13 +93,12 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato used++; } else { Logger.WARNING( - "" + aMaterial.name() - + " could not be used for all input compoenents. [3x" - + aMaterial.name() + aMaterial.mName + " could not be used for all input compoenents. [3x" + + aMaterial.mName + " plates, 2x" - + aMaterial.name() + + aMaterial.mName + " ingots, 1x" - + aMaterial.name() + + aMaterial.mName + " Hard Hammer Head."); } // GT_ModHandler.addCraftingRecipe(, GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | @@ -107,10 +106,10 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato // OrePrefixes.ingot.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); } else { - Logger.WARNING("" + aMaterial.name() + " was not a valid Skookum Choocher Material."); + Logger.WARNING(aMaterial.mName + " was not a valid Skookum Choocher Material."); } } else { - Logger.WARNING("" + aMaterial.name() + " was not a valid Skookum Choocher Material."); + Logger.WARNING(aMaterial.mName + " was not a valid Skookum Choocher Material."); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java index 88c2f90c3c..a84d5bdde0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java @@ -447,13 +447,6 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { return true; } - // Machine Component Assembler - @Override - public boolean addComponentMakerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, - int aDuration, int aEUt) { - return false; - } - @Override public boolean addMultiblockCentrifugeRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java index eb13397bf3..7fd68be584 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java @@ -128,6 +128,6 @@ public class GregtechBufferDynamos { GregtechItemList.Hatch_Buffer_Dynamo_MAX.get(1L, new Object[0]), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_MAX, 'T', CI.getTieredCircuit(9), 'C', - OrePrefixes.wireGt04.get((Object) Materials.Superconductor) }); + OrePrefixes.wireGt04.get(Materials.SuperconductorUHV) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java deleted file mode 100644 index 81bc9efa8b..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java +++ /dev/null @@ -1,665 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_ComponentAssemblers; - -import java.util.ArrayList; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.util.GTPP_Recipe; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; - -public class GregtechComponentAssembler { - - public static void run() { - - if (!enableMachine_ComponentAssemblers) { - return; - } - - GregtechItemList.Machine_LV_Component_Maker.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 985, - "basicmachine.componentmaker.tier.01", - "Basic Component Maker", - 1, - "Components, Unite!", - GTPP_Recipe.GTPP_Recipe_Map.sComponentAssemblerRecipes, - 6, - 1, - 16000, - 0, - 1, - "Assembler.png", - "", - false, - false, - 0, - "ASSEMBLER", - new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); - GregtechItemList.Machine_MV_Component_Maker.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 986, - "basicmachine.componentmaker.tier.02", - "Advanced Component Maker", - 2, - "Components, Unite!", - GTPP_Recipe.GTPP_Recipe_Map.sComponentAssemblerRecipes, - 6, - 1, - 16000, - 0, - 1, - "Assembler.png", - "", - false, - false, - 0, - "ASSEMBLER", - new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); - GregtechItemList.Machine_HV_Component_Maker.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 987, - "basicmachine.componentmaker.tier.03", - "Advanced Component Maker II", - 3, - "Components, Unite!", - GTPP_Recipe.GTPP_Recipe_Map.sComponentAssemblerRecipes, - 6, - 1, - 16000, - 0, - 1, - "Assembler.png", - "", - false, - false, - 0, - "ASSEMBLER", - new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); - GregtechItemList.Machine_EV_Component_Maker.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 988, - "basicmachine.componentmaker.tier.04", - "Advanced Component Maker III", - 4, - "Components, Unite!", - GTPP_Recipe.GTPP_Recipe_Map.sComponentAssemblerRecipes, - 6, - 1, - 16000, - 0, - 1, - "Assembler.png", - "", - false, - false, - 0, - "ASSEMBLER", - new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); - GregtechItemList.Machine_IV_Component_Maker.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 989, - "basicmachine.componentmaker.tier.05", - "Advanced Component Maker IV", - 5, - "Components, Unite!", - GTPP_Recipe.GTPP_Recipe_Map.sComponentAssemblerRecipes, - 6, - 1, - 16000, - 0, - 1, - "Assembler.png", - "", - false, - false, - 0, - "ASSEMBLER", - new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); - GregtechItemList.Machine_LuV_Component_Maker.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 31012, - "basicmachine.componentmaker.tier.06", - "Advanced Component Maker V", - 6, - "Components, Unite!", - GTPP_Recipe.GTPP_Recipe_Map.sComponentAssemblerRecipes, - 6, - 1, - 24000, - 0, - 1, - "Assembler.png", - "", - false, - false, - 0, - "ASSEMBLER", - new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); - GregtechItemList.Machine_ZPM_Component_Maker.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 31013, - "basicmachine.componentmaker.tier.07", - "Advanced Component Maker VI", - 7, - "Components, Unite!", - GTPP_Recipe.GTPP_Recipe_Map.sComponentAssemblerRecipes, - 6, - 1, - 32000, - 0, - 1, - "Assembler.png", - "", - false, - false, - 0, - "ASSEMBLER", - new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); - GregtechItemList.Machine_UV_Component_Maker.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 31014, - "basicmachine.componentmaker.tier.08", - "Advanced Component Maker VII", - 8, - "Components, Unite!", - GTPP_Recipe.GTPP_Recipe_Map.sComponentAssemblerRecipes, - 6, - 1, - 48000, - 0, - 1, - "Assembler.png", - "", - false, - false, - 0, - "ASSEMBLER", - new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); - - // Motors - // addRecipeMotor(0, Materials.Lead, 1, Materials.RedAlloy, 1, - // Materials.WroughtIron, Materials.IronMagnetic); - addRecipeMotor(1, Materials.Copper, 1, Materials.Tin, 1, Materials.Iron, Materials.IronMagnetic); - addRecipeMotor(2, Materials.Copper, 2, Materials.Copper, 1, Materials.Aluminium, Materials.SteelMagnetic); - addRecipeMotor(3, Materials.Copper, 4, Materials.Gold, 1, Materials.StainlessSteel, Materials.SteelMagnetic); - addRecipeMotor(4, Materials.Copper, 8, Materials.Aluminium, 1, Materials.Titanium, Materials.NeodymiumMagnetic); - addRecipeMotor( - 5, - Materials.Copper, - 16, - Materials.Tungsten, - 1, - Materials.TungstenSteel, - Materials.NeodymiumMagnetic); - - // Pistons - // addRecipePiston(0, Materials.Lead, Materials.Lead); - addRecipePiston(1, Materials.Steel, Materials.Tin); - addRecipePiston(2, Materials.Aluminium, Materials.Copper); - addRecipePiston(3, Materials.StainlessSteel, Materials.Gold); - addRecipePiston(4, Materials.Titanium, Materials.Aluminium); - addRecipePiston(5, Materials.TungstenSteel, Materials.Tungsten); - - // Conveyors - // addRecipeConveyor(0, Materials.Lead); - addRecipeConveyor(1, Materials.Tin); - addRecipeConveyor(2, Materials.Copper); - addRecipeConveyor(3, Materials.Gold); - addRecipeConveyor(4, Materials.Aluminium); - addRecipeConveyor(5, Materials.Tungsten); - - // Pumps - // addRecipePump(0, Materials.Lead, Materials.Lead, Materials.Lead); - addRecipePump(1, Materials.Tin, Materials.Copper, Materials.Tin); - addRecipePump(2, Materials.Bronze, Materials.Steel, Materials.Copper); - addRecipePump(3, Materials.Steel, Materials.StainlessSteel, Materials.Gold); - addRecipePump(4, Materials.StainlessSteel, Materials.Titanium, Materials.Aluminium); - addRecipePump(5, Materials.TungstenSteel, Materials.TungstenSteel, Materials.Tungsten); - - // Robot Arms - // addRecipeRobotArm(0, Materials.Lead, Materials.Lead); - addRecipeRobotArm(1, Materials.Steel, Materials.Tin); - addRecipeRobotArm(2, Materials.Aluminium, Materials.Copper); - addRecipeRobotArm(3, Materials.StainlessSteel, Materials.Gold); - addRecipeRobotArm(4, Materials.Titanium, Materials.Aluminium); - addRecipeRobotArm(5, Materials.TungstenSteel, Materials.Tungsten); - - // Field Generators - // addRecipeFieldGenerator(0, Materials.Lead); - addRecipeFieldGenerator(1); - addRecipeFieldGenerator(2); - addRecipeFieldGenerator(3); - addRecipeFieldGenerator(4); - addRecipeFieldGenerator(5); - - // Emitters - // addRecipeEmitter(0, Materials.Lead, Materials.IronMagnetic); - addRecipeEmitter(1, Materials.Tin, Materials.Brass, Materials.Quartzite); - addRecipeEmitter(2, Materials.Copper, Materials.Electrum, Materials.NetherQuartz); - addRecipeEmitter(3, Materials.Gold, Materials.Chrome, Materials.Emerald); - addRecipeEmitter(4, Materials.Aluminium, Materials.Platinum, Materials.EnderPearl); - addRecipeEmitter(5, Materials.Tungsten, Materials.Osmium, Materials.EnderEye); - - // Sensors - // addRecipeSensor(0, Materials.WroughtIron, Materials.IronMagnetic, - // Materials.Apatite); - addRecipeSensor(1, Materials.Steel, Materials.Brass, Materials.Quartzite); - addRecipeSensor(2, Materials.Aluminium, Materials.Electrum, Materials.NetherQuartz); - addRecipeSensor(3, Materials.StainlessSteel, Materials.Chrome, Materials.Emerald); - addRecipeSensor(4, Materials.Titanium, Materials.Platinum, Materials.EnderPearl); - addRecipeSensor(5, Materials.TungstenSteel, Materials.Osmium, Materials.EnderEye); - } - - private static boolean addRecipeMotor(int tier, Materials wire, int wirethickness, Materials cable, - int cablethickness, Materials stick, Materials magstick) { - try { - String mWT = "" + wirethickness; - String mCT = "" + cablethickness; - - if (wirethickness < 10) { - mWT = "0" + wirethickness; - } - if (cablethickness < 10) { - mCT = "0" + cablethickness; - } - - OrePrefixes prefixWire = OrePrefixes.getOrePrefix("wireGt" + mWT); - OrePrefixes prefixCable = OrePrefixes.getOrePrefix("cableGt" + mCT); - - ItemStack wireStack = ItemUtils.getGregtechOreStack(prefixWire, wire, 4); - ItemStack cableStack = ItemUtils.getGregtechOreStack(prefixCable, cable, 2); - ItemStack rodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, stick, 2); - ItemStack magrodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, magstick, 1); - - ItemStack Input[] = { wireStack, cableStack, rodStack, magrodStack }; - - return CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getElectricMotor(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } catch (Throwable t) { - return false; - } - } - - private static boolean addRecipePiston(int tier, Materials mat, Materials cable) { - try { - - OrePrefixes prefixCable = OrePrefixes.cableGt01; - ItemStack cableStack = ItemUtils.getGregtechOreStack(prefixCable, cable, 2); - ItemStack rodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, mat, 2); - ItemStack plateStack = ItemUtils.getGregtechOreStack(OrePrefixes.plate, mat, 3); - ItemStack gearStack = ItemUtils.getGregtechOreStack(OrePrefixes.gearGtSmall, mat, 1); - ItemStack motorStack = CI.getElectricMotor(tier, 1); - - ItemStack Input[] = { plateStack, cableStack, rodStack, gearStack, motorStack }; - - return CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getElectricPiston(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } catch (Throwable t) { - return false; - } - } - - private static boolean addRecipeConveyor(int tier, Materials cable) { - try { - OrePrefixes prefixCable = OrePrefixes.cableGt01; - ItemStack cableStack = ItemUtils.getGregtechOreStack(prefixCable, cable, 1); - ItemStack motorStack = CI.getElectricMotor(tier, 2); - boolean mAdd[]; - final ArrayList<ItemStack> oreDictList = OreDictionary.getOres("plateAnyRubber"); - if (!oreDictList.isEmpty()) { - int mcount = 0; - mAdd = new boolean[oreDictList.size()]; - for (ItemStack mRubberType : oreDictList) { - final ItemStack returnValue = mRubberType.copy(); - returnValue.stackSize = 6; - ItemStack Input[] = { cableStack, motorStack, returnValue }; - mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getConveyor(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - int added = 0; - for (boolean y : mAdd) { - if (y) { - added++; - } - } - if (added >= (oreDictList.size() / 2)) { - return true; - } else { - return false; - } - } else { - ItemStack Input[] = { cableStack, motorStack, - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateRubber", 6) }; - return CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getConveyor(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - - } catch (Throwable t) { - return false; - } - } - - private static boolean addRecipePump(int tier, Materials main, Materials pipe, Materials cable) { - try { - ItemStack cableStack = ItemUtils.getGregtechOreStack(OrePrefixes.cableGt01, cable, 1); - ItemStack screwStack = ItemUtils.getGregtechOreStack(OrePrefixes.screw, main, 1); - ItemStack rotorStack = ItemUtils.getGregtechOreStack(OrePrefixes.rotor, main, 1); - ItemStack pipeStack = ItemUtils.getGregtechOreStack(OrePrefixes.pipeMedium, pipe, 1); - ItemStack motorStack = CI.getElectricMotor(tier, 1); - boolean mAdd[]; - final ArrayList<ItemStack> oreDictList = OreDictionary.getOres("ringAnyRubber"); - if (!oreDictList.isEmpty()) { - int mcount = 0; - mAdd = new boolean[oreDictList.size()]; - for (ItemStack mRubberType : oreDictList) { - final ItemStack returnValue = mRubberType.copy(); - returnValue.stackSize = 2; - ItemStack Input[] = { cableStack, screwStack, rotorStack, pipeStack, motorStack, returnValue }; - mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getElectricPump(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - int added = 0; - for (boolean y : mAdd) { - if (y) { - added++; - } - } - if (added >= (oreDictList.size() / 2)) { - return true; - } else { - return false; - } - } else { - ItemStack Input[] = { cableStack, screwStack, rotorStack, pipeStack, motorStack, - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ringRubber", 2) }; - return CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getElectricPump(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - - } catch (Throwable t) { - return false; - } - } - - private static boolean addRecipeRobotArm(int tier, Materials stick, Materials cable) { - try { - ItemStack cableStack = ItemUtils.getGregtechOreStack(OrePrefixes.cableGt01, cable, 3); - ItemStack rodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, stick, 2); - ItemStack motorStack = CI.getElectricMotor(tier, 2); - ItemStack pistonStack = CI.getElectricPiston(tier, 1); - - boolean mAdd[]; - final ItemStack oreDictList[] = CI.getAllCircuitsOfTier(tier); - if (oreDictList.length > 0) { - int mcount = 0, added = 0; - mAdd = new boolean[oreDictList.length]; - for (ItemStack mCircuitType : oreDictList) { - final ItemStack returnValue = mCircuitType.copy(); - returnValue.stackSize = 1; - ItemStack Input[] = { returnValue, cableStack, rodStack, pistonStack, motorStack }; - mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getRobotArm(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - for (boolean y : mAdd) { - if (y) { - added++; - } - } - if (added >= (oreDictList.length / 2)) { - return true; - } else { - return false; - } - } else { - ItemStack Input[] = { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1), cableStack, - rodStack, pistonStack, motorStack }; - return CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getRobotArm(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - - } catch (Throwable t) { - return false; - } - } - - private static boolean addRecipeFieldGenerator(int tier) { - try { - ItemStack gem; - String mWT; - if (tier == 1) mWT = "01"; - else if (tier == 2) mWT = "02"; - else if (tier == 3) mWT = "04"; - else if (tier == 4) mWT = "08"; - else if (tier == 5) mWT = "16"; - else mWT = "01"; - - ItemStack eyeQuantum = ItemList.QuantumEye.get(1); - ItemStack starQuantum = ItemList.QuantumStar.get(1); - - if (tier == 1) gem = ItemUtils.getSimpleStack(Items.ender_pearl); - else if (tier == 2) gem = ItemUtils.getSimpleStack(Items.ender_eye); - else if (tier == 3) gem = eyeQuantum; - else if (tier == 4) gem = ItemUtils.getSimpleStack(Items.nether_star); - else if (tier == 5) gem = starQuantum; - else gem = ItemUtils.getSimpleStack(Items.ender_pearl); - - OrePrefixes prefixWire = OrePrefixes.getOrePrefix("wireGt" + mWT); - ItemStack wireStack = ItemUtils.getGregtechOreStack(prefixWire, Materials.Osmium, 4); - - boolean mAdd[]; - final ItemStack oreDictList[] = CI.getAllCircuitsOfTier(tier); - if (oreDictList.length > 0) { - int mcount = 0, added = 0; - mAdd = new boolean[oreDictList.length]; - for (ItemStack mCircuitType : oreDictList) { - final ItemStack returnValue = mCircuitType.copy(); - returnValue.stackSize = 4; - ItemStack Input[] = { returnValue, wireStack, gem }; - mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getFieldGenerator(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - for (boolean y : mAdd) { - if (y) { - added++; - } - } - if (added >= (oreDictList.length / 2)) { - return true; - } else { - return false; - } - } else { - ItemStack Input[] = { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 4), wireStack, - gem }; - return CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getFieldGenerator(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - - } catch (Throwable t) { - return false; - } - } - - private static boolean addRecipeEmitter(int tier, Materials cable, Materials stick, Materials gem) { - try { - ItemStack cableStack = ItemUtils.getGregtechOreStack(OrePrefixes.cableGt01, cable, 2); - ItemStack gemstack = ItemUtils.getGregtechOreStack(OrePrefixes.gem, gem, 1); - ItemStack magrodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, stick, 4); - - boolean mAdd[]; - final ItemStack oreDictList[] = CI.getAllCircuitsOfTier(tier); - if (oreDictList.length > 0) { - int mcount = 0, added = 0; - mAdd = new boolean[oreDictList.length]; - for (ItemStack mCircuitType : oreDictList) { - final ItemStack returnValue = mCircuitType.copy(); - returnValue.stackSize = 2; - ItemStack Input[] = { returnValue, cableStack, gemstack, magrodStack }; - mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getEmitter(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - for (boolean y : mAdd) { - if (y) { - added++; - } - } - if (added >= (oreDictList.length / 2)) { - return true; - } else { - return false; - } - } else { - ItemStack Input[] = { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 2), cableStack, - gemstack, magrodStack }; - return CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getEmitter(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - - } catch (Throwable t) { - return false; - } - } - - private static boolean addRecipeSensor(int tier, Materials plate, Materials rod, Materials gem) { - try { - ItemStack cableStack = ItemUtils.getGregtechOreStack(OrePrefixes.plate, plate, 4); - ItemStack magrodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, rod, 1); - ItemStack gemStack = ItemUtils.getGregtechOreStack(OrePrefixes.gem, gem, 1); - - boolean mAdd[]; - final ItemStack oreDictList[] = CI.getAllCircuitsOfTier(tier); - if (oreDictList.length > 0) { - int mcount = 0, added = 0; - mAdd = new boolean[oreDictList.length]; - for (ItemStack mCircuitType : oreDictList) { - final ItemStack returnValue = mCircuitType.copy(); - returnValue.stackSize = 1; - ItemStack Input[] = { gemStack, cableStack, returnValue, magrodStack }; - mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getSensor(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - for (boolean y : mAdd) { - if (y) { - added++; - } - } - if (added >= (oreDictList.length / 2)) { - return true; - } else { - return false; - } - } else { - ItemStack Input[] = { gemStack, cableStack, magrodStack, - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1) }; - return CORE.RA.addComponentMakerRecipe( - Input, - GT_Values.NF, - CI.getSensor(tier, 1), - (tier * 40), - ((int) GT_Values.V[tier] / 16) * 15); - } - - } catch (Throwable t) { - return false; - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index ca2e45ebfa..25694ac385 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -238,8 +238,7 @@ public class GregtechConduits { private static void wireFactory(final String Material, final int Voltage, final int ID, final long insulatedLoss, final long uninsulatedLoss, final long Amps, final short[] rgb) { - @SuppressWarnings("deprecation") - final Materials T = Materials.valueOf(Material); + final Materials T = Materials.get(Material); int V = GT_Utility.getTier(Voltage); if (V == -1) { Logger.ERROR("Failed to set voltage on " + Material + ". Invalid voltage of " + Voltage + "V set."); @@ -249,17 +248,16 @@ public class GregtechConduits { makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false, rgb); } - @SuppressWarnings("deprecation") private static void makeWires(final Materials aMaterial, final int aStartID, final long aLossInsulated, final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, final boolean aAutoInsulated, final short[] aRGB) { - Logger.WARNING("Gregtech5u Content | Registered " + aMaterial.name() + " as a new material for Wire & Cable."); + Logger.WARNING("Gregtech5u Content | Registered " + aMaterial.mName + " as a new material for Wire & Cable."); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt01, aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 0, - "wire." + aMaterial.name().toLowerCase() + ".01", + "wire." + aMaterial.mName.toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Wire", 0.125F, aMaterial, @@ -274,7 +272,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 1, - "wire." + aMaterial.name().toLowerCase() + ".02", + "wire." + aMaterial.mName.toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Wire", 0.25F, aMaterial, @@ -289,7 +287,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 2, - "wire." + aMaterial.name().toLowerCase() + ".04", + "wire." + aMaterial.mName.toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Wire", 0.375F, aMaterial, @@ -304,7 +302,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 3, - "wire." + aMaterial.name().toLowerCase() + ".08", + "wire." + aMaterial.mName.toLowerCase() + ".08", "8x " + aMaterial.mDefaultLocalName + " Wire", 0.50F, aMaterial, @@ -319,7 +317,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 4, - "wire." + aMaterial.name().toLowerCase() + ".12", + "wire." + aMaterial.mName.toLowerCase() + ".12", "12x " + aMaterial.mDefaultLocalName + " Wire", 0.625F, aMaterial, @@ -334,7 +332,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 5, - "wire." + aMaterial.name().toLowerCase() + ".16", + "wire." + aMaterial.mName.toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Wire", 0.75F, aMaterial, @@ -350,7 +348,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 6, - "cable." + aMaterial.name().toLowerCase() + ".01", + "cable." + aMaterial.mName.toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Cable", 0.25F, aMaterial, @@ -365,7 +363,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 7, - "cable." + aMaterial.name().toLowerCase() + ".02", + "cable." + aMaterial.mName.toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Cable", 0.375F, aMaterial, @@ -380,7 +378,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 8, - "cable." + aMaterial.name().toLowerCase() + ".04", + "cable." + aMaterial.mName.toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Cable", 0.5F, aMaterial, @@ -395,7 +393,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 9, - "cable." + aMaterial.name().toLowerCase() + ".08", + "cable." + aMaterial.mName.toLowerCase() + ".08", "8x " + aMaterial.mDefaultLocalName + " Cable", 0.625F, aMaterial, @@ -410,7 +408,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 10, - "cable." + aMaterial.name().toLowerCase() + ".12", + "cable." + aMaterial.mName.toLowerCase() + ".12", "12x " + aMaterial.mDefaultLocalName + " Cable", 0.75F, aMaterial, @@ -425,7 +423,7 @@ public class GregtechConduits { aMaterial, new GregtechMetaPipeEntity_Cable( aStartID + 11, - "cable." + aMaterial.name().toLowerCase() + ".16", + "cable." + aMaterial.mName.toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Cable", 0.875f, aMaterial, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index b361c6810a..1495e6e282 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -161,7 +161,7 @@ public class GregtechEnergyBuffer { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), + OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), Character.valueOf('T'), GregtechOreDictNames.buffer_core }); /* * GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index b138383aff..af18105590 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -60,7 +60,7 @@ public class GregtechGeothermalThermalGenerator { | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CEC", "GMG", "PWP", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'), ItemList.Electric_Piston_IV, Character.valueOf('E'), ItemList.Electric_Motor_IV, - Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), + Character.valueOf('C'), OrePrefixes.circuit.get(Materials.SuperconductorUHV), Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum), Character.valueOf('G'), ALLOY.STELLITE.getGear(1) }); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java index e15ca67a6c..b341f867b9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java @@ -124,7 +124,7 @@ public class GregtechSafeBlock { | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('V'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest, - Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Superconductor) }); + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.SuperconductorUHV) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java index 444b5f5e9f..739c77ce87 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java @@ -1,91 +1,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import gregtech.common.tileentities.automation.GT_MetaTileEntity_SuperBuffer; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.creative.GT_MetaTileEntity_InfiniteItemHolder; public class GregtechThreadedBuffers { public static void run() { - run2(); - } - - private static void run2() { - GregtechItemList.Infinite_Item_Chest.set( (new GT_MetaTileEntity_InfiniteItemHolder(31010, "infinite.chest.tier.01", "Infinite Item Chest", 1)) .getStackForm(1L)); - - /* - * This file used to contain registration and recipes for GT++ threaded super buffers. Those have now been - * deprecated and replaced by the original GT super buffers. To avoid breaking existing bases, we've assigned - * the threaded super buffer metadata IDs to a copy of the GT super buffers, with a deprecation notice attached. - * We've also provided disassembler recipes that are the reverse of the original crafting recipes, allowing - * players to reclaim their original materials as well as convert the deprecated threaded super buffer metadata - * ID item back to the original GT super buffer metadata ID item. - */ - - final String deprecationNotice = "**DEPRECATED - Drop in disassembler!** "; - GregtechItemList.Automation_Threaded_SuperBuffer_ULV.set( - (new GT_MetaTileEntity_SuperBuffer( - 31000, - "automation.superbuffer.tier.00.deprecated", - deprecationNotice + "Ultra Low Voltage Super Buffer", - 0)).getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_LV.set( - (new GT_MetaTileEntity_SuperBuffer( - 31001, - "automation.superbuffer.tier.01.deprecated", - deprecationNotice + "Low Voltage Super Buffer", - 1)).getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_MV.set( - (new GT_MetaTileEntity_SuperBuffer( - 31002, - "automation.superbuffer.tier.02.deprecated", - deprecationNotice + "Medium Voltage Super Buffer", - 2)).getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_HV.set( - (new GT_MetaTileEntity_SuperBuffer( - 31003, - "automation.superbuffer.tier.03.deprecated", - deprecationNotice + "High Voltage Super Buffer", - 3)).getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_EV.set( - (new GT_MetaTileEntity_SuperBuffer( - 31004, - "automation.superbuffer.tier.04.deprecated", - deprecationNotice + "Extreme Voltage Super Buffer", - 4)).getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_IV.set( - (new GT_MetaTileEntity_SuperBuffer( - 31005, - "automation.superbuffer.tier.05.deprecated", - deprecationNotice + "Insane Voltage Super Buffer", - 5)).getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_LuV.set( - (new GT_MetaTileEntity_SuperBuffer( - 31006, - "automation.superbuffer.tier.06.deprecated", - deprecationNotice + "Ludicrous Voltage Super Buffer", - 6)).getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_ZPM.set( - (new GT_MetaTileEntity_SuperBuffer( - 31007, - "automation.superbuffer.tier.07.deprecated", - deprecationNotice + "ZPM Voltage Super Buffer", - 7)).getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_UV.set( - (new GT_MetaTileEntity_SuperBuffer( - 31008, - "automation.superbuffer.tier.08.deprecated", - deprecationNotice + "Ultimate Voltage Super Buffer", - 8)).getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_MAX.set( - (new GT_MetaTileEntity_SuperBuffer( - 31009, - "automation.superbuffer.tier.09.deprecated", - deprecationNotice + "Highly Ultimate Voltage Super Buffer", - 9)).getStackForm(1L)); - } } diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java index 91a1f787d6..92be443da8 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java @@ -201,11 +201,6 @@ public class CustomKineticRotor extends Item implements IKineticRotor { } @Override - public int getDisplayDamage(ItemStack stack) { - return super.getDisplayDamage(stack); - } - - @Override public double getDurabilityForDisplay(ItemStack stack) { return super.getDurabilityForDisplay(stack); } diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java index 5376739106..78da4ff31f 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java @@ -431,26 +431,6 @@ public class ThaumcraftUtils { return research; } - public static void placeAspectIntoResearchNote(ItemStack note, World aWorld, final int q, final int r, - final TC_Aspect_Wrapper aspect) { - /* - * TC_ResearchNoteData_Wrapper data = gatherResults(note); String mGTPP = CORE.gameProfile.getName(); - * EntityPlayer player = CORE.getFakePlayer(aWorld); if (isItemResearchNotes(note) && data != null && - * note.getItemDamage() < 64) { final boolean r2 = ResearchManager.isResearchComplete(mGTPP, "RESEARCHER1"); - * final boolean r3 = ResearchManager.isResearchComplete(mGTPP, "RESEARCHER2"); final HexUtils.Hex hex = new - * HexUtils.Hex(q, r); ResearchManager.HexEntry he = null; if (aspect != null) { he = new - * ResearchManager.HexEntry(aspect, 2); if (r3 && aWorld.rand.nextFloat() < 0.1f) { - * aWorld.playSoundAtEntity((Entity) player, "random.orb", 0.2f, 0.9f + player.worldObj.rand.nextFloat() * - * 0.2f); } } else { final float f = aWorld.rand.nextFloat(); if (data.hexEntries.get(hex.toString()).aspect != - * null && ((r2 && f < 0.25f) || (r3 && f < 0.5f))) { aWorld.playSoundAtEntity((Entity) player, "random.orb", - * 0.2f, 0.9f + player.worldObj.rand.nextFloat() * 0.2f); ResearchManager.scheduleSave(player); } he = new - * ResearchManager.HexEntry((Aspect) null, 0); } data.hexEntries.put(hex.toString(), he); - * data.hexes.put(hex.toString(), hex); updateResearchNote(note, data); if (!aWorld.isRemote && - * ResearchManager.checkResearchCompletion(note, data, player.getCommandSenderName())) { note.setItemDamage(64); - * } } - */ - } - public static void completeResearchNote(World aWorld, ItemStack aStack) { if (!aWorld.isRemote) { if (isItemResearchNotes(aStack)) { diff --git a/src/main/resources/assets/miscutils/lang/de_DE.lang b/src/main/resources/assets/miscutils/lang/de_DE.lang index 6dd49228a2..16e785d8d3 100644 --- a/src/main/resources/assets/miscutils/lang/de_DE.lang +++ b/src/main/resources/assets/miscutils/lang/de_DE.lang @@ -96,8 +96,6 @@ item.itemPLACEHOLDER_Circuit.name=Quark-Manipulator (UV) item.itemPlateEnrichedSoularium.name=Platte aus angereichertem Soularium item.itemHeliumBlob.name=Geheimnisvolle Wasserstoffsubstanz item.itemAlkalusDisk.name=Alkalus-Schallplatte -item.itemHotIngotRaisinBread.name=Heißer Laib Rosinenbrot -item.itemIngotRaisinBread.name=§5ImQ009's §fRosinenbrot //Misc Blocks tile.blockCompressedObsidian.0.name=Komprimierter Obsidian (9) diff --git a/src/main/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index 21ecde5ee7..a6bee8f224 100644 --- a/src/main/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -2021,7 +2021,6 @@ tile.blockDarkWorldPortalFrame.name=Containment Frame //Added 1/4/18 tile.Block of Plutonium-239.name=Block of Plutonium-239 -tile.Fluorite Ore [Old].name=Fluorite Ore [Deprecated] tile.blockMiningPipeFake.name=Strengthened Mining Pipe tile.blockMiningHeadFake.name=Bedrock Drill item.itemPlateMeatRaw.name=Fleshy Panel @@ -3167,15 +3166,6 @@ item.BasicGenericChemItem.5.name=Brown Metal Catalyst item.MudRedSlurry.name=Cell of Red Mud Slurry item.liquid_toluene.name=Toluene Cell -# The following 7 keys have been deprecated and overwritten -# item.BasicAlgaeItem.0.name=Algae Spore (I) -# item.BasicAlgaeItem.1.name=Algae Spore (II) -# item.BasicAlgaeItem.2.name=Algae Spore (III) -# item.BasicAlgaeItem.3.name=Algae Spore (IV) -# item.BasicAlgaeItem.4.name=Algae Spore (V) -# item.BasicAlgaeItem.5.name=Algae Spore (VI) -# item.BasicAlgaeItem.6.name=Algae Spore (VII) - //Added 17/01/20 item.BasicGenericChemItem.6.name=Pink Metal Catalyst diff --git a/src/main/resources/assets/miscutils/lang/ru_RU.lang b/src/main/resources/assets/miscutils/lang/ru_RU.lang index 142a5b5e01..3a1dcf8cdd 100644 --- a/src/main/resources/assets/miscutils/lang/ru_RU.lang +++ b/src/main/resources/assets/miscutils/lang/ru_RU.lang @@ -97,9 +97,6 @@ item.itemPLACEHOLDER_Circuit.name=Quark Manipulator (UV) item.itemPlateEnrichedSoularium.name=Enriched Soularium Plate item.itemHeliumBlob.name=Mysterious Hydrogen Substance item.itemAlkalusDisk.name=Alkalus Disk -# The following 2 keys have been deprecated and overwritten -# item.itemHotIngotRaisinBread.name=Hot Loaf of Raisin Bread -# item.itemIngotRaisinBread.name=§5ImQ009's §fRaisin Bread //Misc Blocks tile.blockCompressedObsidian.0.name=Компрессированный Обсидиан (9) @@ -1956,13 +1953,8 @@ tile.blockDarkWorldPortalFrame.name=Containment Frame //Added 1/4/18 tile.Block of Plutonium-239.name=Блок Плутона-239 -tile.Fluorite Ore [Old].name=Fluorite Ore [Deprecated] tile.blockMiningPipeFake.name=Strengthened Mining Pipe tile.blockMiningHeadFake.name=Bedrock Drill -# The following 3 keys have been deprecated and overwritten -# item.itemCellLiFBeF2ThF4UF4.name=Cell of Molten Salt [LiFBeF2ThF4UF4] -# item.itemCellLiFBeF2ZrF4UF4.name=Cell of Molten Salt [LiFBeF2ZrF4UF4] -# item.itemCellLiFBeF2ZrF4U235.name=Cell of Molten Salt [LiFBeF2ZrF4U235] item.itemPlateMeatRaw.name=Fleshy Panel tile.Block of MeatRaw.name=Block of Raw Meat @@ -3110,15 +3102,6 @@ item.BasicGenericChemItem.5.name=Brown Metal Catalyst item.MudRedSlurry.name=Cell of Red Mud Slurry item.liquid_toluene.name=Toluene Cell -# The following 7 keys have been deprecated and overwritten -# item.BasicAlgaeItem.0.name=Algae Spore (I) -# item.BasicAlgaeItem.1.name=Algae Spore (II) -# item.BasicAlgaeItem.2.name=Algae Spore (III) -# item.BasicAlgaeItem.3.name=Algae Spore (IV) -# item.BasicAlgaeItem.4.name=Algae Spore (V) -# item.BasicAlgaeItem.5.name=Algae Spore (VI) -# item.BasicAlgaeItem.6.name=Algae Spore (VII) - //Added 17/01/20 item.BasicGenericChemItem.6.name=Pink Metal Catalyst diff --git a/src/main/resources/assets/miscutils/lang/zh_CN.lang b/src/main/resources/assets/miscutils/lang/zh_CN.lang index 63177a7d72..bf70ed4a0b 100644 --- a/src/main/resources/assets/miscutils/lang/zh_CN.lang +++ b/src/main/resources/assets/miscutils/lang/zh_CN.lang @@ -97,9 +97,6 @@ item.itemPLACEHOLDER_Circuit.name=夸克操纵者 (UV) item.itemPlateEnrichedSoularium.name=富集阳光合金板 item.itemHeliumBlob.name=神秘氢气物质 item.itemAlkalusDisk.name=Alkalus圆盘 -# The following 2 keys have been deprecated and overwritten -# item.itemHotIngotRaisinBread.name=Hot Loaf of Raisin Bread -# item.itemIngotRaisinBread.name=§5ImQ009's §fRaisin Bread //Misc Blocks tile.blockCompressedObsidian.0.name=压缩黑曜石(9) @@ -1956,13 +1953,8 @@ tile.blockDarkWorldPortalFrame.name=遏制框架 //Added 1/4/18 tile.Block of Plutonium-239.name=钚-239块 -tile.Fluorite Ore [Old].name=氟石矿[不可用的] tile.blockMiningPipeFake.name=强化钢筋挖掘管道 tile.blockMiningHeadFake.name=基岩钻头 -# The following 3 keys have been deprecated and overwritten -# item.itemCellLiFBeF2ThF4UF4.name=Cell of Molten Salt [LiFBeF2ThF4UF4] -# item.itemCellLiFBeF2ZrF4UF4.name=Cell of Molten Salt [LiFBeF2ZrF4UF4] -# item.itemCellLiFBeF2ZrF4U235.name=Cell of Molten Salt [LiFBeF2ZrF4U235] item.itemPlateMeatRaw.name=生肉板 tile.Block of MeatRaw.name=生肉块 @@ -3110,15 +3102,6 @@ item.BasicGenericChemItem.5.name=棕色金属催化剂 item.MudRedSlurry.name=红色泥浆单元 item.liquid_toluene.name=甲苯单元 -# The following 7 keys have been deprecated and overwritten -# item.BasicAlgaeItem.0.name=Algae Spore (I) -# item.BasicAlgaeItem.1.name=Algae Spore (II) -# item.BasicAlgaeItem.2.name=Algae Spore (III) -# item.BasicAlgaeItem.3.name=Algae Spore (IV) -# item.BasicAlgaeItem.4.name=Algae Spore (V) -# item.BasicAlgaeItem.5.name=Algae Spore (VI) -# item.BasicAlgaeItem.6.name=Algae Spore (VII) - //Added 17/01/20 item.BasicGenericChemItem.6.name=粉色金属催化剂 diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png Binary files differdeleted file mode 100644 index 1938287f27..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png Binary files differdeleted file mode 100644 index 327e530f1b..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png Binary files differdeleted file mode 100644 index 635be463af..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png Binary files differdeleted file mode 100644 index 24afa30c17..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png Binary files differdeleted file mode 100644 index 847e54ef60..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png Binary files differdeleted file mode 100644 index ddd9cb7a2f..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png Binary files differdeleted file mode 100644 index e21c4fb78c..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png Binary files differdeleted file mode 100644 index 29e270f862..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png Binary files differdeleted file mode 100644 index 87a48050fd..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png +++ /dev/null diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png Binary files differdeleted file mode 100644 index 3836414587..0000000000 --- a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png +++ /dev/null |
