diff options
| -rw-r--r-- | dependencies.gradle | 20 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java | 22 |
2 files changed, 32 insertions, 10 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index cc39786639..a7df60956d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,32 +1,32 @@ dependencies { - compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.195:dev') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.204:dev') compile("com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev") - compile("com.github.GTNewHorizons:ModularUI:1.0.31:dev") {transitive=false} - compile("com.github.GTNewHorizons:NotEnoughItems:2.3.17-GTNH:dev") - compile('com.github.GTNewHorizons:CodeChickenCore:1.1.6:dev') - compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.5:dev') + compile("com.github.GTNewHorizons:ModularUI:1.0.38:dev") {transitive=false} + compile("com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev") + compile('com.github.GTNewHorizons:CodeChickenCore:1.1.7:dev') + compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.6:dev') compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') - compile('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.116:dev') + compile('com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.125:dev') compile('curse.maven:cofh-core-69162:2388751') compile('curse.maven:advsolar-362768:2885953') - compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-130-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-134-GTNH:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:ForestryMC:4.5.6:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:Railcraft:9.13.14:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.49:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:EnderCore:0.2.11:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:SC2:2.0.1:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:Binnie:2.0.42:dev') {transitive = false} - compile("com.github.GTNewHorizons:bartworks:0.5.123:dev") {transitive = false} + compileOnly('com.github.GTNewHorizons:Binnie:2.0.46:dev') {transitive = false} + compile("com.github.GTNewHorizons:bartworks:0.5.134-pre:dev") {transitive = false} compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false} compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.28:dev') {transitive=false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:Chisel:2.10.15-GTNH:dev') {transitive=false} compileOnly("com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev") {transitive = false} - compile("com.github.GTNewHorizons:TecTech:5.0.61:dev") + compile("com.github.GTNewHorizons:TecTech:5.0.69:dev") runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.5.6:dev') } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java index 52053ca90e..15e77ac0f5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java @@ -9,6 +9,7 @@ import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import java.util.HashSet; import java.util.Set; @@ -45,6 +46,7 @@ public class RecipeGen_Plates extends RecipeGen_Base { final ItemStack plate_SingleNine = material.getPlate(9); final ItemStack plate_Double = material.getPlateDouble(1); final ItemStack plate_Dense = material.getPlateDense(1); + final ItemStack foil_SingleFour = material.getFoil(4); final ItemStack block = material.getBlock(1); Logger.WARNING("Generating Plate recipes for " + material.getLocalizedName()); @@ -71,6 +73,17 @@ public class RecipeGen_Plates extends RecipeGen_Base { } else { Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); } + if (ItemUtils.checkForInvalidItems(ingotStackOne) && ItemUtils.checkForInvalidItems(foil_SingleFour)) + if (addBenderRecipe( + ingotStackOne, + CI.getNumberedCircuit(10), + foil_SingleFour, + (int) Math.max(material.getMass() * 2L, 1L), + material.vVoltageMultiplier)) { + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); + } // Alloy Smelter if (ItemUtils.checkForInvalidItems(ingotStackTwo) && ItemUtils.checkForInvalidItems(plate_Single)) if (GT_Values.RA.addAlloySmelterRecipe( @@ -164,6 +177,15 @@ public class RecipeGen_Plates extends RecipeGen_Base { return GT_Values.RA.addBenderRecipe(aInput1, aOutput1, aDuration, aEUt); } + public static boolean addBenderRecipe( + final ItemStack aInput1, + final ItemStack aCircuit, + final ItemStack aOutput1, + int aDuration, + final int aEUt) { + return GT_Values.RA.addBenderRecipe(aInput1, aCircuit, aOutput1, aDuration, aEUt); + } + public static boolean addExtruderRecipe( final ItemStack aInput, final ItemStack aShape, final ItemStack aOutput, int aDuration, final int aEUt) { if ((aInput == null) || (aShape == null) || (aOutput == null)) { |