Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added recipes in oreder to get currently unobtainable foods #1105

Merged
merged 6 commits into from
Dec 14, 2024
Merged

Added recipes in oreder to get currently unobtainable foods #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f1d0ec
Now kinda all foods can be used
EnderProyects Dec 14, 2024
930cc7c
Fix modhandles
EnderProyects Dec 14, 2024
c30775c
ups
EnderProyects Dec 14, 2024
414c813
ups 2.0
EnderProyects Dec 14, 2024
da99ba6
Merge branch 'master' into master
Dream-Master Dec 14, 2024
e2367c4
Merge branch 'master' into master
EnderProyects Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,5 +1198,33 @@ public void run() {
MaterialsUEVplus.ExcitedDTEC.getFluid(128000))
.duration(3 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(mixerNonCellRecipes);
}
if (EnderIO.isModLoaded() && BiomesOPlenty.isModLoaded() && Witchery.isModLoaded()) {
GTValues.RA.stdBuilder()
.itemInputs(
kubatech.api.enums.ItemList.EarlGrayTea.get(1),
kubatech.api.enums.ItemList.LemonTea.get(1),
kubatech.api.enums.ItemList.MilkTea.get(1),
kubatech.api.enums.ItemList.PeppermintTea.get(1),
GTModHandler.getModItem(EnderIO.ID, "bucketVapor_of_levity", 1L),
ItemList.ThermosCan_Ice_Tea.get(1L),
GTModHandler.getModItem(BiomesOPlenty.ID, "food", 1L, 10),
GTModHandler.getModItem(Witchery.ID, "potion", 1L),
GTModHandler.getModItem(Witchery.ID, "ingredient", 1L, 40))
.itemOutputs(
new ItemStack(Items.glass_bottle, 2, 0),
new ItemStack(Items.bucket, 1, 0),
ItemList.ThermosCan_Empty.get(1L))
.fluidInputs(
FluidRegistry.getFluidStack("potion.diablosauce", 7500),
FluidRegistry.getFluidStack("potion.piratebrew", 2500),
FluidRegistry.getFluidStack("potion.jagi", 2500),
FluidRegistry.getFluidStack("potion.alcopops", 2500),
FluidRegistry.getFluidStack("potion.goldencider", 2500),
FluidRegistry.getFluidStack("potion.chocolatemilk", 7500))
.fluidOutputs(
FluidRegistry.getFluidStack("potion.diablosauce.strong", 12000),
FluidRegistry.getFluidStack("potion.mundane", 22000))
.duration(200 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(mixerNonCellRecipes);
}
}
}
23 changes: 23 additions & 0 deletions src/main/java/com/dreammaster/scripts/ScriptBiomesOPlenty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@

