Skip to content

Commit 15e89c5

Browse files
EnderProyectsserenibyssDream-Master
authored
New batch of EFR recipes (#1185)
Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
1 parent 4cc759c commit 15e89c5

File tree

3 files changed

+123
-2
lines changed

3 files changed

+123
-2
lines changed

‎dependencies.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ dependencies {
2626
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.2:dev") { transitive = false }
2727
compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.21-GTNH:dev") { transitive = false }
2828
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.1-GTNH:dev")
29+
//compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false }
2930

3031
runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
3132
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.0-GTNH:dev")

‎src/main/java/com/dreammaster/scripts/ScriptEFR.java

+119-2
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,40 @@
22

33
import static gregtech.api.enums.Mods.AdventureBackpack;
44
import static gregtech.api.enums.Mods.AppliedEnergistics2;
5+
import static gregtech.api.enums.Mods.BiomesOPlenty;
6+
import static gregtech.api.enums.Mods.Botania;
57
import static gregtech.api.enums.Mods.DraconicEvolution;
8+
import static gregtech.api.enums.Mods.EnderIO;
69
import static gregtech.api.enums.Mods.EtFuturumRequiem;
710
import static gregtech.api.enums.Mods.ExtraUtilities;
811
import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
912
import static gregtech.api.enums.Mods.Minecraft;
1013
import static gregtech.api.enums.Mods.PamsHarvestCraft;
14+
import static gregtech.api.enums.Mods.StevesCarts2;
1115
import static gregtech.api.enums.Mods.Thaumcraft;
16+
import static gregtech.api.enums.Mods.ThaumicBases;
1217
import static gregtech.api.enums.Mods.TinkerConstruct;
1318
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
1419
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
1520
import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
21+
import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
22+
import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
23+
import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
1624
import static gregtech.api.util.GTModHandler.getModItem;
1725
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
1826

1927
import java.util.Arrays;
2028
import java.util.List;
29+
import java.util.Objects;
2130

31+
import net.minecraft.init.Blocks;
32+
import net.minecraft.init.Items;
33+
import net.minecraft.item.ItemStack;
2234
import net.minecraftforge.fluids.FluidRegistry;
2335
import net.minecraftforge.fluids.FluidStack;
2436

2537
import com.dreammaster.recipes.CustomItem;
38+
import com.dreammaster.thaumcraft.TCHelper;
2639

2740
import gregtech.api.enums.GTValues;
2841
import gregtech.api.enums.ItemList;
@@ -31,6 +44,12 @@
3144
import gregtech.api.enums.TierEU;
3245
import gregtech.api.util.GTModHandler;
3346
import gregtech.api.util.GTOreDictUnificator;
47+
import gregtech.api.util.GTUtility;
48+
import thaumcraft.api.ThaumcraftApi;
49+
import thaumcraft.api.aspects.Aspect;
50+
import thaumcraft.api.aspects.AspectList;
51+
import thaumcraft.api.research.ResearchItem;
52+
import thaumcraft.api.research.ResearchPage;
3453

3554
public class ScriptEFR implements IScriptLoader {
3655

@@ -160,7 +179,7 @@ public void loadRecipes() {
160179
GTModHandler.getModItem(TinkerConstruct.ID, "CraftingSlab", 1, 5), 'G',
161180
GTModHandler.getModItem(Thaumcraft.ID, "blockWoodenDevice", 1, 6), });
162181

163-
GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "magma_cream", 4, 0, missing))
182+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.magma_cream, 4))
164183
.fluidInputs(new FluidStack(FluidRegistry.getFluid("lava"), 1000))
165184
.itemOutputs(getModItem(EtFuturumRequiem.ID, "magma", 1, 0, missing)).duration(10 * SECONDS).eut(2)
166185
.addTo(compressorRecipes);
@@ -170,8 +189,106 @@ public void loadRecipes() {
170189
.addTo(compressorRecipes);
171190

172191
GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "magma", 1, 0, missing))
173-
.itemOutputs(getModItem(Minecraft.ID, "magma_cream", 4, 0, missing))
192+
.itemOutputs(new ItemStack(Items.magma_cream, 4))
174193
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("lava"), 1000)).duration(10 * SECONDS).eut(48)
175194
.addTo(fluidExtractionRecipes);
195+
196+
GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "hardIce", 4, 0, missing))
197+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "blue_ice", 1, 0, missing)).duration(8 * SECONDS).eut(2)
198+
.addTo(compressorRecipes);
199+
200+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.nether_wart, 9))
201+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "nether_wart", 1L)).duration(5 * SECONDS)
202+
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
203+
204+
GTValues.RA.stdBuilder()
205+
.itemInputs(new ItemStack(Blocks.gravel, 4), getModItem(TinkerConstruct.ID, "CraftedSoil", 4L, 1))
206+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "old_gravel", 8L)).duration(5 * SECONDS)
207+
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
208+
209+
GTValues.RA.stdBuilder()
210+
.itemInputs(
211+
getModItem(EtFuturumRequiem.ID, "old_gravel", 4L),
212+
getModItem(BiomesOPlenty.ID, "driedDirt", 4L))
213+
.fluidInputs(new FluidStack(FluidRegistry.getFluid("steam"), 400))
214+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "coarse_dirt", 8, 0, missing)).duration(8 * SECONDS).eut(2)
215+
.addTo(mixerRecipes);
216+
217+
GTValues.RA.stdBuilder()
218+
.itemInputs(
219+
getModItem(TinkerConstruct.ID, "slime.gel", 4L, 1),
220+
getModItem(TinkerConstruct.ID, "GlueBlock", 4L, 0))
221+
.fluidInputs(new FluidStack(FluidRegistry.getFluid("steam"), 4000))
222+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "slime", 16, 0, missing)).duration(40 * SECONDS).eut(2)
223+
.addTo(mixerRecipes);
224+
225+
GTValues.RA.stdBuilder()
226+
.itemInputs(
227+
getModItem(HardcoreEnderExpansion.ID, "laboratory_obsidian", 16L),
228+
getModItem(HardcoreEnderExpansion.ID, "spectral_tear", 1L, 0))
229+
.fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2distilledwater"), 4000))
230+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "crying_obsidian", 16L)).duration(5 * SECONDS)
231+
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
232+
233+
GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 9L))
234+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "calcite", 1, 0, missing)).duration(8 * SECONDS).eut(2)
235+
.addTo(compressorRecipes);
236+
237+
GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "calcite", 1, 0, missing))
238+
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 9L)).duration(8 * SECONDS)
239+
.eut(2).addTo(hammerRecipes);
240+
241+
GTValues.RA.stdBuilder()
242+
.itemInputs(
243+
GTOreDictUnificator.get(OrePrefixes.dust, Materials.MelodicAlloy, 8L),
244+
getModItem(Botania.ID, "fertilizer", 3, 0, missing),
245+
getModItem(ThaumicBases.ID, "genLeaves", 1, 3, missing),
246+
GTUtility.getIntegratedCircuit(24))
247+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "chorus_flower", 1, 0, missing))
248+
.fluidInputs(
249+
new FluidStack(FluidRegistry.getFluid("endergoo"), 4000),
250+
new FluidStack(FluidRegistry.getFluid("ender"), 1000))
251+
.duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes);
252+
253+
new ResearchItem(
254+
"UNDYINGTOTEM",
255+
"NEWHORIZONS",
256+
new AspectList().add(Aspect.getAspect("infernus"), 15).add(Aspect.getAspect("lucrum"), 12)
257+
.add(Aspect.getAspect("praecantatio"), 12).add(Aspect.getAspect("spiritus"), 9)
258+
.add(Aspect.getAspect("fames"), 6).add(Aspect.getAspect("corpus"), 3),
259+
-6,
260+
-7,
261+
3,
262+
getModItem(EtFuturumRequiem.ID, "totem_of_undying", 1, 0, missing)).setParents("GREENHEART")
263+
.setConcealed().setRound().setPages(new ResearchPage("TConstruct.research_page.UNDYINGTOTEM.1"))
264+
.registerResearchItem();
265+
ThaumcraftApi.addInfusionCraftingRecipe(
266+
"UNDYINGTOTEM",
267+
getModItem(EtFuturumRequiem.ID, "totem_of_undying", 1, 0, missing),
268+
15,
269+
new AspectList().add(Aspect.getAspect("exanimis"), 100).add(Aspect.getAspect("ignis"), 150)
270+
.add(Aspect.getAspect("lucrum"), 150).add(Aspect.getAspect("sano"), 200)
271+
.add(Aspect.getAspect("praecantatio"), 200),
272+
getModItem(TinkerConstruct.ID, "heartCanister", 1, 5, missing),
273+
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.plate, Materials.InfusedGold, 1L),
274+
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Emerald, 1L),
275+
getModItem(ThaumicBases.ID, "oldGold", 1, 0, missing),
276+
getModItem(StevesCarts2.ID, "BlockMetalStorage", 1, 2, missing),
277+
getModItem(ThaumicBases.ID, "oldGold", 1, 0, missing),
278+
GTOreDictUnificator.get(OrePrefixes.plate, Materials.InfusedGold, 1L),
279+
getModItem(EnderIO.ID, "itemFrankenSkull", 1, 5, missing),
280+
GTOreDictUnificator.get(OrePrefixes.plate, Materials.InfusedGold, 1L),
281+
getModItem(ThaumicBases.ID, "oldGold", 1, 0, missing),
282+
getModItem(StevesCarts2.ID, "BlockMetalStorage", 1, 2, missing),
283+
getModItem(ThaumicBases.ID, "oldGold", 1, 0, missing),
284+
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.GreenSapphire, 1L), });
285+
TCHelper.addResearchPage(
286+
"UNDYINGTOTEM",
287+
new ResearchPage(
288+
Objects.requireNonNull(
289+
TCHelper.findInfusionRecipe(
290+
getModItem(EtFuturumRequiem.ID, "totem_of_undying", 1, 0, missing)))));
291+
ThaumcraftApi.addWarpToResearch("UNDYINGTOTEM", 3);
292+
176293
}
177294
}

