Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master authored Sep 3, 2024
2 parents 468c2a7 + c5af28b commit 8d23997
Show file tree
Hide file tree
Showing 198 changed files with 21,043 additions and 21,431 deletions.
14 changes: 7 additions & 7 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.45:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.58:dev")
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")

compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.6:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.51:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.7:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.52:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.6.33:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.9:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.14:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.4.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.8-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.2:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.3:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
compileOnly("com.github.GTNewHorizons:amunra:0.6.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.4-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.5-GTNH:dev")

Expand Down
217 changes: 108 additions & 109 deletions src/main/java/com/dreammaster/TwilightForest/TF_Loot_Chests.java
View file

Large diffs are not rendered by default.

128 changes: 64 additions & 64 deletions src/main/java/com/dreammaster/auxiliary/NEIGTNewHorizonsConfig.java
View file
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
View file
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));
}
}
3 changes: 1 addition & 2 deletions src/main/java/com/dreammaster/bartworksHandler/BWGlassAdder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
import static gregtech.api.enums.Mods.Botania;
import static gregtech.api.enums.Mods.IndustrialCraft2;

import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;

import bartworks.API.BorosilicateGlass;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.dreammaster.bartworksHandler;

import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes;
import static com.github.bartimaeusnek.bartworks.util.BWRecipes.calcDecayTicks;
import static gregtech.api.util.GT_RecipeConstants.DECAY_TICKS;
import static bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes;
import static bartworks.util.BWRecipes.calcDecayTicks;
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
Loading

0 comments on commit 8d23997

Please sign in to comment.