diff options
Diffstat (limited to 'src/main/java/gregtech/common/items')
18 files changed, 65 insertions, 88 deletions
diff --git a/src/main/java/gregtech/common/items/DropType.java b/src/main/java/gregtech/common/items/DropType.java index 3573978e21..198e1e3787 100644 --- a/src/main/java/gregtech/common/items/DropType.java +++ b/src/main/java/gregtech/common/items/DropType.java @@ -23,7 +23,7 @@ public enum DropType { public int chance; private String name; - private DropType(String pName, boolean show) { + DropType(String pName, boolean show) { this.name = pName; this.showInList = show; } diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java index 95a6474c17..dd1dc60e06 100644 --- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java +++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java @@ -150,7 +150,7 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs aTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aTab, List<ItemStack> aList) { if (GT_Values.D1) { int i = 0; for (int j = FluidRegistry.getMaxID(); i < j; i++) { diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index 65cd24c116..66a6437e98 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -171,19 +171,14 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo } private static String getModeString(int aMetaData) { - switch ((byte) (aMetaData >>> 8)) { - case 0: - return "=="; - case 1: - return "<="; - case 2: - return ">="; - case 3: - return "<"; - case 4: - return ">"; - } - return ""; + return switch ((byte) (aMetaData >>> 8)) { + case 0 -> "=="; + case 1 -> "<="; + case 2 -> ">="; + case 3 -> "<"; + case 4 -> ">"; + default -> ""; + }; } private static String getConfigurationString(int aMetaData) { @@ -220,7 +215,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo @Override @SideOnly(Side.CLIENT) - public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { + public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { aList.add(new ItemStack(this, 1, 0)); } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java index 8bd30912fc..c748ae8520 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java @@ -312,7 +312,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item { @SuppressWarnings("unchecked") @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { Arrays.stream(FluidCell.values()) .filter(fluid -> FluidRegistry.getFluid(fluid.getFluidName()) != null) .map(FluidCell::get) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java index 4186b607f8..ce3ef4be30 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java @@ -177,7 +177,7 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { enabled.stream() .mapToObj(i -> new ItemStack(this, 1, i)) .forEach(aList::add); diff --git a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java index fbe8ab9728..0a2b7ff9b5 100644 --- a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java +++ b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java @@ -102,5 +102,5 @@ public class GT_SensorCard_Item extends GT_Generic_Item implements IRemoteSensor @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aOutputSubItems) {} + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aOutputSubItems) {} } diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java index 1787875100..63fa279916 100644 --- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java +++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java @@ -226,7 +226,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs creativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs creativeTabs, List<ItemStack> itemList) { itemList.add(new ItemStack(this)); for (Fluid fluid : FluidRegistry.getRegisteredFluids() .values()) { @@ -244,10 +244,9 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain return false; } TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof IFluidHandler)) { + if (!(te instanceof IFluidHandler handler)) { return false; } - IFluidHandler handler = (IFluidHandler) te; ForgeDirection dir = ForgeDirection.getOrientation(side); FluidStack fs = this.getFluid(stack); int capacity = getCapacity(stack); @@ -274,8 +273,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain private boolean collectFluidBlock(ItemStack stack, EntityPlayer player, World world, int x, int y, int z) { Block block = world.getBlock(x, y, z); - if (block instanceof IFluidBlock) { - IFluidBlock liquid = (IFluidBlock) block; + if (block instanceof IFluidBlock liquid) { if (liquid.canDrain(world, x, y, z)) { FluidStack fluid = liquid.drain(world, x, y, z, false); int amount = fillContainerStack(stack, player, fluid, true); diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 70a89d3c17..1cf5de780e 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -58,7 +58,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list) { + public void getSubItems(Item item, CreativeTabs tabs, List<ItemStack> list) { for (CombType type : CombType.values()) { if (type.showInList) { list.add(this.getStackForType(type)); @@ -742,13 +742,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.SULFUR, new Materials[] { Materials.Sulfur }, Voltage.LV); addProcessGT(CombType.GALLIUM, new Materials[] { Materials.Gallium }, Voltage.LV); addProcessGT(CombType.ARSENIC, new Materials[] { Materials.Arsenic }, Voltage.LV); - if (ProcessingModSupport.aEnableGCMarsMats) { - addProcessGT(CombType.IRON, new Materials[] { Materials.Iron }, Voltage.LV); - addProcessGT(CombType.STEEL, new Materials[] { Materials.Steel }, Voltage.LV); - } else { - addProcessGT(CombType.IRON, new Materials[] { Materials.Iron }, Voltage.LV); - addProcessGT(CombType.STEEL, new Materials[] { Materials.Steel }, Voltage.LV); - } + addProcessGT(CombType.IRON, new Materials[] { Materials.Iron }, Voltage.LV); + addProcessGT(CombType.STEEL, new Materials[] { Materials.Steel }, Voltage.LV); if (GT_Mod.gregtechproxy.mNerfedCombs) { addCentrifugeToMaterial( CombType.SLAG, @@ -1549,7 +1544,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToMaterial( CombType.INFINITYCATALYST, new Materials[] { Materials.InfinityCatalyst, Materials.Neutronium }, - new int[] { (int) (25 * 100), 20 * 100 }, + new int[] { 25 * 100, 20 * 100 }, new int[] {}, Voltage.ZPM, 100, @@ -1600,9 +1595,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { 100 * 100, (fluid.getFluid() .getDensity() * 128 > 0 - ? (int) (fluid.getFluid() - .getDensity() - * 100) + ? (fluid.getFluid() + .getDensity() * 100) : 128), volt.getSimpleEnergy() / 2); } @@ -1618,8 +1612,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { **/ public void addProcessGT(CombType comb, Materials[] aMaterial, Voltage volt) { ItemStack tComb = getStackForType(comb); - for (int i = 0; i < aMaterial.length; i++) { - if (GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial[i], 4) != NI) { + for (Materials materials : aMaterial) { + if (GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4) != NI) { switch (comb) { case NEUTRONIUM: RA.addChemicalRecipe( @@ -1671,7 +1665,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { null, volt.getFluidAccordingToCombTier(), null, - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial[i], 4), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4), NI, volt.getComplexTime(), volt.getChemicalEnergy(), @@ -1742,7 +1736,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { public void addCentrifugeToItemStack(CombType comb, ItemStack[] aItem, int[] chance, Voltage volt, int duration) { ItemStack tComb = getStackForType(comb); - Builder<ItemStack, Float> Product = new ImmutableMap.Builder<ItemStack, Float>(); + Builder<ItemStack, Float> Product = new ImmutableMap.Builder<>(); for (int i = 0; i < aItem.length; i++) { if (aItem[i] == NI) { continue; @@ -1841,25 +1835,24 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { // cascading from IV to UMV since all recipes use HydrofluiricAcid // for later tiers, just add the corresponding tier to a case int fluidAmount = this.getFluidAmount(); - switch (this.getVoltageFromEU()) { - case 0: + return switch (this.getVoltageFromEU()) { + case 0 -> /** ULV **/ - return Materials.Water.getFluid(fluidAmount); - case 1: + Materials.Water.getFluid(fluidAmount); + case 1 -> /** LV **/ - return Materials.SulfuricAcid.getFluid(fluidAmount); - case 2: + Materials.SulfuricAcid.getFluid(fluidAmount); + case 2 -> /** MV **/ - return Materials.HydrochloricAcid.getFluid(fluidAmount); - case 3: + Materials.HydrochloricAcid.getFluid(fluidAmount); + case 3 -> /** HV **/ - return Materials.PhosphoricAcid.getFluid(fluidAmount); - case 4: + Materials.PhosphoricAcid.getFluid(fluidAmount); + case 4 -> /** EV **/ - return Materials.HydrofluoricAcid.getFluid(this.getFluidAmount()); - default: - return Materials.PhthalicAcid.getFluid(fluidAmount); - } + Materials.HydrofluoricAcid.getFluid(this.getFluidAmount()); + default -> Materials.PhthalicAcid.getFluid(fluidAmount); + }; } /** @return additional required UU-Matter amount for Autoclave process related to the Tier **/ @@ -1892,7 +1885,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { if (this == Voltage.ULV) { return 5; } else { - return (int) (this.getVoltage() / 16) * 15; + return (this.getVoltage() / 16) * 15; } } } diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java index 4b615b9f6e..2593945417 100644 --- a/src/main/java/gregtech/common/items/ItemDrop.java +++ b/src/main/java/gregtech/common/items/ItemDrop.java @@ -46,7 +46,7 @@ public class ItemDrop extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list) { + public void getSubItems(Item item, CreativeTabs tabs, List<ItemStack> list) { for (DropType type : DropType.values()) { if (type.showInList) { list.add(this.getStackForType(type)); diff --git a/src/main/java/gregtech/common/items/ItemPollen.java b/src/main/java/gregtech/common/items/ItemPollen.java index b2e2462585..45557518ff 100644 --- a/src/main/java/gregtech/common/items/ItemPollen.java +++ b/src/main/java/gregtech/common/items/ItemPollen.java @@ -38,7 +38,7 @@ public class ItemPollen extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list) { + public void getSubItems(Item item, CreativeTabs tabs, List<ItemStack> list) { for (PollenType type : PollenType.values()) { if (type.showInList) { list.add(this.getStackForType(type)); diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index 657c6ef99a..00f2f4843a 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -45,7 +45,7 @@ public class ItemPropolis extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list) { + public void getSubItems(Item item, CreativeTabs tabs, List<ItemStack> list) { for (PropolisType type : PropolisType.values()) { if (type.showInList) { list.add(this.getStackForType(type)); diff --git a/src/main/java/gregtech/common/items/PollenType.java b/src/main/java/gregtech/common/items/PollenType.java index 782bed9f64..94393c1c3d 100644 --- a/src/main/java/gregtech/common/items/PollenType.java +++ b/src/main/java/gregtech/common/items/PollenType.java @@ -13,7 +13,7 @@ public enum PollenType { public int chance; private String name; - private PollenType(String pName, boolean show) { + PollenType(String pName, boolean show) { this.name = pName; this.showInList = show; } diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java index 88a1a3faa8..1060c21b0c 100644 --- a/src/main/java/gregtech/common/items/PropolisType.java +++ b/src/main/java/gregtech/common/items/PropolisType.java @@ -23,7 +23,7 @@ public enum PropolisType { public int chance; private String name; - private PropolisType(String pName, boolean show) { + PropolisType(String pName, boolean show) { this.name = pName; this.showInList = show; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java index 93414ec8aa..7c03965cc0 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java @@ -122,7 +122,7 @@ public class Behaviour_Arrow extends Behaviour_None { -1, null, true, - new Object[] { aWorld, Double.valueOf(aX), Double.valueOf(aY), Double.valueOf(aZ) }); + new Object[] { aWorld, aX, aY, aZ }); rArrow.setArrowItem(aStack); return rArrow; } @@ -138,7 +138,7 @@ public class Behaviour_Arrow extends Behaviour_None { -1, null, true, - new Object[] { aWorld, aEntity, Float.valueOf(this.mSpeedMultiplier * aSpeed) }); + new Object[] { aWorld, aEntity, this.mSpeedMultiplier * aSpeed }); rArrow.setArrowItem(aStack); return rArrow; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java index 57e0750335..d0c589c09f 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java @@ -104,8 +104,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None { + aWorld.provider.dimensionId + EnumChatFormatting.RESET + " -----"); - if (aTileEntity instanceof ICoverable) { - ICoverable tCoverable = (ICoverable) aTileEntity; + if (aTileEntity instanceof ICoverable tCoverable) { int tSide = tCoverable.getCoverItemAtSide((byte) aSide) != null ? aSide : tCoverable.getCoverItemAtSide(GT_Utility.determineWrenchingSide((byte) aSide, hitX, hitY, hitZ)) != null ? GT_Utility.determineWrenchingSide((byte) aSide, hitX, hitY, hitZ) : -1; @@ -135,8 +134,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None { } private void doPaste(TileEntity aTileEntity, int aSide, float hitX, float hitY, float hitZ, EntityPlayer aPlayer) { - if (aTileEntity instanceof ICoverable) { - ICoverable tCoverable = (ICoverable) aTileEntity; + if (aTileEntity instanceof ICoverable tCoverable) { if (mCoverType == 0 || mStoredData == null) { GT_Utility.sendChatToPlayer(aPlayer, "Please Copy a Valid Cover First."); return; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java index 84b6513563..8b876a5b44 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java @@ -38,17 +38,14 @@ public class Behaviour_DataStick extends Behaviour_None { aList.add("Rocket Schematic Tier: " + sTier); } else if (sTier >= 100) { switch (sTier) { - case 100: { + case 100 -> { aList.add("Moonbuggy Schematic"); - break; } - case 101: { + case 101 -> { aList.add("Cargo-Rocket Schematic"); - break; } - case 102: { + case 102 -> { aList.add("Astro-Miner Schematic"); - break; } } } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java index 737caf9f5b..cf5b782200 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java @@ -55,11 +55,9 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None { } } } - if (aTileEntity instanceof IGregTechTileEntity) { - IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aTileEntity; + if (aTileEntity instanceof IGregTechTileEntity tTileEntity) { IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity(); - if (mTileEntity instanceof GT_MetaTileEntity_BasicTank) { - GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity; + if (mTileEntity instanceof GT_MetaTileEntity_BasicTank machine) { if (machine.mFluid != null && machine.mFluid.amount > 0) machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000); GT_Utility.sendSoundToPlayers( diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java index 51723469d6..6bb687a5a8 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java @@ -33,24 +33,22 @@ public class Behaviour_Scoop extends Behaviour_None { } if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - Object tButterfly = ((IEntityButterfly) aEntity).getButterfly(); - ((IButterfly) tButterfly).getGenome() - .getPrimary() - .getRoot() - .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile()) - .registerCatch((IButterfly) tButterfly); + IButterfly tButterfly = ((IEntityButterfly) aEntity).getButterfly(); + tButterfly.getGenome() + .getPrimary() + .getRoot() + .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile()) + .registerCatch(tButterfly); aPlayer.worldObj.spawnEntityInWorld( new EntityItem( aPlayer.worldObj, aEntity.posX, aEntity.posY, aEntity.posZ, - ((IButterfly) tButterfly).getGenome() - .getPrimary() - .getRoot() - .getMemberStack( - ((IButterfly) tButterfly).copy(), - EnumFlutterType.BUTTERFLY.ordinal()))); + tButterfly.getGenome() + .getPrimary() + .getRoot() + .getMemberStack(tButterfly.copy(), EnumFlutterType.BUTTERFLY.ordinal()))); aEntity.setDead(); } return true; |