aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/handler
diff options
context:
space:
mode:
authorAlexdoru <57050655+Alexdoru@users.noreply.github.com>2024-10-02 07:31:08 +0200
committerGitHub <noreply@github.com>2024-10-02 05:31:08 +0000
commit3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 (patch)
tree107d9d2442891990ef1cdef1d8bb2df6bb96952a /src/main/java/gtPlusPlus/core/handler
parentbfc7b2b07f72d0903a70791ff96f9c837ddd5ff0 (diff)
downloadGT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.tar.gz
GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.tar.bz2
GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.zip
Cleanup the codebase (#3311)
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/handler')
-rw-r--r--src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java6
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java6
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/SneakManager.java6
-rw-r--r--src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java32
4 files changed, 20 insertions, 30 deletions
diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
index 36e3b6edd8..7004b3517c 100644
--- a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
+++ b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java
@@ -25,10 +25,8 @@ public class DecayableRecipe {
@Override
public boolean equals(Object o) {
if (o instanceof DecayableRecipe i) {
- if (i.mTime == this.mTime && GTUtility.areStacksEqual(mInput, i.mInput)
- && GTUtility.areStacksEqual(mOutput, i.mOutput)) {
- return true;
- }
+ return i.mTime == this.mTime && GTUtility.areStacksEqual(mInput, i.mInput)
+ && GTUtility.areStacksEqual(mOutput, i.mOutput);
}
return false;
}
diff --git a/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
index 51780fd030..e6133e22db 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java
@@ -35,7 +35,7 @@ public class EnderDragonDeathHandler implements IMobExtraInfoProvider {
event.entityLiving.entityDropItem(
MaterialsElements.STANDALONE.DRAGON_METAL.getNugget(aAmount),
MathUtils.randFloat(0, 1));
- aCountTotal = +aAmount;
+ aCountTotal = aAmount;
}
} else if (mChaoseDragonClass != null && mChaoseDragonClass.isInstance(event.entityLiving)) {
for (int y = 0; y < MathUtils.randInt(100, 200); y++) {
@@ -43,7 +43,7 @@ public class EnderDragonDeathHandler implements IMobExtraInfoProvider {
event.entityLiving.entityDropItem(
MaterialsElements.STANDALONE.DRAGON_METAL.getIngot(aAmount),
MathUtils.randFloat(0, 1));
- aCountTotal = +aAmount;
+ aCountTotal = aAmount;
}
} else if (event.entityLiving instanceof EntityDragon) {
for (int y = 0; y < MathUtils.randInt(25, 50); y++) {
@@ -51,7 +51,7 @@ public class EnderDragonDeathHandler implements IMobExtraInfoProvider {
event.entityLiving.entityDropItem(
MaterialsElements.STANDALONE.DRAGON_METAL.getNugget(aAmount),
MathUtils.randFloat(0, 1));
- aCountTotal = +aAmount;
+ aCountTotal = aAmount;
}
}
if (aCountTotal > 0) {
diff --git a/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java b/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java
index 7af831c675..258bca3bff 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java
@@ -29,7 +29,7 @@ public class SneakManager {
}
private static String getKey(EntityPlayer aPlayer) {
- return "" + aPlayer.getGameProfile()
+ return aPlayer.getGameProfile()
.getId()
.toString();
}
@@ -113,14 +113,14 @@ public class SneakManager {
return mIsWearingRing;
}
- public static enum State {
+ public enum State {
ON(true),
OFF(false);
private final boolean STATE;
- private State(final boolean State) {
+ State(final boolean State) {
this.STATE = State;
}
diff --git a/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java b/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java
index 1d8b2ed68d..4f0023ccb3 100644
--- a/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java
@@ -20,45 +20,39 @@ public class WorkbenchCraftingHandler {
private static final WorkbenchCraftingHandler instance = new WorkbenchCraftingHandler();
private final List<IRecipe> recipes = new ArrayList<>();
- public static final WorkbenchCraftingHandler getInstance() {
+ public static WorkbenchCraftingHandler getInstance() {
return instance;
}
public WorkbenchCraftingHandler() {
// just a example recipe so you know how to add them
- this.addRecipe(
- new ItemStack(Blocks.iron_block),
- new Object[] { "###", "###", "###", Character.valueOf('#'), Items.iron_ingot });
+ this.addRecipe(new ItemStack(Blocks.iron_block), new Object[] { "###", "###", "###", '#', Items.iron_ingot });
// another example Recipe, but shapeless
this.addShapelessRecipe(new ItemStack(Items.cake), new Object[] { Items.stick });
}
- void addRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[]) {
- String s = "";
+ void addRecipe(final ItemStack par1ItemStack, final Object[] par2ArrayOfObj) {
+ StringBuilder s = new StringBuilder();
int i = 0;
int j = 0;
int k = 0;
if (par2ArrayOfObj[i] instanceof String[]) {
- final String as[] = (String[]) par2ArrayOfObj[i++];
+ final String[] as = (String[]) par2ArrayOfObj[i++];
for (final String s2 : as) {
k++;
j = s2.length();
- s = (new StringBuilder()).append(s)
- .append(s2)
- .toString();
+ s.append(s2);
}
} else {
while (par2ArrayOfObj[i] instanceof String) {
final String s1 = (String) par2ArrayOfObj[i++];
k++;
j = s1.length();
- s = (new StringBuilder()).append(s)
- .append(s1)
- .toString();
+ s.append(s1);
}
}
@@ -79,13 +73,13 @@ public class WorkbenchCraftingHandler {
hashmap.put(character, itemstack);
}
- final ItemStack aitemstack[] = new ItemStack[j * k];
+ final ItemStack[] aitemstack = new ItemStack[j * k];
for (int i1 = 0; i1 < (j * k); i1++) {
final char c = s.charAt(i1);
- if (hashmap.containsKey(Character.valueOf(c))) {
- aitemstack[i1] = hashmap.get(Character.valueOf(c))
+ if (hashmap.containsKey(c)) {
+ aitemstack[i1] = hashmap.get(c)
.copy();
} else {
aitemstack[i1] = null;
@@ -95,12 +89,10 @@ public class WorkbenchCraftingHandler {
this.recipes.add(new ShapedRecipes(j, k, aitemstack, par1ItemStack));
}
- public void addShapelessRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[]) {
+ public void addShapelessRecipe(final ItemStack par1ItemStack, final Object[] par2ArrayOfObj) {
final ArrayList<ItemStack> arraylist = new ArrayList<>();
- final Object aobj[] = par2ArrayOfObj;
- final int i = aobj.length;
- for (final Object obj : aobj) {
+ for (final Object obj : par2ArrayOfObj) {
if (obj instanceof ItemStack) {
arraylist.add(((ItemStack) obj).copy());
continue;