aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2023-02-09 00:46:21 +0000
committerGitHub <noreply@github.com>2023-02-09 00:46:21 +0000
commit41a21223aecf805673b9e1c16e9ab8d7e4ed418c (patch)
treea6c59968132c2aff863015bd28c60fb9c32dab47
parent8f4b511c9951ecb09a69bef0ef91ebce7b6095a5 (diff)
downloadGT5-Unofficial-41a21223aecf805673b9e1c16e9ab8d7e4ed418c.tar.gz
GT5-Unofficial-41a21223aecf805673b9e1c16e9ab8d7e4ed418c.tar.bz2
GT5-Unofficial-41a21223aecf805673b9e1c16e9ab8d7e4ed418c.zip
Allow hatches for industrial forge hammer (#533)
* Fix IndustrialForgeHammer structure * sa
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java16
2 files changed, 11 insertions, 12 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java
index ad4a74082a..1859e3ac9e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialForgeHammer.java
@@ -81,8 +81,9 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends
}
tt.addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true)
.addController("Front Center").addCasingInfo("Forge Casing", 10).addInputBus("Any Casing", 1)
- .addOutputBus("Any Casing", 1).addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1)
- .addMufflerHatch("Any Casing", 1).toolTipFinisher(CORE.GT_Tooltip_Builder.get());
+ .addOutputBus("Any Casing", 1).addInputHatch("Any Casing", 1).addOutputHatch("Any Casing", 1)
+ .addEnergyHatch("Any Casing", 1).addMaintenanceHatch("Any Casing", 1).addMufflerHatch("Any Casing", 1)
+ .toolTipFinisher(CORE.GT_Tooltip_Builder.get());
return tt;
}
@@ -110,7 +111,7 @@ public class GregtechMetaTileEntity_IndustrialForgeHammer extends
.addElement(
'C',
buildHatchAdder(GregtechMetaTileEntity_IndustrialForgeHammer.class)
- .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler)
+ .atLeast(InputBus, OutputBus, Maintenance, Energy, Muffler, InputHatch, OutputHatch)
.casingIndex(TAE.getIndexFromPage(1, 11)).dot(1).buildAndChain(
onElementPass(x -> ++x.mCasing, ofBlock(ModBlocks.blockCasings5Misc, 6))))
.addElement('A', onElementPass(x -> ++x.mAnvil, ofBlocksFlat(aBlockMap, sAnvil, 0))).build();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index 0aa8b31e03..5ebc492fbf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -538,15 +538,13 @@ public class RecipeLoader_Nuclear {
// Radium
GT_Values.RA.addSifterRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedThorium", 1),
- new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustThorium", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustLead", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)
- },
- new int[] {10000, 500, 300, 200, 100, 100},
+ new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustThorium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLead", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) },
+ new int[] { 10000, 500, 300, 200, 100, 100 },
20 * 30,
500);