Skip to content

Commit 44475d6

Browse files
Dream-MasterDream-Master
authored
Merge branch 'master' into Botania_into_InfGear
2 parents 79c58a7 + e377a8d commit 44475d6

File tree

4 files changed

+99
-6
lines changed

4 files changed

+99
-6
lines changed

‎dependencies.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
// Add your dependencies here
22

33
dependencies {
4-
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.157:dev")
4+
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.167:dev")
55
api("com.github.GTNewHorizons:Yamcl:0.7.0:dev")
66
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
77

8-
implementation("com.github.GTNewHorizons:GTNHLib:0.6.11:dev")
8+
implementation("com.github.GTNewHorizons:GTNHLib:0.6.13:dev")
99

1010
compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false }
1111
compileOnly("com.github.GTNewHorizons:Avaritia:1.61:dev") { transitive = false }
1212
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false }
13-
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.33:dev") { transitive = false }
13+
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.35:dev") { transitive = false }
1414
compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
1515
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.9-GTNH:dev") { transitive = false }
1616
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
1717
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
1818
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
1919
compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false }
20-
compileOnly("com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev") { transitive = false }
20+
compileOnly("com.github.GTNewHorizons:Botania:1.12.6-GTNH:dev") { transitive = false }
2121
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.5:dev") { transitive = false }
2222
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
2323
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
2424
compileOnly("com.github.GTNewHorizons:amunra:0.8.1:dev") { transitive = false }
2525
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.5-GTNH:dev") { transitive = false }
2626
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.3:dev") { transitive = false }
2727
compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.22-GTNH:dev") { transitive = false }
28-
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.1-GTNH:dev")
28+
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.2-GTNH:dev")
2929
//compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false }
3030

3131
runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")

‎settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pluginManagement {
1717
}
1818

1919
plugins {
20-
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.34'
20+
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.37'
2121
}
2222

2323

‎src/main/java/com/dreammaster/recipes/RecipeRemover.java

+4
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,10 @@ public static void run() {
328328
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "end_crystal", 1, 0));
329329
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "cherry_trapdoor", 1, 0));
330330
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "smithing_table", 1, 0));
331+
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "netherite_scrap", 1, 0));
332+
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "netherite_ingot", 1, 0));
333+
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "netherite_block", 1, 0));
334+
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "moss_block", 1, 0));
331335
for (int i = 0; i < 16; i++) {
332336
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "banner", 1, i));
333337
}

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

+89
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@
1717
import static gregtech.api.enums.Mods.TinkerConstruct;
1818
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
1919
import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
20+
import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes;
2021
import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
2122
import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
2223
import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
2324
import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
2425
import static gregtech.api.util.GTModHandler.getModItem;
26+
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
2527
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
28+
import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
2629

2730
import java.util.Arrays;
2831
import java.util.List;
@@ -34,6 +37,7 @@
3437
import net.minecraftforge.fluids.FluidRegistry;
3538
import net.minecraftforge.fluids.FluidStack;
3639

40+
import com.dreammaster.chisel.ChiselHelper;
3741
import com.dreammaster.recipes.CustomItem;
3842
import com.dreammaster.thaumcraft.TCHelper;
3943

@@ -136,6 +140,14 @@ public void loadRecipes() {
136140
new Object[] { "PPP", "PFP", "SSS", 'S', getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, 0, missing),
137141
'F', getModItem(Minecraft.ID, "furnace", 1, 0, missing), 'P', "plateIron" });
138142

143+
GTValues.RA.stdBuilder()
144+
.itemInputs(
145+
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5L),
146+
getModItem(EtFuturumRequiem.ID, "smooth_stone", 3, 0, missing),
147+
new ItemStack(Blocks.furnace, 1))
148+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "blast_furnace", 1, 0, missing)).duration(5 * SECONDS)
149+
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
150+
139151
GTModHandler.addCraftingRecipe(
140152
getModItem(Minecraft.ID, "leather", 1, 0, missing),
141153
bits,
@@ -206,6 +218,16 @@ public void loadRecipes() {
206218
.itemOutputs(getModItem(EtFuturumRequiem.ID, "old_gravel", 8L)).duration(5 * SECONDS)
207219
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
208220

221+
GTValues.RA.stdBuilder()
222+
.itemInputs(
223+
GTUtility.getIntegratedCircuit(20),
224+
new ItemStack(Blocks.stone_slab, 1),
225+
new ItemStack(Items.stick, 5),
226+
GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Iron, 3L),
227+
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 2L))
228+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "wooden_armorstand", 1L)).duration(5 * SECONDS)
229+
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
230+
209231
GTValues.RA.stdBuilder()
210232
.itemInputs(
211233
getModItem(EtFuturumRequiem.ID, "old_gravel", 4L),
@@ -222,6 +244,22 @@ public void loadRecipes() {
222244
.itemOutputs(getModItem(EtFuturumRequiem.ID, "slime", 16, 0, missing)).duration(40 * SECONDS).eut(2)
223245
.addTo(mixerRecipes);
224246

247+
GTValues.RA.stdBuilder()
248+
.itemInputs(
249+
new ItemStack(Blocks.netherrack, 16),
250+
getModItem(EtFuturumRequiem.ID, "nether_wart", 1, 1, missing))
251+
.fluidInputs(new FluidStack(FluidRegistry.getFluid("blood"), 1000))
252+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "nylium", 16, 1, missing)).duration(40 * SECONDS).eut(2)
253+
.addTo(mixerRecipes);
254+
255+
GTValues.RA.stdBuilder()
256+
.itemInputs(
257+
new ItemStack(Blocks.netherrack, 16),
258+
getModItem(EtFuturumRequiem.ID, "nether_wart", 1, 0, missing))
259+
.fluidInputs(new FluidStack(FluidRegistry.getFluid("blood"), 1000))
260+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "nylium", 16, 0, missing)).duration(40 * SECONDS).eut(2)
261+
.addTo(mixerRecipes);
262+
225263
GTValues.RA.stdBuilder()
226264
.itemInputs(
227265
getModItem(HardcoreEnderExpansion.ID, "laboratory_obsidian", 16L),
@@ -230,14 +268,52 @@ public void loadRecipes() {
230268
.itemOutputs(getModItem(EtFuturumRequiem.ID, "crying_obsidian", 16L)).duration(5 * SECONDS)
231269
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
232270

271+
ChiselHelper.addVariationFromStack("EFRHoneyBlock", getModItem(BiomesOPlenty.ID, "honeyBlock", 1L));
272+
ChiselHelper.addVariationFromStack("EFRHoneyBlock", getModItem(EtFuturumRequiem.ID, "honey_block", 1L));
273+
233274
GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 9L))
234275
.itemOutputs(getModItem(EtFuturumRequiem.ID, "calcite", 1, 0, missing)).duration(8 * SECONDS).eut(2)
235276
.addTo(compressorRecipes);
236277