import static com.dreammaster.main.MainRegistry.Module_CustomFuels;
import static gregtech.api.enums.Mods.BiomesOPlenty;
import static gregtech.api.enums.Mods.Botany;
import static gregtech.api.enums.Mods.Forestry;
import static gregtech.api.enums.Mods.GTPlusPlus;
import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
import static gregtech.api.enums.Mods.IguanaTweaksTinkerConstruct;
import static gregtech.api.enums.Mods.Minecraft;
import static gregtech.api.enums.Mods.PamsHarvestCraft;
import static gregtech.api.enums.Mods.RandomThings;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes;
import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
import static gregtech.api.util.GTModHandler.getModItem;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
Expand All @@ -29,6 +33,7 @@
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
Expand Down Expand Up @@ -283,6 +288,24 @@ public void loadRecipes() {
GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gypsum, 1L),
GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Calcite, 1L))
.outputChances(10000, 7500, 2500, 2500).duration(10 * SECONDS).eut(8).addTo(maceratorRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
getModItem(HardcoreEnderExpansion.ID, "end_powder", 8L),
getModItem(RandomThings.ID, "ingredient", 1L, 6))
.itemOutputs(GTModHandler.getModItem(BiomesOPlenty.ID, "misc", 1L, 4))
.fluidInputs(FluidRegistry.getFluidStack("endergoo", 1000)).duration(15 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(mixerRecipes);
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 1L),
getModItem(PamsHarvestCraft.ID, "seaweedItem", 32L),
getModItem(Botany.ID, "misc", 1L, 7))
.itemOutputs(GTModHandler.getModItem(BiomesOPlenty.ID, "coral1", 32L, 11))
.fluidInputs(FluidRegistry.getFluidStack("weedex9000", 100)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_MV).addTo(mixerRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "jarEmpty", 1L))
.itemOutputs(getModItem(BiomesOPlenty.ID, "jarFilled", 1L)).fluidInputs(Materials.Honey.getFluid(1000L))
.duration(2 * SECONDS).eut(1).addTo(fluidCannerRecipes);

}
}
22 changes: 22 additions & 0 deletions src/main/java/com/dreammaster/scripts/ScriptExtraTrees.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7476,5 +7476,27 @@ public void recipes2() {
"stickWood",
getModItem(Minecraft.ID, "planks", 1, 5, missing),
"stickWood");
addShapedRecipe(
createItemStack(ExtraTrees.ID, "food", 1, 23, "{meta:23}", missing),
"dustSugar",
getModItem(Minecraft.ID, "sand", 1, 1, missing),
"dustSugar",
getModItem(Minecraft.ID, "sand", 1, 1, missing),
"cropPear",
getModItem(Minecraft.ID, "sand", 1, 1, missing),
"dustSugar",
getModItem(Minecraft.ID, "sand", 1, 1, missing),
"dustSugar");
addShapedRecipe(
createItemStack(ExtraTrees.ID, "food", 1, 40, "{meta:40}", missing),
"dustLazurite",
"gemChippedOlivine",
"dustLapis",
"dustSugar",
getModItem(Forestry.ID, "fruits", 1, 6, missing),
"gemChippedOlivine",
"dustSodalite",
"dustSugar",
"dustLazurite");
}
}
19 changes: 19 additions & 0 deletions src/main/java/com/dreammaster/scripts/ScriptThaumicExploration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import static gregtech.api.enums.Mods.BiomesOPlenty;
import static gregtech.api.enums.Mods.ExtraUtilities;
import static gregtech.api.enums.Mods.ForbiddenMagic;
import static gregtech.api.enums.Mods.Minecraft;
import static gregtech.api.enums.Mods.Natura;
import static gregtech.api.enums.Mods.PamsHarvestCraft;
import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.enums.Mods.ThaumicExploration;
Expand Down Expand Up @@ -1888,6 +1890,23 @@ public void loadRecipes() {
TCHelper.findInfusionRecipe(getModItem(ThaumicExploration.ID, "talismanFood", 1, 0, missing))));
TCHelper.addResearchPrereq("THINKTANK", "BraincureGTNH", false);
ThaumcraftApi.addWarpToResearch("THINKTANK", 2);
ThaumcraftApi.addArcaneCraftingRecipe(
"TalismanfoodtGTNH",
getModItem(ThaumicExploration.ID, "taintBerry", 1, 0, missing),
new AspectList().add(Aspect.getAspect("aer"), 20).add(Aspect.getAspect("aqua"), 20)
.add(Aspect.getAspect("ignis"), 20).add(Aspect.getAspect("terra"), 20)
.add(Aspect.getAspect("ordo"), 25).add(Aspect.getAspect("perditio"), 25),
"tft",
"gbg",
"ggg",
't',
getModItem(Thaumcraft.ID, "ItemResource", 1, 12, missing),
'g',
getModItem(Thaumcraft.ID, "ItemResource", 1, 11, missing),
'b',
getModItem(Natura.ID, "berry.nether", 1, missing),
'f',
getModItem(ForbiddenMagic.ID, "TaintFruit", 1, missing));
TCHelper.orphanResearch("DREAMCATCHER");
TCHelper.removeResearch("DREAMCATCHER");
new ResearchItem(
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/dreammaster/scripts/ScriptThaumicHorizons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package com.dreammaster.scripts;

import static gregtech.api.enums.Mods.BiomesOPlenty;
import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.enums.Mods.ThaumicHorizons;
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
import static gregtech.api.util.GTModHandler.getModItem;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;

import java.util.Arrays;
import java.util.List;
Expand All @@ -11,6 +15,7 @@

import com.dreammaster.thaumcraft.TCHelper;

import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.Mods;
import gregtech.api.enums.OrePrefixes;
Expand Down Expand Up @@ -195,5 +200,11 @@ public void loadRecipes() {
TCHelper.refreshResearchPages("transductionAmplifier");
TCHelper.refreshResearchPages("vortexStabilizer");
TCHelper.refreshResearchPages("recombinator");
GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "flesh", 2, missing))
.itemOutputs(getModItem(ThaumicHorizons.ID, "meatTH", 1, missing)).duration(15 * SECONDS).eut(2)
.addTo(compressorRecipes);
GTValues.RA.stdBuilder().itemInputs(getModItem(ThaumicHorizons.ID, "meatCookedTH", 1, missing))
.itemOutputs(getModItem(ThaumicHorizons.ID, "meatNuggetTH", 4, missing)).duration(15 * SECONDS).eut(2)
.addTo(extractorRecipes);
}
}
Loading