Skip to content
This repository has been archived by the owner on May 25, 2024. It is now read-only.

Commit

Permalink
fluidextractor ra2
Browse files Browse the repository at this point in the history
  • Loading branch information
@chochem
chochem committed Jan 11, 2024
1 parent b829b58 commit 3e7d98a
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 62 deletions.
22 changes: 8 additions & 14 deletions src/main/java/goodgenerator/loader/RecipeLoader_02.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes;
import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
Expand Down Expand Up @@ -675,22 +676,15 @@ public static void RecipeLoad() {
120,
480);

GT_Values.RA.addFluidExtractionRecipe(
Materials.Coal.getGems(1),
Materials.Ash.getDust(1),
FluidRegistry.getFluidStack("fluid.coaltar", 250),
10,
60,
120);
GT_Values.RA.stdBuilder().itemInputs(Materials.Coal.getGems(1)).itemOutputs(Materials.Ash.getDust(1))
.outputChances(10).fluidOutputs(FluidRegistry.getFluidStack("fluid.coaltar", 250)).duration(3 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(fluidExtractionRecipes);

if (OreDictionary.getOres("fuelCoke").size() > 0) {
GT_Values.RA.addFluidExtractionRecipe(
OreDictionary.getOres("fuelCoke").get(0),
Materials.Ash.getDust(1),
FluidRegistry.getFluidStack("fluid.coaltar", 500),
10,
60,
120);
GT_Values.RA.stdBuilder().itemInputs(OreDictionary.getOres("fuelCoke").get(0))
.itemOutputs(Materials.Ash.getDust(1)).outputChances(10)
.fluidOutputs(FluidRegistry.getFluidStack("fluid.coaltar", 250)).duration(3 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(fluidExtractionRecipes);
}

if (LoadedList.GTPP) {
Expand Down
127 changes: 79 additions & 48 deletions src/main/java/goodgenerator/util/MaterialFix.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package goodgenerator.util;

import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;

import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;

import gregtech.api.enums.GT_Values;
Expand All @@ -14,8 +18,8 @@ public class MaterialFix {

public static void MaterialFluidExtractionFix(Werkstoff material) {
if (material.hasItemType(OrePrefixes.ingot)) {
GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.ingot), null, material.getMolten(144), 0, 32, 8);
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ingot)).fluidOutputs(material.getMolten(144))
.duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(fluidExtractionRecipes);
GT_Values.RA.addFluidSolidifierRecipe(
ItemList.Shape_Mold_Ingot.get(0),
material.getMolten(144),
Expand All @@ -24,59 +28,86 @@ public static void MaterialFluidExtractionFix(Werkstoff material) {
48);
}
if (material.hasItemType(OrePrefixes.plate)) {
GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.plate), null, material.getMolten(144), 0, 32, 8);
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.plate)).fluidOutputs(material.getMolten(144))
.duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(fluidExtractionRecipes);
GT_Values.RA.addFluidSolidifierRecipe(
ItemList.Shape_Mold_Plate.get(0),
material.getMolten(144),
material.get(OrePrefixes.plate),
32,
48);
}
if (material.hasItemType(OrePrefixes.gearGtSmall)) GT_Values.RA.addFluidExtractionRecipe(
material.get(OrePrefixes.gearGtSmall),
null,
material.getMolten(144),
0,
32,
8);
if (material.hasItemType(OrePrefixes.stickLong)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.stickLong), null, material.getMolten(144), 0, 32, 8);
if (material.hasItemType(OrePrefixes.spring)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.spring), null, material.getMolten(144), 0, 32, 8);
if (material.hasItemType(OrePrefixes.stick)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.stick), null, material.getMolten(72), 0, 16, 8);
if (material.hasItemType(OrePrefixes.itemCasing)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.itemCasing), null, material.getMolten(72), 0, 16, 8);
if (material.hasItemType(OrePrefixes.wireGt01)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.wireGt01), null, material.getMolten(72), 0, 16, 8);
if (material.hasItemType(OrePrefixes.cableGt01)) GT_Values.RA.addFluidExtractionRecipe(
material.get(OrePrefixes.cableGt01),
GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2),
material.getMolten(72),
10000,
16,
8);
if (material.hasItemType(OrePrefixes.foil)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.foil), null, material.getMolten(36), 0, 8, 8);
if (material.hasItemType(OrePrefixes.springSmall)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.springSmall), null, material.getMolten(36), 0, 8, 8);
if (material.hasItemType(OrePrefixes.ring)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.ring), null, material.getMolten(36), 0, 8, 8);
if (material.hasItemType(OrePrefixes.bolt)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.bolt), null, material.getMolten(18), 0, 4, 8);
if (material.hasItemType(OrePrefixes.wireFine)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.wireFine), null, material.getMolten(18), 0, 4, 8);
if (material.hasItemType(OrePrefixes.round)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.round), null, material.getMolten(16), 0, 4, 8);
if (material.hasItemType(OrePrefixes.screw)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.screw), null, material.getMolten(16), 0, 4, 8);
if (material.hasItemType(OrePrefixes.nugget)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.nugget), null, material.getMolten(16), 0, 4, 8);
if (material.hasItemType(OrePrefixes.rotor)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.rotor), null, material.getMolten(612), 0, 136, 8);
if (material.hasItemType(OrePrefixes.gearGt)) GT_Values.RA
.addFluidExtractionRecipe(material.get(OrePrefixes.gearGt), null, material.getMolten(576), 0, 128, 8);
if (material.hasItemType(OrePrefixes.gearGtSmall)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.gearGtSmall))
.fluidOutputs(material.getMolten(144)).duration(1 * SECONDS + 12 * TICKS).eut(8)
.addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.stickLong)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stickLong))
.fluidOutputs(material.getMolten(144)).duration(1 * SECONDS + 12 * TICKS).eut(8)
.addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.spring)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.spring)).fluidOutputs(material.getMolten(144))
.duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.stick)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stick)).fluidOutputs(material.getMolten(72))
.duration(16 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.itemCasing)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.itemCasing))
.fluidOutputs(material.getMolten(72)).duration(16 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.wireGt01)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.wireGt01))
.fluidOutputs(material.getMolten(72)).duration(16 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.cableGt01)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.cableGt01))
.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2))
.fluidOutputs(material.getMolten(72)).duration(16 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.foil)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.foil)).fluidOutputs(material.getMolten(36))
.duration(8 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.springSmall)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.springSmall))
.fluidOutputs(material.getMolten(36)).duration(8 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.ring)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ring)).fluidOutputs(material.getMolten(36))
.duration(8 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.bolt)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.bolt)).fluidOutputs(material.getMolten(18))
.duration(4 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.wireFine)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.wireFine))
.fluidOutputs(material.getMolten(18)).duration(4 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.round)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.round)).fluidOutputs(material.getMolten(16))
.duration(4 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.screw)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.screw)).fluidOutputs(material.getMolten(16))
.duration(4 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.nugget)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.nugget)).fluidOutputs(material.getMolten(16))
.duration(4 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.rotor)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.rotor)).fluidOutputs(material.getMolten(612))
.duration(136 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
if (material.hasItemType(OrePrefixes.gearGt)) {
GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.gearGt)).fluidOutputs(material.getMolten(576))
.duration(128 * TICKS).eut(8).addTo(fluidExtractionRecipes);
}
}

public static void addRecipeForMultiItems() {
Expand Down

0 comments on commit 3e7d98a

Please sign in to comment.