From fa48c685d717e386e1d656dd4962efeb9d1a3ed2 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sat, 12 Jan 2019 13:43:22 +0000 Subject: $ Fixed Issue causing infinite loops upon screwdriving a controller. --- src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java | 4 +++- .../machines/multi/misc/GregtechMTE_TeslaTower.java | 1 - .../GregtechMetaTileEntity_IndustrialArcFurnace.java | 3 +-- .../GregtechMetaTileEntity_IndustrialCentrifuge.java | 3 +-- .../GregtechMetaTileEntity_IndustrialMultiMachine.java | 1 - .../GregtechMetaTileEntity_IndustrialPlatePress.java | 1 - .../GregtechMetaTileEntity_IndustrialWashPlant.java | 1 - .../production/GregtechMetaTileEntity_MassFabricator.java | 12 ++++++------ .../multi/production/GregtechMetaTileEntity_SolarTower.java | 1 - .../production/turbines/GT_MTE_LargeTurbine_SHSteam.java | 2 +- .../multi/production/turbines/GT_MTE_LargeTurbine_Steam.java | 2 +- .../turbines/GregtechMetaTileEntity_LargerTurbineBase.java | 2 +- .../GregtechMetaTileEntity_PowerSubStationController.java | 1 - 13 files changed, 14 insertions(+), 20 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java index d00f35f41f..dd07e2cf8d 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -814,9 +814,10 @@ public class ItemUtils { if (mLocaleCache.get(mCacheKey).toLowerCase().contains(".name")) { mLocaleCache.remove(mCacheKey); String mNew = ItemUtils.simpleMetaStack(block, meta, 1).getDisplayName(); - // Logger.INFO("Re-caching "+mNew+" into locale cache."); + Logger.INFO("Re-caching "+mNew+" into locale cache."); mLocaleCache.put(mCacheKey, mNew); } + Logger.INFO("Returning Cached Value."); return mLocaleCache.get(mCacheKey); } else { Item item = Item.getItemFromBlock(block); @@ -829,6 +830,7 @@ public class ItemUtils { blockName = ItemUtils.simpleMetaStack(block, meta, 1).getDisplayName(); } mLocaleCache.put(mCacheKey, blockName); + Logger.INFO("Cached New Value."); return blockName; } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java index adaf0fa730..3fd9f74f6f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java @@ -453,7 +453,6 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase { else { PlayerUtils.messagePlayer(aPlayer, "[Tesla Tower] Targetting all types of entities."); } - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java index 5ad7e1af30..4da4729c74 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java @@ -355,8 +355,7 @@ extends GregtechMeta_MultiBlockBase { else { PlayerUtils.messagePlayer(aPlayer, "["+EnumChatFormatting.RED+"MODE"+EnumChatFormatting.RESET+"] "+EnumChatFormatting.YELLOW+"Electric"+EnumChatFormatting.RESET); } - } - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + } } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java index 13d94f3355..a1aed0dc9a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java @@ -211,8 +211,7 @@ extends GregtechMeta_MultiBlockBase { } else { PlayerUtils.messagePlayer(aPlayer, "Using Static Turbine Texture."); - } - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + } } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 827536694a..66037f9bbc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -868,7 +868,6 @@ extends GregtechMeta_MultiBlockBase { } String mModeString = (mInternalMode == 0 ? "Metal" : mInternalMode == 1 ? "Fluid" : mInternalMode == 2 ? "Misc." : "null"); PlayerUtils.messagePlayer(aPlayer, "Multi-Machine is now in "+mModeString+" mode."); - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java index 9c1b53f29c..a30d0d5030 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java @@ -200,6 +200,5 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends GregtechMeta_Mu else { PlayerUtils.messagePlayer(aPlayer, "Now running in Bending Mode."); } - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java index 4f872ab69a..3b6550993b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java @@ -373,7 +373,6 @@ extends GregtechMeta_MultiBlockBase { else { PlayerUtils.messagePlayer(aPlayer, "Wash Plant is now running in Ore Washer Mode."); } - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java index d34355902a..00ea1bfb60 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java @@ -89,15 +89,15 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo @Override public String[] getTooltip() { - if (mCasingName1.toLowerCase().contains(".name")) { + //if (mCasingName1.toLowerCase().contains(".name")) { mCasingName1 = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasingsMisc, 9); - } - if (mCasingName2.toLowerCase().contains(".name")) { + //} + //if (mCasingName2.toLowerCase().contains(".name")) { mCasingName2 = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings3Misc, 15); - } - if (mCasingName3.toLowerCase().contains(".name")) { + //} + //if (mCasingName3.toLowerCase().contains(".name")) { mCasingName3 = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasingsMisc, 8); - } + //} return new String[]{ "Controller Block for the Matter Fabricator", diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java index 5d443d0a5f..3e75a40bf0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java @@ -254,7 +254,6 @@ extends GregtechMeta_MultiBlockBase { @Override public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); if (this.mHeight > 3) {} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java index e2d4ab3a0d..2de54c5008 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java @@ -133,7 +133,7 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu looseFit^=true; GT_Utility.sendChatToPlayer(aPlayer, looseFit ? "Fitting: Loose - More Flow" : "Fitting: Tight - More Efficiency"); } - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + super.onModeChangeByScrewdriver(aSide, aPlayer, aX, aY, aZ); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java index 76a814ef88..808476bb74 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java @@ -141,7 +141,7 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb looseFit^=true; GT_Utility.sendChatToPlayer(aPlayer, looseFit ? "Fitting: Loose - More Flow" : "Fitting: Tight - More Efficiency"); } - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + super.onModeChangeByScrewdriver(aSide, aPlayer, aX, aY, aZ); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java index 2b2a70e926..f3b729c441 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java @@ -483,7 +483,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends GregtechM @Override public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (!KeyboardUtils.isShiftKeyDown()) { - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + //super.onModeChangeByScrewdriver(aSide, aPlayer, aX, aY, aZ); } else { this.mIsAnimated = Utils.invertBoolean(mIsAnimated); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 5addd5c5b6..580bd130cf 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -583,7 +583,6 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe else { PlayerUtils.messagePlayer(aPlayer, "Sub-Station is now inputting power into the controller."); } - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); } } \ No newline at end of file -- cgit