Skip to content

Commit

Permalink
fix coremod except intergalactic
Browse files Browse the repository at this point in the history
  • Loading branch information
NotAPenguin0 committed Sep 2, 2024
1 parent e042cc5 commit 1cd8d23
Show file tree
Hide file tree
Showing 193 changed files with 20,679 additions and 20,679 deletions.
210 changes: 105 additions & 105 deletions src/main/java/com/dreammaster/TwilightForest/TF_Loot_Chests.java

Large diffs are not rendered by default.

128 changes: 64 additions & 64 deletions src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,151 +15,151 @@

import codechicken.nei.api.API;
import codechicken.nei.api.IConfigureNEI;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GTModHandler;

public class NEIGTNewHorizonsConfig implements IConfigureNEI {

@Override
public void loadConfig() {
API.hideItem(new ItemStack(QuantumBread.Instance()));
if (Aroma1997Core.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(Aroma1997Core.ID, "wrenched", 1));
API.hideItem(GTModHandler.getModItem(Aroma1997Core.ID, "wrenched", 1));
}

if (BiblioCraft.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(BiblioCraft.ID, "BiblioClipboard", 1));
API.hideItem(GTModHandler.getModItem(BiblioCraft.ID, "BiblioClipboard", 1));
}

if (EnderZoo.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(EnderZoo.ID, "enderZooIcon", 1));
API.hideItem(GTModHandler.getModItem(EnderZoo.ID, "enderZooIcon", 1));
}

if (ExtraBees.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(ExtraBees.ID, "misc", 1, 19, missing));
API.hideItem(GT_ModHandler.getModItem(ExtraBees.ID, "misc", 1, 20, missing));
API.hideItem(GT_ModHandler.getModItem(ExtraBees.ID, "misc", 1, 21, missing));
API.hideItem(GT_ModHandler.getModItem(ExtraBees.ID, "misc", 1, 22, missing));
API.hideItem(GT_ModHandler.getModItem(ExtraBees.ID, "misc", 1, 23, missing));
API.hideItem(GT_ModHandler.getModItem(ExtraBees.ID, "misc", 1, 24, missing));
API.hideItem(GT_ModHandler.getModItem(ExtraBees.ID, "misc", 1, 25, missing));
API.hideItem(GTModHandler.getModItem(ExtraBees.ID, "misc", 1, 19, missing));
API.hideItem(GTModHandler.getModItem(ExtraBees.ID, "misc", 1, 20, missing));
API.hideItem(GTModHandler.getModItem(ExtraBees.ID, "misc", 1, 21, missing));
API.hideItem(GTModHandler.getModItem(ExtraBees.ID, "misc", 1, 22, missing));
API.hideItem(GTModHandler.getModItem(ExtraBees.ID, "misc", 1, 23, missing));
API.hideItem(GTModHandler.getModItem(ExtraBees.ID, "misc", 1, 24, missing));
API.hideItem(GTModHandler.getModItem(ExtraBees.ID, "misc", 1, 25, missing));
}

if (ExtraTrees.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(ExtraTrees.ID, "multifence", 1, 16387));
API.hideItem(GTModHandler.getModItem(ExtraTrees.ID, "multifence", 1, 16387));
}

if (ForgeRelocation.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(ForgeRelocation.ID, "relocation.blockmovingrow", 1));
API.hideItem(GTModHandler.getModItem(ForgeRelocation.ID, "relocation.blockmovingrow", 1));
}

if (GraviSuite.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(GraviSuite.ID, "BlockRelocatorPortal", 1));
API.hideItem(GTModHandler.getModItem(GraviSuite.ID, "BlockRelocatorPortal", 1));
}