‎src/main/resources/assets/dreamcraft/lang/en_US.lang

+3
Original file line numberDiff line numberDiff line change
@@ -973,6 +973,9 @@ TConstruct.research_page.YELLOWHEARTCANISTER.1=The Yellow Heart Canister which i
973973
tc.research_name.GREENHEART=Green Heart
974974
tc.research_text.GREENHEART=[TC] 30 Hearts are not enough.
975975
TConstruct.research_page.GREENHEART.1=The Miniature Green Heart is an item from Tinkers Construct. It can be made via Infusion. Its primary use is in crafting the Geen Heart Canister, but it can also be eaten to restore 30 life.
976+
tc.research_name.UNDYINGTOTEM=Totem of Undying
977+
tc.research_text.UNDYINGTOTEM=Revival of the future
978+
TConstruct.research_page.UNDYINGTOTEM.1=What is better than having strong health? Reviving from death itself. If the player is holding a totem of undying in their off-hand or main-hand slot and receives otherwise fatal damage, the totem saves the player from death. The totem of undying must be in the player's hand for it to work—it does not work if it is in the hotbar, unless selected. Any mob that can hold a totem of undying, can use it while holding it. The totem can be used only once, it disappears after use. When activated, the totem of undying restores 1♥, removes all existing status effects, then grants 45 seconds of Regeneration II, 40 seconds of Fire Resistance I and 5 seconds of Absorption II.
976979
tc.research_name.GREENHEARTCANISTER=Green Heart Canister
977980
tc.research_text.GREENHEARTCANISTER=[TC] Bound in a big box.
978981
TConstruct.research_page.GREENHEARTCANISTER.1=The Green Heart Canister which increases the amount of hearts that the player has. To have an effect the canisters must be equipped in the Armor Tab, in the slot on the right with the symbol that looks like the green heart canister. Up to 10 can be stacked in this slot to allow for a total of 10 extra hearts (or 20 extra health points). These will not appear above the regular health bar like from the Absorption effect, instead once the health bar is full with yellow hearts and will gradually be replaced by green hearts.

0 commit comments

Comments
 (0)