From 57930991ecb6a6e3d6bfa73cb0734cd360ad587c Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 20 Oct 2016 23:14:07 -0700 Subject: [PATCH] Remove unnecessary boxing/unboxing --- src/main/java/binnie/core/genetics/ManagerGenetics.java | 4 ++-- .../java/binnie/core/machines/storage/WindowCompartment.java | 4 ++-- src/main/java/binnie/craftgui/controls/ControlCheckbox.java | 2 +- .../java/binnie/extratrees/block/decor/NBTShapedRecipe.java | 2 +- .../binnie/genetics/genetics/GeneticEngineeringSystem.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 0a04f085..f8cd08a9 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -197,10 +197,10 @@ public class ManagerGenetics extends ManagerBase { throw new NullPointerException("Allele is null!"); } if (o1 instanceof IAlleleFloat && o2 instanceof IAlleleFloat) { - return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(Float.valueOf(((IAlleleFloat) o2).getValue())); + return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(((IAlleleFloat) o2).getValue()); } if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger && !(o1 instanceof AlleleColor)) { - return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(Integer.valueOf(((IAlleleInteger) o2).getValue())); + return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue()); } if (o1.getName() != null && o2.getName() != null) { return o1.getName().compareTo(o2.getName()); diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 2abaea77..4fbb2e87 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -121,7 +121,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh @Override public void onEvent(final EventValueChanged event) { final NBTTagCompound nbt = new NBTTagCompound(); - final int i = ((Integer) event.getValue()).intValue(); + final int i = (Integer) event.getValue(); nbt.setByte("i", (byte) i); Window.get(tab).sendClientAction("tab-change", nbt); WindowCompartment.this.currentTab = i; @@ -131,7 +131,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh final ControlPages compartmentPages = new ControlPages<>(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight); final ControlPage[] page = new ControlPage[inv.getTabNumber()]; for (int p = 0; p < inv.getTabNumber(); ++p) { - page[p] = new ControlPage(compartmentPages, Integer.valueOf(p)); + page[p] = new ControlPage(compartmentPages, p); } CraftGUIUtil.linkWidgets(tab, compartmentPages); int i = 0; diff --git a/src/main/java/binnie/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/craftgui/controls/ControlCheckbox.java index 0d415d81..cb1c81f4 100644 --- a/src/main/java/binnie/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/craftgui/controls/ControlCheckbox.java @@ -53,7 +53,7 @@ public class ControlCheckbox extends Control implements IControlValue { } public void toggleValue() { - this.setValue(Boolean.valueOf(!this.getValue())); + this.setValue(!this.getValue()); } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java index 107857f5..04376c8c 100644 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java +++ b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java @@ -134,7 +134,7 @@ public class NBTShapedRecipe implements IRecipe { for (int i2 = 0; i2 < j * k; ++i2) { final char c0 = s.charAt(i2); if (hashmap.containsKey(c0)) { - aitemstack[i2] = ((ItemStack) hashmap.get(Character.valueOf(c0))).copy(); + aitemstack[i2] = ((ItemStack) hashmap.get(c0)).copy(); } else { aitemstack[i2] = null; } diff --git a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java index 9fc7fe0c..3a785ab7 100644 --- a/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java +++ b/src/main/java/binnie/genetics/genetics/GeneticEngineeringSystem.java @@ -53,10 +53,10 @@ public class GeneticEngineeringSystem { @Override public int compare(final IAllele o1, final IAllele o2) { if (o1 instanceof IAlleleFloat && o2 instanceof IAlleleFloat) { - return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(Float.valueOf(((IAlleleFloat) o2).getValue())); + return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(((IAlleleFloat) o2).getValue()); } if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger) { - return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(Integer.valueOf(((IAlleleInteger) o2).getValue())); + return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue()); } return o1.getUID().compareTo(o2.getUID()); }