if (HardcoreEnderExpansion.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "death_flower_pot", 1));
API.hideItem(GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "corrupted_energy_high", 1));
API.hideItem(GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "biome_core", 1));
API.hideItem(GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "corrupted_energy_low", 1));
API.hideItem(GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "enhanced_brewing_stand_block", 1));
API.hideItem(GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "temple_end_portal", 1));
API.hideItem(GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "laser_beam", 1));
API.hideItem(GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "item_special_effects", 1));
API.hideItem(GTModHandler.getModItem(HardcoreEnderExpansion.ID, "death_flower_pot", 1));
API.hideItem(GTModHandler.getModItem(HardcoreEnderExpansion.ID, "corrupted_energy_high", 1));
API.hideItem(GTModHandler.getModItem(HardcoreEnderExpansion.ID, "biome_core", 1));
API.hideItem(GTModHandler.getModItem(HardcoreEnderExpansion.ID, "corrupted_energy_low", 1));
API.hideItem(GTModHandler.getModItem(HardcoreEnderExpansion.ID, "enhanced_brewing_stand_block", 1));
API.hideItem(GTModHandler.getModItem(HardcoreEnderExpansion.ID, "temple_end_portal", 1));
API.hideItem(GTModHandler.getModItem(HardcoreEnderExpansion.ID, "laser_beam", 1));
API.hideItem(GTModHandler.getModItem(HardcoreEnderExpansion.ID, "item_special_effects", 1));
}

if (Mantle.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(Mantle.ID, "mantleBook", 1));
API.hideItem(GTModHandler.getModItem(Mantle.ID, "mantleBook", 1));
}

if (Thaumcraft.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(Thaumcraft.ID, "blockWarded", 1));
API.hideItem(GT_ModHandler.getModItem(Thaumcraft.ID, "blockEldritchNothing", 1));
API.hideItem(GTModHandler.getModItem(Thaumcraft.ID, "blockWarded", 1));
API.hideItem(GTModHandler.getModItem(Thaumcraft.ID, "blockEldritchNothing", 1));
}

if (ThaumicHorizons.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(ThaumicHorizons.ID, "vatInterior", 1));
API.hideItem(GT_ModHandler.getModItem(ThaumicHorizons.ID, "evanescent", 1));
API.hideItem(GT_ModHandler.getModItem(ThaumicHorizons.ID, "portalTH", 1));
API.hideItem(GT_ModHandler.getModItem(ThaumicHorizons.ID, "syringeInjection", 1, 1));
API.hideItem(GT_ModHandler.getModItem(ThaumicHorizons.ID, "syringeInjection", 1, 15));
API.hideItem(GT_ModHandler.getModItem(ThaumicHorizons.ID, "dummyVat", 1));
API.hideItem(GTModHandler.getModItem(ThaumicHorizons.ID, "vatInterior", 1));
API.hideItem(GTModHandler.getModItem(ThaumicHorizons.ID, "evanescent", 1));
API.hideItem(GTModHandler.getModItem(ThaumicHorizons.ID, "portalTH", 1));
API.hideItem(GTModHandler.getModItem(ThaumicHorizons.ID, "syringeInjection", 1, 1));
API.hideItem(GTModHandler.getModItem(ThaumicHorizons.ID, "syringeInjection", 1, 15));
API.hideItem(GTModHandler.getModItem(ThaumicHorizons.ID, "dummyVat", 1));
}

if (ThaumicMachina.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(ThaumicMachina.ID, "metaphysicalBrick", 1));
API.hideItem(GT_ModHandler.getModItem(ThaumicMachina.ID, "metaphysicalRose", 1));
API.hideItem(GT_ModHandler.getModItem(ThaumicMachina.ID, "wandCore", 1));
API.hideItem(GTModHandler.getModItem(ThaumicMachina.ID, "metaphysicalBrick", 1));
API.hideItem(GTModHandler.getModItem(ThaumicMachina.ID, "metaphysicalRose", 1));
API.hideItem(GTModHandler.getModItem(ThaumicMachina.ID, "wandCore", 1));
}

