aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/items
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-01 20:06:12 +0100
committerGitHub <noreply@github.com>2023-04-01 19:06:12 +0000
commitb088958c9f6935d356b6c087c8e8106b400aa24f (patch)
treebe608fac08ba158f1226a4fb9f5b1ed459bac2a9 /src/main/java/gregtech/api/items
parente52cd9c3458584e58073df5cd9cde1302994f266 (diff)
downloadGT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.gz
GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.bz2
GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.zip
Jabel, Generic injection and mostly automatic code cleanup (#1829)
* Enable Jabel&Generic injection, fix type error caused by this * add missing <> * Infer generic types automatically * Parametrize cast types * Use enhanced for loops * Unnecessary boxing * Unnecessary unboxing * Use Objects.equals * Explicit type can be replaced with `<>` * Collapse identical catch blocks * Add SafeVarargs where applicable * Anonymous type can be replaced with lambda * Use List.sort directly * Lambda can be a method reference * Statement lambda can be an expression lambda * Use string switches * Instanceof pattern matching * Text block can be used * Migrate to enhanced switch * Java style array declarations * Unnecessary toString() * More unnecessary String conversions * Unnecessary modifiers * Unnecessary semicolons * Fix duplicate conditions * Extract common code from if branches * Replace switches with ifs for 1-2 cases * Inner class may be static * Minor performance issues * Replace string appending in loops with string builders * Fix IntelliJ using the wrong empty list method * Use Long.compare * Generic arguments: getSubItems * Generic arguments: getSubBlocks * Raw types warnings * Fix remaining missing generics * Too weak variable type leads to unnecessary cast * Redundant type casts * Redundant array length check * Redundant vararg arrays * Manual min/max implementations * A couple missed inspections * Goodbye explosion power ternary ladder * Apply spotless * Get rid of the other two big ternary ladders * Binary search explosion power * Don't overcomplicate things
Diffstat (limited to 'src/main/java/gregtech/api/items')
-rw-r--r--src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java2
-rw-r--r--src/main/java/gregtech/api/items/GT_BreederCell_Item.java21
-rw-r--r--src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java2
-rw-r--r--src/main/java/gregtech/api/items/GT_CoolantCell_Item.java37
-rw-r--r--src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java33
-rw-r--r--src/main/java/gregtech/api/items/GT_Generic_Item.java2
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaBase_Item.java7
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java6
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java2
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java2
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java11
-rw-r--r--src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java15
-rw-r--r--src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java20
-rw-r--r--src/main/java/gregtech/api/items/GT_SolderingTool_Item.java3
-rw-r--r--src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java33
-rw-r--r--src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java1
16 files changed, 70 insertions, 127 deletions
diff --git a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
index 3830ec6e52..36dff21cb0 100644
--- a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
+++ b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java
@@ -115,7 +115,7 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block {
@Override
@SideOnly(Side.CLIENT)
- public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) {
+ public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) {
for (int i = 0; i < 3; i++) {
ItemStack aStack = new ItemStack(aItem, 1, i);
if (!aStack.getDisplayName()
diff --git a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
index 3371a1a261..144fc0d39e 100644
--- a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java
@@ -67,8 +67,7 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
@Override
public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
- if ((entity instanceof EntityLivingBase)) {
- EntityLivingBase entityLiving = (EntityLivingBase) entity;
+ if ((entity instanceof EntityLivingBase entityLiving)) {
if (!GregTech_API.mIC2Classic && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
IC2Potion.radiation.applyTo(entityLiving, 20, 1);
}
@@ -79,19 +78,11 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp
public void addAdditionalToolTips(List<String> aList, ItemStack aStack, EntityPlayer aPlayer) {
aList.add(transItem("019", "Bath with neutron in a hot reactor"));
int rDmg = aStack.getItemDamage() * 4 / getMaxDamage();
- EnumChatFormatting color2;
- switch (rDmg) {
- case 0:
- color2 = EnumChatFormatting.DARK_GRAY;
- break;
- case 1:
- case 2:
- color2 = EnumChatFormatting.GRAY;
- break;
- default:
- color2 = EnumChatFormatting.WHITE;
- break;
- }
+ EnumChatFormatting color2 = switch (rDmg) {
+ case 0 -> EnumChatFormatting.DARK_GRAY;
+ case 1, 2 -> EnumChatFormatting.GRAY;
+ default -> EnumChatFormatting.WHITE;
+ };
aList.add(
String.format(
transItem("020", "Progress: %s/%s"),
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java b/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java
index 73d3dc3be8..492d009364 100644
--- a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java
@@ -51,7 +51,7 @@ public class GT_CoolantCellIC_Item extends GT_CoolantCell_Item implements IReact
}
tHeat += aHeat;
if (tHeat > this.heatStorage) {
- aReactor.setItemAt(x, y, (ItemStack) null);
+ aReactor.setItemAt(x, y, null);
aHeat = this.heatStorage - tHeat + 1;
} else {
if (tHeat < 0) {
diff --git a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
index b6530df95c..1b9a6de98a 100644
--- a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java
@@ -54,36 +54,19 @@ public class GT_CoolantCell_Item extends GT_Generic_Item {
public void addAdditionalToolTips(List<String> aList, ItemStack aStack, EntityPlayer aPlayer) {
super.addAdditionalToolTips(aList, aStack, aPlayer);
int rHeat = getHeatOfStack(aStack) * 10 / this.heatStorage;
- EnumChatFormatting color;
- switch (rHeat) {
- case 0:
- color = EnumChatFormatting.BLUE;
- break;
- case 1:
- case 2:
- color = EnumChatFormatting.GREEN;
- break;
- case 3:
- case 4:
- case 5:
- case 6:
- color = EnumChatFormatting.YELLOW;
- break;
- case 7:
- case 8:
- color = EnumChatFormatting.RED;
- break;
- default:
- color = EnumChatFormatting.DARK_RED;
- break;
- }
+ EnumChatFormatting color = switch (rHeat) {
+ case 0 -> EnumChatFormatting.BLUE;
+ case 1, 2 -> EnumChatFormatting.GREEN;
+ case 3, 4, 5, 6 -> EnumChatFormatting.YELLOW;
+ case 7, 8 -> EnumChatFormatting.RED;
+ default -> EnumChatFormatting.DARK_RED;
+ };
aList.add(
EnumChatFormatting.WHITE
+ String.format(transItem("000", "Stored Heat: %s"), "" + color + getHeatOfStack(aStack)));
- switch (getControlTagOfStack(aStack)) {
- case 1:
- aList.add(StatCollector.translateToLocal("ic2.reactoritem.heatwarning.line1"));
- aList.add(StatCollector.translateToLocal("ic2.reactoritem.heatwarning.line2"));
+ if (getControlTagOfStack(aStack) == 1) {
+ aList.add(StatCollector.translateToLocal("ic2.reactoritem.heatwarning.line1"));
+ aList.add(StatCollector.translateToLocal("ic2.reactoritem.heatwarning.line2"));
}
}
diff --git a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java
index d9c164f3ab..d69d6d93b9 100644
--- a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java
+++ b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java
@@ -32,7 +32,7 @@ import gregtech.api.util.GT_Utility;
public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
- public static Map jumpChargeMap = new ConcurrentHashMap();
+ public static Map<EntityPlayer, Float> jumpChargeMap = new ConcurrentHashMap<>();
public int mCharge, mTransfer, mTier, mDamageEnergyCost, mSpecials;
public boolean mChargeProvider;
public double mArmorAbsorbtionPercentage;
@@ -88,7 +88,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
}
@Override
- public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
+ public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
aList.add("Tier: " + mTier);
if ((mSpecials & 1) != 0) aList.add("Rebreather");
if ((mSpecials & 2) != 0) aList.add("Inertia Damper");
@@ -140,8 +140,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
}
if (!aPlayer.worldObj.isRemote && (mSpecials & 128) != 0) {
- float jumpCharge = jumpChargeMap.containsKey(aPlayer) ? ((Float) jumpChargeMap.get(aPlayer)).floatValue()
- : 1.0F;
+ float jumpCharge = jumpChargeMap.containsKey(aPlayer) ? (Float) jumpChargeMap.get(aPlayer) : 1.0F;
if (GT_ModHandler.canUseElectricItem(aStack, 1000) && aPlayer.onGround && jumpCharge < 1.0F) {
jumpCharge = 1.0F;
@@ -162,7 +161,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
}
}
- jumpChargeMap.put(aPlayer, Float.valueOf(jumpCharge));
+ jumpChargeMap.put(aPlayer, jumpCharge);
}
if ((mSpecials & 256) != 0) {
@@ -237,7 +236,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
@Override
@SideOnly(Side.CLIENT)
- public void getSubItems(Item aItem, CreativeTabs creativeTab, List outputSubItems) {
+ public void getSubItems(Item aItem, CreativeTabs creativeTab, List<ItemStack> outputSubItems) {
ItemStack tCharged = new ItemStack(this, 1), tUncharged = new ItemStack(this, 1, getMaxDamage());
GT_ModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false);
outputSubItems.add(tCharged);
@@ -291,8 +290,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
// TODO: @ForgeSubscribe
public void onEntityLivingFallEvent(LivingFallEvent event) {
- if (!event.entity.worldObj.isRemote && event.entity instanceof EntityPlayer) {
- EntityPlayer player = (EntityPlayer) event.entity;
+ if (!event.entity.worldObj.isRemote && event.entity instanceof EntityPlayer player) {
for (int i = 0; i < 4; i++) {
ItemStack armor = player.inventory.armorInventory[i];
if (armor != null && armor.getItem() == this && (mSpecials & 2) != 0) {
@@ -350,17 +348,12 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
private double getBaseAbsorptionRatio() {
if (mArmorAbsorbtionPercentage <= 0) return 0.00;
- switch (this.armorType) {
- case 0:
- return 0.15;
- case 1:
- return 0.40;
- case 2:
- return 0.30;
- case 3:
- return 0.15;
- default:
- return 0.00;
- }
+ return switch (this.armorType) {
+ case 0 -> 0.15;
+ case 1 -> 0.40;
+ case 2 -> 0.30;
+ case 3 -> 0.15;
+ default -> 0.00;
+ };
}
}
diff --git a/src/main/java/gregtech/api/items/GT_Generic_Item.java b/src/main/java/gregtech/api/items/GT_Generic_Item.java
index b8a348144c..03e42a1b41 100644
--- a/src/main/java/gregtech/api/items/GT_Generic_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Generic_Item.java
@@ -96,7 +96,7 @@ public class GT_Generic_Item extends Item implements IProjectileItem {
@SuppressWarnings("unchecked")
@Override
- public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
+ public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
if (getMaxDamage() > 0 && !getHasSubtypes())
aList.add((aStack.getMaxDamage() - getDamage(aStack)) + " / " + aStack.getMaxDamage());
if (mTooltip != null) aList.add(GT_LanguageManager.getTranslation(mTooltip));
diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
index 532b500d8f..c829f563b1 100644
--- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
+++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java
@@ -37,7 +37,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem {
/* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
- private final ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>> mItemBehaviors = new ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>>();
+ private final ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>> mItemBehaviors = new ConcurrentHashMap<>();
/**
* Creates the Item using these Parameters.
@@ -197,9 +197,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
return aStack;
}
- @SuppressWarnings("unchecked")
@Override
- public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
+ public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
String tKey = getUnlocalizedName(aStack) + ".tooltip";
String[] tStrings = GT_LanguageManager.getTranslation(tKey)
.split("/n ");
@@ -224,7 +223,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item
+ EnumChatFormatting.GRAY);
} else {
aList.add(
- String.valueOf(EnumChatFormatting.AQUA)
+ EnumChatFormatting.AQUA
+ String.format(
transItem("011", "%s / %s EU - Voltage: %s"),
formatNumbers(tCharge),
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
index 5f906d670d..7d70ae1c8e 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
@@ -65,7 +65,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
* <p/>
* You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item.
*/
- public static final ConcurrentHashMap<String, GT_MetaGenerated_Item> sInstances = new ConcurrentHashMap<String, GT_MetaGenerated_Item>();
+ public static final ConcurrentHashMap<String, GT_MetaGenerated_Item> sInstances = new ConcurrentHashMap<>();
/* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
@@ -120,7 +120,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
mVisibleItems.set(aID);
GT_LanguageManager.addStringLocalization(getUnlocalizedName(rStack) + ".name", aEnglish);
GT_LanguageManager.addStringLocalization(getUnlocalizedName(rStack) + ".tooltip", aToolTip);
- List<TC_AspectStack> tAspects = new ArrayList<TC_AspectStack>();
+ List<TC_AspectStack> tAspects = new ArrayList<>();
// Important Stuff to do first
for (Object tRandomData : aRandomData) if (tRandomData instanceof SubTag) {
if (tRandomData == SubTag.INVISIBLE) {
@@ -351,7 +351,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements
@Override
@SideOnly(Side.CLIENT)
- public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
+ public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) {
int j = mEnabledItems.length();
for (int i = 0; i < j; i++) if (mVisibleItems.get(i) || (D1 && mEnabledItems.get(i))) {
Long[] tStats = mElectricStats.get((short) (mOffset + i));
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java
index 6615c6177b..f32c326afa 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java
@@ -164,7 +164,7 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item {
@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) {
for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++)
if (mPrefix.doGenerateItem(GregTech_API.sGeneratedMaterials[i]) && doesShowInCreative(
mPrefix,
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
index a3c5814dbf..58368ba05b 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java
@@ -185,7 +185,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item {
@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) {
for (int i = 0; i < 32000; i++) {
OrePrefixes aPrefix = mGeneratedPrefixList[i / 1000];
Materials aMaterial = GregTech_API.sGeneratedMaterials[i % 1000];
diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
index 592914a2ff..5243a7bb07 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
@@ -81,11 +81,11 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
* <p/>
* You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item.
*/
- public static final ConcurrentHashMap<String, GT_MetaGenerated_Tool> sInstances = new ConcurrentHashMap<String, GT_MetaGenerated_Tool>();
+ public static final ConcurrentHashMap<String, GT_MetaGenerated_Tool> sInstances = new ConcurrentHashMap<>();
/* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
- public final ConcurrentHashMap<Short, IToolStats> mToolStats = new ConcurrentHashMap<Short, IToolStats>();
+ public final ConcurrentHashMap<Short, IToolStats> mToolStats = new ConcurrentHashMap<>();
/**
* Creates the Item using these Parameters.
@@ -180,7 +180,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
mToolStats.put((short) (aID + 1), aToolStats);
aToolStats.onStatsAddedToTool(this, aID);
ItemStack rStack = new ItemStack(this, 1, aID);
- List<TC_AspectStack> tAspects = new ArrayList<TC_AspectStack>();
+ List<TC_AspectStack> tAspects = new ArrayList<>();
for (Object tOreDictNameOrAspect : aOreDictNamesAndAspects) {
if (tOreDictNameOrAspect instanceof TC_AspectStack)
((TC_AspectStack) tOreDictNameOrAspect).addToAspectList(tAspects);
@@ -271,8 +271,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
}
IToolStats tStats = getToolStats(aStack);
Block aBlock = aPlayer.worldObj.getBlock(aX, aY, aZ);
- if (tStats.isChainsaw() && (aBlock instanceof IShearable)) {
- IShearable target = (IShearable) aBlock;
+ if (tStats.isChainsaw() && (aBlock instanceof IShearable target)) {
if ((target.isShearable(aStack, aPlayer.worldObj, aX, aY, aZ))) {
ArrayList<ItemStack> drops = target.onSheared(
aStack,
@@ -385,7 +384,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item
@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) {
for (int i = 0; i < 32766; i += 2) {
if (getToolStats(new ItemStack(this, 1, i)) != null) {
ItemStack tStack = new ItemStack(this, 1, i);
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
index da7a6bc984..617e02cfe6 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java
@@ -101,11 +101,11 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
int dheat = heat / heatAcceptors.size();
heat -= dheat;
- dheat = ((IReactorComponent) ((ItemStackCoord) heatAcceptors.get(0)).stack.getItem()).alterHeat(
+ dheat = ((IReactorComponent) heatAcceptors.get(0).stack.getItem()).alterHeat(
reactor,
- ((ItemStackCoord) heatAcceptors.get(0)).stack,
- ((ItemStackCoord) heatAcceptors.get(0)).x,
- ((ItemStackCoord) heatAcceptors.get(0)).y,
+ heatAcceptors.get(0).stack,
+ heatAcceptors.get(0).x,
+ heatAcceptors.get(0).y,
dheat);
heat += dheat;
heatAcceptors.remove(0);
@@ -149,7 +149,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
float ReaktorOutput = 1.5F * breedereffectiveness + 1.0F;
reactor.addOutput(ReaktorOutput * this.sEnergy);
} else {
- reactor.addOutput((float) (1.0F * this.sEnergy));
+ reactor.addOutput(1.0F * this.sEnergy);
}
}
return true;
@@ -182,15 +182,14 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
@Override
public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) {
- if (this.sRadiation > 0 && (entity instanceof EntityLivingBase)) {
- EntityLivingBase entityLiving = (EntityLivingBase) entity;
+ if (this.sRadiation > 0 && (entity instanceof EntityLivingBase entityLiving)) {
if (!GregTech_API.mIC2Classic && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
}
}
}
- private class ItemStackCoord {
+ private static class ItemStackCoord {
public ItemStack stack;
public int x;
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
index 4ec9ce1990..34492b6220 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
@@ -138,21 +138,11 @@ public class GT_RadioactiveCell_Item extends GT_Generic_Item implements IBoxable
super.addAdditionalToolTips(aList, aStack, aPlayer);
// aList.add("Time left: " + (this.maxDelay - getDurabilityOfStack(aStack)) + " secs");
int rDmg = getDurabilityOfStack(aStack) * 6 / this.maxDmg;
- EnumChatFormatting color2;
- switch (rDmg) {
- case 0:
- case 1:
- color2 = EnumChatFormatting.WHITE;
- break;
- case 2:
- case 3:
- case 4:
- color2 = EnumChatFormatting.GRAY;
- break;
- default:
- color2 = EnumChatFormatting.DARK_GRAY;
- break;
- }
+ EnumChatFormatting color2 = switch (rDmg) {
+ case 0, 1 -> EnumChatFormatting.WHITE;
+ case 2, 3, 4 -> EnumChatFormatting.GRAY;
+ default -> EnumChatFormatting.DARK_GRAY;
+ };
EnumChatFormatting color1 = this instanceof GT_DepletetCell_Item ? color2 = EnumChatFormatting.DARK_GRAY
: EnumChatFormatting.WHITE;
aList.add(
diff --git a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
index 41581b94f8..8d8db6a52a 100644
--- a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
+++ b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java
@@ -50,9 +50,6 @@ public class GT_SolderingTool_Item extends GT_Tool_Item {
public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
int aSide, float hitX, float hitY, float hitZ) {
super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
- if (aWorld.isRemote) {
- return false;
- }
return false;
}
}
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java
index aa64476105..fcd291fa01 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java
@@ -96,31 +96,24 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item {
} else if (tRotationPitch <= -65) {
tSide = 0;
} else {
- switch (MathHelper.floor_double((aPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) {
- case 0:
- tSide = 2;
- break;
- case 1:
- tSide = 5;
- break;
- case 2:
- tSide = 3;
- break;
- case 3:
- tSide = 4;
- break;
- }
+ tSide = switch (MathHelper.floor_double((aPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) {
+ case 0 -> 2;
+ case 1 -> 5;
+ case 2 -> 3;
+ case 3 -> 4;
+ default -> tSide;
+ };
}
switch (0) {
- case 0:
+ case 0 -> {
if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ)
&& GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ);
aWorld.setBlock(aX, aY, aZ, GT_Utility.getBlockFromStack(tStack), tStack.getItemDamage(), 3);
return true;
}
- break;
- case 1:
+ }
+ case 1 -> {
for (byte i = 0; i < 4; i++) {
if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ)
&& GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
@@ -148,15 +141,14 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item {
aZ -= ForgeDirection.getOrientation(tSide).offsetZ;
}
return true;
- case 2:
+ }
+ case 2 -> {
boolean temp = false, tXFactor = (ForgeDirection.getOrientation(tSide).offsetX == 0),
tYFactor = (ForgeDirection.getOrientation(tSide).offsetY == 0),
tZFactor = (ForgeDirection.getOrientation(tSide).offsetZ == 0);
-
aX -= (tXFactor ? 1 : 0);
aY -= (tYFactor ? 1 : 0);
aZ -= (tZFactor ? 1 : 0);
-
for (byte i = 0; i < 3; i++) for (byte j = 0; j < 3; j++) {
if (GT_Utility.isBlockAir(
aWorld,
@@ -186,6 +178,7 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item {
}
}
return temp;
+ }
}
}
return false;
diff --git a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
index 7d863c3e89..e4e03083f5 100644
--- a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
+++ b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java
@@ -56,7 +56,6 @@ public class GT_Spray_Pepper_Item extends GT_Tool_Item {
return false;
}
Block aBlock = aWorld.getBlock(aX, aY, aZ);
- if (aBlock == null) return false;
// byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ);
// TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);