Skip to content

Commit 9667d15

Browse files
Reduce Obsidian Processing from 9 per block to 2 per block (#1206)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
1 parent a3d06fc commit 9667d15

File tree

1 file changed

+62
-2
lines changed

1 file changed

+62
-2
lines changed

src/main/java/com/dreammaster/scripts/ScriptCoreMod.java

+62-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,21 @@
2222
import static gregtech.api.enums.Mods.RemoteIO;
2323
import static gregtech.api.enums.Mods.Thaumcraft;
2424
import static gregtech.api.enums.Mods.TinkerConstruct;
25+
import static gregtech.api.recipe.RecipeCategories.alloySmelterMolding;
26+
import static gregtech.api.recipe.RecipeCategories.fluidExtractorRecycling;
27+
import static gregtech.api.recipe.RecipeCategories.maceratorRecycling;
28+
import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
2529
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
2630
import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
2731
import static gregtech.api.recipe.RecipeMaps.brewingRecipes;
32+
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
2833
import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
2934
import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
3035
import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
3136
import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
3237
import static gregtech.api.recipe.RecipeMaps.fermentingRecipes;
38+
import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
39+
import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
3340
import static gregtech.api.recipe.RecipeMaps.formingPressRecipes;
3441
import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
3542
import static gregtech.api.recipe.RecipeMaps.latheRecipes;
@@ -44,6 +51,7 @@
4451
import java.util.List;
4552
import java.util.stream.Stream;
4653

54+
import net.minecraft.init.Blocks;
4755
import net.minecraft.item.ItemStack;
4856
import net.minecraftforge.fluids.FluidRegistry;
4957

@@ -1362,8 +1370,6 @@ public void loadRecipes() {
13621370
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4L))
13631371
.itemOutputs(CustomItemList.BedrockiumIronPlate.get(1L)).duration(30 * SECONDS).eut(TierEU.RECIPE_UEV)
13641372
.addTo(formingPressRecipes);
1365-
GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "obsidian", 1, 0, missing))
1366-
.itemOutputs(NHItemList.LongObsidianRod.getIS(4)).duration(32 * SECONDS).eut(16).addTo(latheRecipes);
13671373
GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "stone", 1, 0, missing))
13681374
.itemOutputs(NHItemList.LongStoneRod.getIS(4)).duration(16 * SECONDS).eut(16).addTo(latheRecipes);
13691375
GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "sandstone", 1, wildcard, missing))
@@ -1417,5 +1423,59 @@ public void loadRecipes() {
14171423
.duration(15 * SECONDS).eut(2).addTo(maceratorRecipes);
14181424
GTValues.RA.stdBuilder().itemInputs(getModItem(ProjectRedCore.ID, "projectred.core.part", 1, 55, missing))
14191425
.itemOutputs(NHItemList.ElectrotineWire.getIS(2)).duration(5 * SECONDS).eut(4).addTo(wiremillRecipes);
1426+
1427+
// Obsidian Stuff
1428+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian))
1429+
.itemOutputs(NHItemList.LongObsidianRod.getIS(2)).duration(32 * SECONDS).eut(16).addTo(latheRecipes);
1430+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian))
1431+
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 2))
1432+
.fluidInputs(Materials.Lubricant.getFluid(5)).duration(11 * SECONDS).eut(TierEU.RECIPE_LV)
1433+
.addTo(cutterRecipes);
1434+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian))
1435+
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 2))
1436+
.fluidInputs(Materials.Water.getFluid(20)).duration(22 * SECONDS).eut(TierEU.RECIPE_LV)
1437+
.addTo(cutterRecipes);
1438+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian))
1439+
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 2))
1440+
.fluidInputs(GTModHandler.getDistilledWater(15)).duration(22 * SECONDS).eut(TierEU.RECIPE_LV)
1441+
.addTo(cutterRecipes);
1442+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian))
1443+
.fluidOutputs(Materials.Obsidian.getMolten(288)).duration(10 * SECONDS + 16 * TICKS).eut(35)
1444+
.recipeCategory(fluidExtractorRecycling).addTo(fluidExtractionRecipes);
1445+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian))
1446+
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2))
1447+
.duration(9 * SECONDS + 18 * TICKS).eut(4).recipeCategory(maceratorRecycling).addTo(maceratorRecipes);
1448+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian), ItemList.Shape_Mold_Ingot.get(0))
1449+
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Obsidian, 2))
1450+
.duration(6 * SECONDS + 10 * TICKS).eut(3).recipeCategory(alloySmelterMolding)
1451+
.addTo(alloySmelterRecipes);
1452+
GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Obsidian, 2))
1453+
.itemOutputs(new ItemStack(Blocks.obsidian)).duration(15 * SECONDS).eut(2).addTo(compressorRecipes);
1454+
GTValues.RA.stdBuilder().fluidInputs(Materials.Obsidian.getMolten(288))
1455+
.itemInputs(ItemList.Shape_Mold_Block.get(0)).itemOutputs(new ItemStack(Blocks.obsidian))
1456+
.duration(14 * SECONDS + 8 * TICKS).eut(8).addTo(fluidSolidifierRecipes);
1457+
GTValues.RA.stdBuilder()
1458+
.itemInputs(
1459+
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2),
1460+
ItemList.Shape_Extruder_Block.get(0))
1461+
.itemOutputs(new ItemStack(Blocks.obsidian)).duration(10 * TICKS).eut(24).addTo(extruderRecipes);
1462+
GTValues.RA.stdBuilder()
1463+
.itemInputs(
1464+
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Obsidian, 2),
1465+
ItemList.Shape_Extruder_Block.get(0))
1466+
.itemOutputs(new ItemStack(Blocks.obsidian)).duration(10 * TICKS).eut(24).addTo(extruderRecipes);
1467+
GTValues.RA.stdBuilder()
1468+
.itemInputs(
1469+
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2),
1470+
ItemList.Shape_Mold_Block.get(0))
1471+
.itemOutputs(new ItemStack(Blocks.obsidian)).duration(5 * TICKS).eut(12)
1472+
.recipeCategory(alloySmelterMolding).addTo(alloySmelterRecipes);
1473+
GTValues.RA.stdBuilder()
1474+
.itemInputs(
1475+
GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Obsidian, 2),
1476+
ItemList.Shape_Mold_Block.get(0))
1477+
.itemOutputs(new ItemStack(Blocks.obsidian)).duration(5 * TICKS).eut(12)
1478+
.recipeCategory(alloySmelterMolding).addTo(alloySmelterRecipes);
1479+
14201480
}
14211481
}

0 commit comments

Comments
 (0)