From a12b62a2ef1e68b7e813746353e2de9fd317f7c4 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Wed, 29 Aug 2018 14:30:25 +1000 Subject: + Added Overflow Valve Covers. + Added new overlays for Multiblock controllers in GT++. ^ Version Bump to v1.7.02.09. ^ Bumped Recommended version. % Enabled values() for ObjMaps. % Changed .gitignore to no longer ignore the assets directory. % Removed a compilation warning in FishTrapHandler.java. --- src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java | 1 - src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java | 1 - src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java | 1 - src/Java/gtPlusPlus/core/lib/CORE.java | 2 +- src/Java/gtPlusPlus/core/material/MaterialStack.java | 1 - .../core/tileentities/machines/TileEntityModularityTable.java | 1 - .../gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java | 1 - src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java | 1 - .../core/tileentities/machines/TileEntityWorkbenchAdvanced.java | 1 - src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 1 - 10 files changed, 1 insertion(+), 10 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java b/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java index 95f658407e..9feea3c91a 100644 --- a/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java +++ b/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java @@ -150,7 +150,6 @@ public class NuclearFuelRodBase extends Item return p_77659_1_; } - @SuppressWarnings("static-method") private ItemStack func_150910_a(final ItemStack p_150910_1_, final EntityPlayer p_150910_2_, final Item p_150910_3_) { if (p_150910_2_.capabilities.isCreativeMode) diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index b546b492e5..2c2441064b 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -154,7 +154,6 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ } - @SuppressWarnings("static-method") private float calculateDurabilityLoss(final World world, final int X, final int Y, final int Z){ float bDurabilityLoss = 0; Boolean correctTool = false; diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java index 3b5c022412..830c4994ba 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java @@ -171,7 +171,6 @@ public class StaballoyPickaxe extends ItemPickaxe{ return super.onBlockDestroyed(stack, world, block, X, Y, Z, entity); } - @SuppressWarnings("static-method") private float calculateDurabilityLoss(final World world, final int X, final int Y, final int Z){ float bDurabilityLoss = 0; Boolean correctTool = false; diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 50f2da1c64..f41d2019b6 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -51,7 +51,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.7.02.05-PostJapanFixes"; + public static final String VERSION = "1.7.02.09"; public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static String USER_COUNTRY = GeoUtils.determineUsersCountry(); public static boolean isModUpToDate = Utils.isModUpToDate(); diff --git a/src/Java/gtPlusPlus/core/material/MaterialStack.java b/src/Java/gtPlusPlus/core/material/MaterialStack.java index 3c687749d4..63a9ccce9c 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialStack.java +++ b/src/Java/gtPlusPlus/core/material/MaterialStack.java @@ -22,7 +22,6 @@ public class MaterialStack { this.vAmount = this.math(partOutOf100); } - @SuppressWarnings("static-method") private int[] math(final double val){ double i; //Cast to a BigDecimal to round it. diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java index 1d6170f492..a97447420a 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java +++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java @@ -55,7 +55,6 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI } @Override - @SuppressWarnings("static-method") public NBTTagCompound getTag(final NBTTagCompound nbt, final String tag) { if (!nbt.hasKey(tag)) { nbt.setTag(tag, new NBTTagCompound()); diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java index 503c955b84..8c87baf6a9 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java +++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java @@ -51,7 +51,6 @@ public class TileEntityProjectTable extends TileEntity implements INetworkDataPr this.container = container; } - @SuppressWarnings("static-method") public NBTTagCompound getTag(final NBTTagCompound nbt, final String tag){ if(!nbt.hasKey(tag)) { diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java index 776a0b2b25..a2db2326a9 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java +++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java @@ -38,7 +38,6 @@ public class TileEntityWorkbench extends TileEntity implements INetworkDataProvi this.canUpdate(); } - @SuppressWarnings("static-method") public NBTTagCompound getTag(final NBTTagCompound nbt, final String tag) { if(!nbt.hasKey(tag)) diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java index 34d4b99201..264323388f 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java +++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java @@ -58,7 +58,6 @@ public class TileEntityWorkbenchAdvanced extends TileEntity implements IEnergySi } - @SuppressWarnings("static-method") public NBTTagCompound getTag(final NBTTagCompound nbt, final String tag) { if(!nbt.hasKey(tag)) diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java index a40b025dfc..d1e65afe3e 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java +++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java @@ -40,7 +40,6 @@ public class DEBUG_ITEM_ShapeSpawner extends BaseItemGeneric{ - @SuppressWarnings("static-method") @SubscribeEvent public void playerInteractEventHandler(final PlayerInteractEvent event) { -- cgit