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.

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

First round of EFR recipe integration #1121

Merged
merged 12 commits into from
Dec 31, 2024
16 changes: 16 additions & 0 deletions src/main/java/com/dreammaster/recipes/RecipeRemover.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import static gregtech.api.enums.Mods.ElectroMagicTools;
import static gregtech.api.enums.Mods.EnderIO;
import static gregtech.api.enums.Mods.EnderZoo;
import static gregtech.api.enums.Mods.EtFuturumRequiem;
import static gregtech.api.enums.Mods.EternalSingularity;
import static gregtech.api.enums.Mods.ExtraBees;
import static gregtech.api.enums.Mods.ExtraTrees;
Expand Down Expand Up @@ -324,6 +325,21 @@ public static void run() {
bufferMap = new HashMap<>();
final long timeStart = System.currentTimeMillis();

if (EtFuturumRequiem.isModLoaded()) {
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "blast_furnace", 1, 0));
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "wooden_armorstand", 1, 0));
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "smoker", 1, 0));
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "end_crystal", 1, 0));
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "cherry_trapdoor", 1, 0));
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "smithing_table", 1, 0));
for (int i = 0; i < 16; i++) {
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "banner", 1, i));
}
for (int i = 0; i < 9; i++) {
removeRecipeByOutputDelayed(getModItem(EtFuturumRequiem.ID, "shulker_box_upgrade", 1, i));
}
}

// AUTOGENERATED FROM SCRIPTS

GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Sunnarium, 1L));
Expand Down
69 changes: 69 additions & 0 deletions src/main/java/com/dreammaster/scripts/ScriptEFR.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package com.dreammaster.scripts;

import static gregtech.api.enums.Mods.EtFuturumRequiem;
import static gregtech.api.enums.Mods.ExtraUtilities;
import static gregtech.api.enums.Mods.Minecraft;
import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.util.GTModHandler.getModItem;

import java.util.Arrays;
import java.util.List;

import com.dreammaster.recipes.CustomItem;

import gregtech.api.util.GTModHandler;

public class ScriptEFR implements IScriptLoader {

@Override
public String getScriptName() {
return "Et Futurum Requiem";
}

@Override
public List<String> getDependencies() {
return Arrays.asList(EtFuturumRequiem.ID, ExtraUtilities.ID, Thaumcraft.ID);
}

@Override
public void loadRecipes() {
long bits = GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE
| GTModHandler.RecipeBits.BUFFERED;
GTModHandler.addCraftingRecipe(
GTModHandler.getModItem(EtFuturumRequiem.ID, "observer", 1L),
bits,
new Object[] { "AEA", "BCD", "AAA", 'A', "cobblestone", 'B', "dustRedstone", 'C',
GTModHandler.getModItem(ExtraUtilities.ID, "budoff", 1, 0), 'D',
GTModHandler.getModItem(Minecraft.ID, "comparator", 1, 0), 'E', "gearGtSmallAnyIron" });

GTModHandler.addCraftingRecipe(
GTModHandler.getModItem(EtFuturumRequiem.ID, "cherry_trapdoor", 1L),
bits,
new Object[] { "ABA", "BCB", "ABA", 'A',
GTModHandler.getModItem(EtFuturumRequiem.ID, "wood_slab", 1L, 3), 'B', "stickWood", 'C',
"itemFlint" });

GTModHandler.addCraftingRecipe(
GTModHandler.getModItem(EtFuturumRequiem.ID, "cherry_trapdoor", 2L),
bits,
new Object[] { "ABA", "BCB", "ABA", 'A',
GTModHandler.getModItem(EtFuturumRequiem.ID, "wood_slab", 1L, 3), 'B', "stickWood", 'C',
"screwIron" });

GTModHandler.addCraftingRecipe(
GTModHandler.getModItem(EtFuturumRequiem.ID, "cherry_trapdoor", 3L),
bits,
new Object[] { "ABA", "BCB", "ABA", 'A',
GTModHandler.getModItem(EtFuturumRequiem.ID, "wood_slab", 1L, 3), 'B', "stickWood", 'C',
"screwSteel" });
for (int i = 0; i < 16; i++) {
addShapelessRecipe(
GTModHandler.getModItem(EtFuturumRequiem.ID, "banner", 1L, i),
new CustomItem.NBTItem(getModItem(Thaumcraft.ID, "blockWoodenDevice", 1, 8))
.setNBT("{color:" + i + "b}"));
addShapelessRecipe(
createItemStack(Thaumcraft.ID, "blockWoodenDevice", 1, 8, "{color:" + i + "b}", missing),
GTModHandler.getModItem(EtFuturumRequiem.ID, "banner", 1L, i));
}
}
}
1 change: 1 addition & 0 deletions src/main/java/com/dreammaster/scripts/ScriptLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public static void run() {
new ScriptComputronics(),
new ScriptCoreMod(),
new ScriptDraconicEvolution(),
new ScriptEFR(),
new ScriptEMT(),
new ScriptEnderIO(),
new ScriptEnderZoo(),
Expand Down
Loading