diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-07-18 10:38:32 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-07-18 10:38:32 +1000 |
| commit | d27fbf6e99361cd5332fd80f9cbee5993efc7411 (patch) | |
| tree | 6011630d37ca1b6e15f0c69264569abe3b198a38 /src/Java/gtPlusPlus/xmod | |
| parent | 8c102df59748f60f1f5b64b9393e62b7e103b489 (diff) | |
| download | GT5-Unofficial-d27fbf6e99361cd5332fd80f9cbee5993efc7411.tar.gz GT5-Unofficial-d27fbf6e99361cd5332fd80f9cbee5993efc7411.tar.bz2 GT5-Unofficial-d27fbf6e99361cd5332fd80f9cbee5993efc7411.zip | |
$ Fixes #100.
$ Fixes CI not handling OrePrefix names correctly. (Actually forgot to return the item at all)
- Removes logging regarding generated pipes.
% Changed recipe load position for Simple Washer.
% Changed the cost of Multiblock controllers.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java | 10 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java | 13 |
2 files changed, 6 insertions, 17 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 06df76ca45..74019f9a68 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -262,11 +262,11 @@ public class GregtechConduits { } //Check all pipes are not null - Utils.LOG_INFO("Generated pipeTiny from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false)); - Utils.LOG_INFO("Generated pipeSmall from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false)); - Utils.LOG_INFO("Generated pipeNormal from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false)); - Utils.LOG_INFO("Generated pipeLarge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false)); - Utils.LOG_INFO("Generated pipeHuge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false)); + Utils.LOG_WARNING("Generated pipeTiny from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false)); + Utils.LOG_WARNING("Generated pipeSmall from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false)); + Utils.LOG_WARNING("Generated pipeNormal from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false)); + Utils.LOG_WARNING("Generated pipeLarge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false)); + Utils.LOG_WARNING("Generated pipeHuge from "+ materialName +"? "+ ((ItemUtils.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false)); int eut = 120; int time = 0; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index 094c4464ca..34a54c16de 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java @@ -17,7 +17,6 @@ public class GregtechSimpleWasher { public static void run(){ - //Generate Recipe Map for the Dust Washer. ItemStack dustClean; ItemStack dustDirty; @@ -38,18 +37,8 @@ public class GregtechSimpleWasher { } } - //Register the Simple Washer Entity. - GregtechItemList.SimpleDustWasher.set(new GregtechMetaTileEntity_BasicWasher(767, "simplewasher.01.tier.00", "Simple Washer", 0).getStackForm(1L)); - - ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1); - - //Add Recipe - RecipeUtils.addShapedGregtechRecipe( - plateWrought, CI.electricPump_LV, plateWrought, - plateWrought, ItemUtils.getItemStackOfAmountFromOreDict("pipeLargeClay", 1), plateWrought, - plateWrought, CI.machineCasing_ULV, plateWrought, - GregtechItemList.SimpleDustWasher.get(1)); + GregtechItemList.SimpleDustWasher.set(new GregtechMetaTileEntity_BasicWasher(767, "simplewasher.01.tier.00", "Simple Washer", 0).getStackForm(1L)); } } |