aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-05-12 19:37:04 +0200
committerDream-Master <dream-master@gmx.net>2017-05-12 19:37:04 +0200
commite75f17ce3a2e1dac3c98f3f8d8eed100f980fce4 (patch)
treeaa3375d9ec751362cdb2c9f3ca13e31f81eb38c6 /src
parent854ebd355c64be97acb1c2bee5d004598ba3cefb (diff)
downloadGT5-Unofficial-e75f17ce3a2e1dac3c98f3f8d8eed100f980fce4.tar.gz
GT5-Unofficial-e75f17ce3a2e1dac3c98f3f8d8eed100f980fce4.tar.bz2
GT5-Unofficial-e75f17ce3a2e1dac3c98f3f8d8eed100f980fce4.zip
rounds and small spring recipe changed a bit.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java3
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
index aa3fca8d36..23a3cc7db5 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java
@@ -22,7 +22,8 @@ public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegist
if (!aMaterial.contains(SubTag.NO_WORKING)) {
GT_Values.RA.addLatheRecipe(GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L), GT_Utility.copyAmount(1L, new Object[]{aStack}), null, (int) Math.max(aMaterial.getMass() / 4L, 1L), 8);
if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial))
- GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), GT_Proxy.tBits, new Object[]{"fX", "X ", Character.valueOf('X'), OrePrefixes.nugget.get(aMaterial)});
+ GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), GT_Proxy.tBits, new Object[]{"fX", "Xh ", Character.valueOf('X'), OrePrefixes.nugget.get(aMaterial)});
+ GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 4L), GT_Proxy.tBits, new Object[]{"fXh", Character.valueOf('X'), OrePrefixes.ingot.get(aMaterial)});
}
if (GT_Mod.gregtechproxy.mAE2Integration) {
Api.INSTANCE.registries().matterCannon().registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass());
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
index e02359541d..ac17b4a168 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java
@@ -13,6 +13,7 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist
}
public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
+ GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L), new Object[]{" s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial)});
if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_WORKING)) {
GT_Values.RA.addLatheRecipe(aMaterial.contains(SubTag.CRYSTAL) ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L), (int) Math.max(aMaterial.getMass() * 5L, 1L), 16);
GT_Values.RA.addCutterRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 4L), null, (int) Math.max(aMaterial.getMass() * 2L, 1L), 4);