diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2017-01-17 17:20:23 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-01-17 17:20:23 +1000 |
| commit | 289e41515842ec89d01bfa593504163f75d0950c (patch) | |
| tree | 3601b0b44d202e2a6960a5ff011bc747c4281c39 /src/Java/gtPlusPlus/core/item/tool | |
| parent | dd97ed90a0eb4ab47ef445c259e63f70d5c008d6 (diff) | |
| download | GT5-Unofficial-289e41515842ec89d01bfa593504163f75d0950c.tar.gz GT5-Unofficial-289e41515842ec89d01bfa593504163f75d0950c.tar.bz2 GT5-Unofficial-289e41515842ec89d01bfa593504163f75d0950c.zip | |
% Improved Multitool Generation.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/tool')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java | 15 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java | 7 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index 5c5ca9fa0b..e278c258ba 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -71,19 +71,25 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ */ private boolean addRecipe(){ - String plateDense = "plateDense"+materialName; - String plateDouble = "plateDouble"+materialName; - String rodLong = "stickLong"+materialName; + + String cleanName = Utils.sanitizeString(materialName); + + String plateDense = "plateDense"+cleanName; + String plateDouble = "plateDouble"+cleanName; + String rodLong = "stickLong"+cleanName; String toolHammer = "craftingToolHardHammer"; String toolWrench = "craftingToolWrench"; String toolFile = "craftingToolFile"; String toolScrewDriver = "craftingToolScrewdriver"; - + if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(rodLong, 1)){ + Utils.LOG_WARNING("stickLong of "+cleanName+" does not exist."); return false; } if (null == ItemUtils.getItemStackOfAmountFromOreDictNoBroken(plateDense, 1)){ + Utils.LOG_WARNING("plateDense of "+cleanName+" does not exist."); if (null != ItemUtils.getItemStackOfAmountFromOreDictNoBroken(plateDouble, 1)){ + Utils.LOG_WARNING("plateDouble of "+cleanName+" does exist. Using it instead."); RecipeUtils.recipeBuilder( plateDouble, plateDouble, plateDouble, toolFile, rodLong, toolHammer, @@ -92,6 +98,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ return true; } + Utils.LOG_WARNING("plateDouble of "+cleanName+" does not exist."); return false; } diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java index 08db58500a..bfe78b1866 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java @@ -58,9 +58,10 @@ public class MultiSpadeBase extends StaballoySpade{ } private boolean addRecipe(){ - String plateDense = "plateDense"+materialName; - String plateDouble = "plateDouble"+materialName; - String rodLong = "stickLong"+materialName; + String cleanName = Utils.sanitizeString(materialName); + String plateDense = "plateDense"+cleanName; + String plateDouble = "plateDouble"+cleanName; + String rodLong = "stickLong"+cleanName; String toolHammer = "craftingToolHardHammer"; String toolWrench = "craftingToolWrench"; String toolFile = "craftingToolFile"; |