if (ThaumicTinkerer.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(ThaumicTinkerer.ID, "gaseousLight", 1));
API.hideItem(GT_ModHandler.getModItem(ThaumicTinkerer.ID, "gaseousShadow", 1));
API.hideItem(GT_ModHandler.getModItem(ThaumicTinkerer.ID, "infusedGrainBlock", 1));
API.hideItem(GT_ModHandler.getModItem(ThaumicTinkerer.ID, "nitorGas", 1));
API.hideItem(GTModHandler.getModItem(ThaumicTinkerer.ID, "gaseousLight", 1));
API.hideItem(GTModHandler.getModItem(ThaumicTinkerer.ID, "gaseousShadow", 1));
API.hideItem(GTModHandler.getModItem(ThaumicTinkerer.ID, "infusedGrainBlock", 1));
API.hideItem(GTModHandler.getModItem(ThaumicTinkerer.ID, "nitorGas", 1));
}
if (TwilightForest.isModLoaded()) {
for (int i = 5; i <= 15; i++) {
API.hideItem(GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFBossSpawner", 1, i));
API.hideItem(GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFTowerTranslucent", 1, i));
API.hideItem(GTModHandler.getModItem(TwilightForest.ID, "tile.TFBossSpawner", 1, i));
API.hideItem(GTModHandler.getModItem(TwilightForest.ID, "tile.TFTowerTranslucent", 1, i));
}
API.hideItem(GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFTrophy", 1));
API.hideItem(GT_ModHandler.getModItem(TwilightForest.ID, "tile.TFUncraftingTable", 1, 0, missing));
API.hideItem(GTModHandler.getModItem(TwilightForest.ID, "tile.TFTrophy", 1));
API.hideItem(GTModHandler.getModItem(TwilightForest.ID, "tile.TFUncraftingTable", 1, 0, missing));
}

if (WarpTheory.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(WarpTheory.ID, "blockVanish", 1));
API.hideItem(GTModHandler.getModItem(WarpTheory.ID, "blockVanish", 1));
}

if (AppliedEnergistics2.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockPaint", 1));
API.hideItem(GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockPaint", 1));
}

if (Chisel.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(Chisel.ID, "amber", 1));
API.hideItem(GT_ModHandler.getModItem(Chisel.ID, "bloodBrick", 1));
API.hideItem(GTModHandler.getModItem(Chisel.ID, "amber", 1));
API.hideItem(GTModHandler.getModItem(Chisel.ID, "bloodBrick", 1));
}
if (PamsHarvestCraft.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "ovenon", 1));
API.hideItem(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "churnon", 1));
API.hideItem(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "quernon", 1));
API.hideItem(GTModHandler.getModItem(PamsHarvestCraft.ID, "ovenon", 1));
API.hideItem(GTModHandler.getModItem(PamsHarvestCraft.ID, "churnon", 1));
API.hideItem(GTModHandler.getModItem(PamsHarvestCraft.ID, "quernon", 1));
}
if (MalisisDoors.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(MalisisDoors.ID, "null", 1));
API.hideItem(GTModHandler.getModItem(MalisisDoors.ID, "null", 1));
}

if (OpenSecurity.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(OpenSecurity.ID, "SecurityDoor", 1));
API.hideItem(GT_ModHandler.getModItem(OpenSecurity.ID, "SecurityDoorPrivate", 1));
API.hideItem(GTModHandler.getModItem(OpenSecurity.ID, "SecurityDoor", 1));
API.hideItem(GTModHandler.getModItem(OpenSecurity.ID, "SecurityDoorPrivate", 1));
}
if (SleepingBags.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(SleepingBags.ID, "sleepingBagBlock", 1));
API.hideItem(GTModHandler.getModItem(SleepingBags.ID, "sleepingBagBlock", 1));
}
if (BiomesOPlenty.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 9, missing));
API.hideItem(GT_ModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 8, missing));
API.hideItem(GT_ModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 5, missing));
API.hideItem(GT_ModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 7, missing));
API.hideItem(GT_ModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 6, missing));
API.hideItem(GTModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 9, missing));
API.hideItem(GTModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 8, missing));
API.hideItem(GTModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 5, missing));
API.hideItem(GTModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 7, missing));
API.hideItem(GTModHandler.getModItem(BiomesOPlenty.ID, "misc", 1, 6, missing));
}
if (MagicBees.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(MagicBees.ID, "capsule.magic", 1, wildcard, missing));
API.hideItem(GT_ModHandler.getModItem(MagicBees.ID, "capsule.void", 1, wildcard, missing));
API.hideItem(GTModHandler.getModItem(MagicBees.ID, "capsule.magic", 1, wildcard, missing));
API.hideItem(GTModHandler.getModItem(MagicBees.ID, "capsule.void", 1, wildcard, missing));
}

if (ForbiddenMagic.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(ForbiddenMagic.ID, "FMResource", 1, 1, missing));
API.hideItem(GTModHandler.getModItem(ForbiddenMagic.ID, "FMResource", 1, 1, missing));
}

if (Natura.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(Natura.ID, "barleyFood", 1, 8, missing));
API.hideItem(GTModHandler.getModItem(Natura.ID, "barleyFood", 1, 8, missing));
}

