diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/api/objects/minecraft')
6 files changed, 15 insertions, 23 deletions
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java index 13f12503f0..2c93631b4d 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java @@ -15,7 +15,7 @@ public class BTF_FluidTank extends FluidTank { /** * Let's replace the Default handling with GT's own handling code, because it's probably better, right? - * + * * @author Alkalus/GregoriusT */ @Override @@ -132,13 +132,10 @@ public class BTF_FluidTank extends FluidTank { public FluidStack drain(int maxDrain, boolean doDrain) { if (this.getDrainableStack() != null && this.canTankBeEmptied()) { if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) { - this.setDrainableStack((FluidStack) null); + this.setDrainableStack(null); return null; } else { - int used = maxDrain; - if (this.getDrainableStack().amount < maxDrain) { - used = this.getDrainableStack().amount; - } + int used = Math.min(this.getDrainableStack().amount, maxDrain); if (doDrain) { FluidStack arg9999 = this.getDrainableStack(); @@ -149,7 +146,7 @@ public class BTF_FluidTank extends FluidTank { .copy(); drained.amount = used; if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) { - this.setDrainableStack((FluidStack) null); + this.setDrainableStack(null); } return drained; 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 cdbf2c43e2..97ebaeb9ba 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java @@ -75,12 +75,12 @@ public class BTF_Inventory implements ISidedInventory { if (this.setStackToZeroInsteadOfNull(aIndex)) { tStack.stackSize = 0; } else { - this.setInventorySlotContents(aIndex, (ItemStack) null); + this.setInventorySlotContents(aIndex, null); } } else { rStack = tStack.splitStack(aAmount); if (tStack.stackSize == 0 && !this.setStackToZeroInsteadOfNull(aIndex)) { - this.setInventorySlotContents(aIndex, (ItemStack) null); + this.setInventorySlotContents(aIndex, null); } } } @@ -143,7 +143,7 @@ public class BTF_Inventory implements ISidedInventory { @Override public final boolean hasCustomInventoryName() { - return mTile != null ? mTile.hasCustomInventoryName() : false; + return mTile != null && mTile.hasCustomInventoryName(); } @Override @@ -183,11 +183,7 @@ public class BTF_Inventory implements ISidedInventory { public boolean isEmpty() { for (int s = 0; s < this.getSizeInventory(); s++) { ItemStack slot = mInventory[s]; - if (slot == null) { - continue; - } else { - return false; - } + if (slot != null) return false; } return true; } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java index 047b5dbeaf..8145a2d3e9 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java @@ -65,8 +65,7 @@ public class BlockPos implements Serializable { } public String getUniqueIdentifier() { - String S = "" + this.dim + "@" + this.xPos + "@" + this.yPos + "@" + this.zPos; - return S; + return this.dim + "@" + this.xPos + "@" + this.yPos + "@" + this.zPos; } @Override diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java index a858f5a295..a65edc052b 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java @@ -53,5 +53,5 @@ public abstract class ItemPackage implements RunnableWithInfo<String> { */ public boolean onLoadComplete(FMLLoadCompleteEvent event) { return false; - }; + } } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java index f5e483b91c..b3824c77da 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java @@ -19,7 +19,7 @@ public class ItemStackData { mDamage = aStack.getItemDamage(); mStackSize = aStack.stackSize; mNBT = (aStack.getTagCompound() != null ? aStack.getTagCompound() : new NBTTagCompound()); - mUniqueDataTag = "" + Item.getIdFromItem(mItem) + "" + mDamage + "" + mStackSize + "" + mNBT.getId(); + mUniqueDataTag = String.valueOf(Item.getIdFromItem(mItem)) + mDamage + mStackSize + mNBT.getId(); } public String getUniqueDataIdentifier() { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java index 867f247b6e..4f61996e08 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java @@ -101,7 +101,7 @@ public class ShapedRecipe implements IRecipeMutableAccess { aCharSlot++; aLoggingInfo[aInfoSlot++] = mInfo; } else { - aRecipePairs.add(new Pair<>(' ', (ItemStack) null)); + aRecipePairs.add(new Pair<>(' ', null)); Logger.RECIPE("Storing ' ' with an object of type null"); aChar[aMemSlot++] = ' '; aLoggingInfo[aInfoSlot++] = "Empty"; @@ -115,8 +115,8 @@ public class ShapedRecipe implements IRecipeMutableAccess { for (Pair<Character, Object> h : aRecipePairs) { if (h.getKey() != null) { - aGridWhole.append(String.valueOf(h.getKey())); - Logger.RECIPE("Adding '" + String.valueOf(h.getKey()) + "' to aGridWhole."); + aGridWhole.append(h.getKey()); + Logger.RECIPE("Adding '" + h.getKey() + "' to aGridWhole."); } } @@ -194,7 +194,7 @@ public class ShapedRecipe implements IRecipeMutableAccess { o = ((ItemStack) o).copy(); } - mVarags2[counter2] = (char) c; + mVarags2[counter2] = c; mVarags2[counter2 + 1] = o; counter2 += 2; } |