aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-02-24 01:40:57 +0100
committerDream-Master <dream-master@gmx.net>2017-02-24 01:40:57 +0100
commitcb4cdf7a05f69a662477a2beb23a1db6c238a6d3 (patch)
tree7a7e796e5bcaf27aa864177f94d424cef45fca2b /src/main/java/gregtech/loaders
parent469cd2701202ae115be8d39d3f15c0bee13ac259 (diff)
downloadGT5-Unofficial-cb4cdf7a05f69a662477a2beb23a1db6c238a6d3.tar.gz
GT5-Unofficial-cb4cdf7a05f69a662477a2beb23a1db6c238a6d3.tar.bz2
GT5-Unofficial-cb4cdf7a05f69a662477a2beb23a1db6c238a6d3.zip
missing files
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java2
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java2
5 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
index 0f9675f87c..4b33f7ad9f 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeLarge.java
@@ -16,7 +16,7 @@ public class ProcessingPipeLarge implements gregtech.api.interfaces.IOreRecipeRe
public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
if ((!aMaterial.contains(SubTag.NO_WORKING)) && ((aMaterial.contains(SubTag.WOOD)) || (!aMaterial.contains(SubTag.NO_SMASHING)))) {
if (!(aMaterial == Materials.Redstone || aMaterial == Materials.Glowstone)) {
- GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", "P P", "PWP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), 'H', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer : ToolDictNames.craftingToolHardHammer, 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw : ToolDictNames.craftingToolWrench});
+ GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", "P P", "PWP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), 'H', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer : ToolDictNames.craftingToolHardHammer, 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw : ToolDictNames.craftingToolWrench});
}
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
index f59dcd970b..81ceae8bcf 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeMedium.java
@@ -16,7 +16,7 @@ public class ProcessingPipeMedium implements gregtech.api.interfaces.IOreRecipeR
public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
if ((!aMaterial.contains(SubTag.NO_WORKING)) && ((aMaterial.contains(SubTag.WOOD)) || (!aMaterial.contains(SubTag.NO_SMASHING)))) {
if (!(aMaterial == Materials.Redstone || aMaterial == Materials.Glowstone)) {
- GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PPP", "W H", "PPP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), 'H', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer : ToolDictNames.craftingToolHardHammer, 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw : ToolDictNames.craftingToolWrench});
+ GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PPP", "W H", "PPP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), 'H', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer : ToolDictNames.craftingToolHardHammer, 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw : ToolDictNames.craftingToolWrench});
}
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
index 114e319320..232e10e2bf 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipeSmall.java
@@ -16,7 +16,7 @@ public class ProcessingPipeSmall implements gregtech.api.interfaces.IOreRecipeRe
public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
if ((!aMaterial.contains(SubTag.NO_WORKING)) && ((aMaterial.contains(SubTag.WOOD)) || (!aMaterial.contains(SubTag.NO_SMASHING)))) {
if (!(aMaterial == Materials.Redstone || aMaterial == Materials.Glowstone)) {
- GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(6L, new Object[]{aStack}), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PWP", "P P", "PHP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), 'H', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer : ToolDictNames.craftingToolHardHammer, 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw : ToolDictNames.craftingToolWrench});
+ GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(6L, new Object[]{aStack}), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PWP", "P P", "PHP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), 'H', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer : ToolDictNames.craftingToolHardHammer, 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw : ToolDictNames.craftingToolWrench});
}
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
index 726cc084ff..1d1fd06516 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
@@ -18,7 +18,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
if (((aMaterial == Materials.Glass) || (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null)) && (!aMaterial.contains(SubTag.NO_SMELTING))) {
int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L);
if ((tAmount > 0) && (tAmount <= 64) && (aPrefix.mMaterialAmount % 3628800L == 0L)) {
- int tVoltageMultiplier = ((aMaterial.mBlastFurnaceTemp<20000)?(aMaterial.mBlastFurnaceTemp >= 2800):(aMaterial.mBlastFurnaceTemp >=22800)) ? 64 : 16;
+ int tVoltageMultiplier = ((aMaterial.mBlastFurnaceTemp<20000)?(aMaterial.mBlastFurnaceTemp >= 2800):(aMaterial.mBlastFurnaceTemp >=22800)) ? 60 : 15;
if (aMaterial.contains(SubTag.NO_SMASHING)) {
tVoltageMultiplier /= 4;
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
index ab85b195ba..cf071ba968 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java
@@ -56,6 +56,8 @@ public class GT_Loader_OreProcessing
new ProcessingPipeSmall();
new ProcessingPipeMedium();
new ProcessingPipeLarge();
+ new ProcessingPipeHuge();
+ new ProcessingPipeTiny();
new ProcessingPipeRestrictive();
new ProcessingPlank();
new ProcessingPlate1();