278+
GTValues.RA.stdBuilder().itemInputs(getModItem(BiomesOPlenty.ID, "moss", 9, 0, missing))
279+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "moss_block", 1, 0, missing)).duration(8 * SECONDS).eut(2)
280+
.addTo(compressorRecipes);
281+
282+
GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "honeycomb", 4, 0, missing))
283+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "honeycomb_block", 1, 0, missing)).duration(8 * SECONDS)
284+
.eut(2).addTo(compressorRecipes);
285+
286+
GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "moss_carpet", 9, 0, missing))
287+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "moss_block", 1, 0, missing)).duration(8 * SECONDS).eut(2)
288+
.addTo(compressorRecipes);
289+
237290
GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "calcite", 1, 0, missing))
238291
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 9L)).duration(8 * SECONDS)
239292
.eut(2).addTo(hammerRecipes);
240293

294+
GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "leaves", 1, 1, missing))
295+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "pink_petals", 4, 0, missing)).duration(8 * SECONDS).eut(2)
296+
.addTo(hammerRecipes);
297+
298+
GTValues.RA.stdBuilder()
299+
.itemInputs(getModItem(BiomesOPlenty.ID, "misc", 1, 2, missing), GTUtility.getIntegratedCircuit(16))
300+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "honeycomb", 1, 0, missing)).eut(30).duration(10 * SECONDS)
301+
.addTo(chemicalDehydratorRecipes);
302+
303+
GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "honey_block", 1, 0, missing))
304+
.fluidOutputs(FluidRegistry.getFluidStack("for.honey", 1000)).duration(1 * MINUTES).eut(40)
305+
.addTo(fluidExtractionRecipes);
306+
307+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.glass_bottle, 1))
308+
.itemOutputs(getModItem(EtFuturumRequiem.ID, "honey_bottle", 1, 0, missing))
309+
.fluidInputs(FluidRegistry.getFluidStack("for.honey", 250)).duration(1).eut(1)
310+
.addTo(fluidCannerRecipes);
311+
312+
GTValues.RA.stdBuilder().itemInputs(getModItem(EtFuturumRequiem.ID, "honey_bottle", 1, 0, missing))
313+
.itemOutputs(new ItemStack(Items.glass_bottle, 1))
314+
.fluidOutputs(FluidRegistry.getFluidStack("for.honey", 250)).duration(2 * SECONDS).eut(2)
315+
.addTo(fluidCannerRecipes);
316+
241317
GTValues.RA.stdBuilder()
242318
.itemInputs(
243319
GTOreDictUnificator.get(OrePrefixes.dust, Materials.MelodicAlloy, 8L),
@@ -250,6 +326,19 @@ public void loadRecipes() {
250326
new FluidStack(FluidRegistry.getFluid("ender"), 1000))
251327
.duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes);
252328

329+
GTModHandler.addCraftingRecipe(
330+
GTModHandler.getModItem(EtFuturumRequiem.ID, "azalea", 1L, 1),
331+
bits,
332+
new Object[] { "AAA", "ABA", "AAA", 'A',
333+
GTModHandler.getModItem(EtFuturumRequiem.ID, "pink_petals", 1L, 0), 'B',
334+
GTModHandler.getModItem(EtFuturumRequiem.ID, "azalea", 1L, 0) });
335+
GTModHandler.addCraftingRecipe(
336+
GTModHandler.getModItem(EtFuturumRequiem.ID, "azalea", 1L, 0),
337+
bits,
338+
new Object[] { "AAA", "ABA", "AAA", 'A',
339+
GTModHandler.getModItem(EtFuturumRequiem.ID, "moss_block", 1L, 0), 'B',
340+
new ItemStack(Blocks.sapling, 1) });
341+
253342
new ResearchItem(
254343
"UNDYINGTOTEM",
255344
"NEWHORIZONS",

0 commit comments

Comments
 (0)