if (SGCraft.isModLoaded()) {
API.hideItem(GT_ModHandler.getModItem(SGCraft.ID, "sgControllerCrystal", 1, 0, missing));
API.hideItem(GTModHandler.getModItem(SGCraft.ID, "sgControllerCrystal", 1, 0, missing));
}

if (EnderIO.isModLoaded()) {
ItemStack creativeBank = GT_ModHandler.getModItem(EnderIO.ID, "blockCapBank", 1, 0, missing);
ItemStack creativeBank = GTModHandler.getModItem(EnderIO.ID, "blockCapBank", 1, 0, missing);
creativeBank.setTagInfo("type", new NBTTagString("CREATIVE"));
creativeBank.setTagInfo("storedEnergyRF", new NBTTagInt(2500000));
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/dreammaster/avaritia/AvaritiaHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
import net.minecraft.item.crafting.IRecipe;

import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
import gregtech.api.util.GT_Utility;
import gregtech.api.util.GTUtility;

public class AvaritiaHelper {

@SuppressWarnings("unchecked")
public static void removeExtremeCraftingRecipe(ItemStack output) {
ExtremeCraftingManager.getInstance().getRecipeList().removeIf(
r -> r instanceof IRecipe && GT_Utility.areStacksEqual(((IRecipe) r).getRecipeOutput(), output, true));
r -> r instanceof IRecipe && GTUtility.areStacksEqual(((IRecipe) r).getRecipeOutput(), output, true));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import static bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes;
import static bartworks.util.BWRecipes.calcDecayTicks;
import static gregtech.api.util.GT_RecipeConstants.DECAY_TICKS;
import static gregtech.api.util.GTRecipeConstants.DECAY_TICKS;

import net.minecraft.item.ItemStack;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.GTValues;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.minecraft.ItemUtils;

Expand All @@ -22,11 +22,11 @@ public static void runRadHatchAdder() {

int level = (int) material.getProtons();
if (material.getRod(1) != null && !material.getRod(1).isItemEqual(err)) {
GT_Values.RA.stdBuilder().itemInputs(material.getRod(1)).duration(1).eut(level)
GTValues.RA.stdBuilder().itemInputs(material.getRod(1)).duration(1).eut(level)
.metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes);
}
if (material.getLongRod(1) != null && !material.getLongRod(1).isItemEqual(err)) {
GT_Values.RA.stdBuilder().itemInputs(material.getLongRod(1)).duration(2).eut(level)
GTValues.RA.stdBuilder().itemInputs(material.getLongRod(1)).duration(2).eut(level)
.metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,37 @@
import static gregtech.api.enums.OrePrefixes.bolt;
import static gregtech.api.enums.OrePrefixes.dustTiny;
import static gregtech.api.recipe.RecipeMaps.implosionRecipes;
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;

import net.minecraftforge.fluids.FluidRegistry;

import com.dreammaster.gthandler.CustomItemList;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_RecipeConstants;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTRecipeConstants;

public class BW_Recipe_Loader implements Runnable {

@Override
public void run() {
GT_Values.RA.stdBuilder().itemInputs(CustomItemList.HeavyDutyAlloyIngotT4.get(1L))
GTValues.RA.stdBuilder().itemInputs(CustomItemList.HeavyDutyAlloyIngotT4.get(1L))
.itemOutputs(CustomItemList.HeavyDutyPlateTier4.get(1L), Ruridit.get(dustTiny, 4))
.metadata(GT_RecipeConstants.ADDITIVE_AMOUNT, 32).duration(1 * SECONDS).eut(TierEU.RECIPE_LV)
.metadata(GTRecipeConstants.ADDITIVE_AMOUNT, 32).duration(1 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(implosionRecipes);

GT_Values.RA.stdBuilder()
GTValues.RA.stdBuilder()
.metadata(
RESEARCH_ITEM,
GT_ModHandler.getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 0))
GTModHandler.getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 0))
.metadata(RESEARCH_TIME, 2 * MINUTES + 5 * SECONDS)
.itemInputs(
GT_ModHandler.getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 0),
GTModHandler.getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 0),
CustomItemList.IceCompressedPlate.get(3L),
CustomItemList.IceCompressedPlate.get(3L),
Ruridit.get(bolt, 4))
Expand Down
Loading

0 comments on commit 1cd8d23

Please sign in to comment.