Skip to content

Commit

Permalink
Merge branch 'master' into close-window-dialog-fallback
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master authored Nov 24, 2024
2 parents 4356f58 + 3c3451b commit 369279d
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 43 deletions.
14 changes: 7 additions & 7 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
// Add your dependencies here

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

implementation("com.github.GTNewHorizons:GTNHLib:0.5.20:dev")

compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.8:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.9:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.6.35:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.25:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.4.27:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.14-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.15-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3: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.3-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.7:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.9: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.7.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.5-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.17:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")
compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.19:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.7-GTNH:dev")

runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.2.1-GTNH:dev")
Expand Down
26 changes: 16 additions & 10 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2359,11 +2359,14 @@ public void run() {
.itemInputs(
ItemList.Casing_Pipe_Bronze.get(1),
ItemList.Electric_Pump_LuV.get(2),
ItemList.Duct_Tape.get(4),
TRINIUM_NAQUADAH_CARBON.getComponentByPrefix(OrePrefixes.pipeMedium, 16),
HASTELLOY_X.getComponentByPrefix(OrePrefixes.pipeMedium, 16),
GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 32))
.fluidInputs(FluidRegistry.getFluidStack("pyrotheum", 2000))
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Invar, 8),
CustomItemList.MicaInsulatorFoil.get(64),
CustomItemList.MicaInsulatorFoil.get(64),
CustomItemList.MicaInsulatorFoil.get(64),
TRINIUM_NAQUADAH_CARBON.getComponentByPrefix(OrePrefixes.pipeMedium, 2),
HASTELLOY_X.getComponentByPrefix(OrePrefixes.pipeMedium, 2),
GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 2))
.fluidInputs(FluidRegistry.getFluidStack("pyrotheum", 16000))
.itemOutputs(ItemList.Heating_Duct_Casing.get(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_LuV)
.addTo(assemblerRecipes);

Expand All @@ -2372,11 +2375,14 @@ public void run() {
.itemInputs(
ItemList.Casing_Pipe_TungstenSteel.get(1),
ItemList.Electric_Pump_LuV.get(2),
ItemList.Duct_Tape.get(4),
TRINIUM_NAQUADAH_CARBON.getComponentByPrefix(OrePrefixes.pipeMedium, 16),
HASTELLOY_X.getComponentByPrefix(OrePrefixes.pipeMedium, 16),
GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 32))
.fluidInputs(FluidRegistry.getFluidStack("cryotheum", 2000))
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 8),
ItemList.Reactor_Coolant_Sp_3.get(1),
ItemList.Reactor_Coolant_Sp_3.get(1),
ItemList.Reactor_Coolant_Sp_3.get(1),
TRINIUM_NAQUADAH_CARBON.getComponentByPrefix(OrePrefixes.pipeMedium, 2),
HASTELLOY_X.getComponentByPrefix(OrePrefixes.pipeMedium, 2),
GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 2))
.fluidInputs(FluidRegistry.getFluidStack("cryotheum", 16000))
.itemOutputs(ItemList.Coolant_Duct_Casing.get(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_LuV)
.addTo(assemblerRecipes);

Expand Down
26 changes: 11 additions & 15 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_C276;
import static gtPlusPlus.core.material.MaterialsAlloy.HASTELLOY_X;
import static gtPlusPlus.core.material.MaterialsAlloy.STABALLOY;
import static tectech.thing.CustomItemList.DATApipe;
import static tectech.thing.CustomItemList.Machine_Multi_DataBank;
import static tectech.thing.CustomItemList.Machine_Multi_Switch;
Expand Down Expand Up @@ -1107,23 +1106,20 @@ public void run() {
GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Machine_Multi_IndustrialCompressor.get(1))
.metadata(RESEARCH_TIME, 1800 * SECONDS)
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.block, Materials.StellarAlloy, 64L),
ItemList.Heating_Duct_Casing.get(32L),
ItemList.Coolant_Duct_Casing.get(32L),
STABALLOY.getBlock(32),
GTModHandler.getIC2Item("mixedMetalIngot", 24L),
new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 },
ItemList.Electric_Piston_ZPM.get(8),
ItemList.Conveyor_Module_ZPM.get(4),
ItemList.Sensor_ZPM.get(2),
ItemList.Field_Generator_ZPM.get(1))
ItemList.Machine_Multi_IndustrialCompressor.get(4),
ItemList.Heating_Duct_Casing.get(4L),
ItemList.Coolant_Duct_Casing.get(4L),
GTOreDictUnificator.get(OrePrefixes.block, Materials.Naquadria, 4),
ItemList.Electric_Piston_ZPM.get(16),
ItemList.Robot_Arm_ZPM.get(4),
ItemList.Electric_Pump_ZPM.get(4),
new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 })
.itemOutputs(ItemList.Machine_Multi_HIPCompressor.get(1))
.fluidInputs(
Materials.Naquadria.getMolten(1152),
GGMaterial.incoloy903.getMolten(256 * 144),
Materials.NaquadahEnriched.getMolten(64 * 144),
Materials.LiquidAir.getFluid(16000),
Materials.Lubricant.getFluid(16000),
Materials.Neutronium.getMolten(1152))
Materials.Lubricant.getFluid(16000))
.duration(120 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(AssemblyLine);

GTValues.RA.stdBuilder().metadata(RESEARCH_ITEM, getModItem(Avaritia.ID, "Singularity", 1L, 0))
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ public void solderingMaterials() {
GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Circuit_Board_Phenolic_Good.get(1L),
GTModHandler.getModItem(IndustrialCraft2.ID, "itemPartCircuit", 1L, 0),
GTModHandler.getModItem(IndustrialCraft2.ID, "itemPartCircuit", 2L, 0),
ItemList.Circuit_Parts_Diode.get(2L),
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 2))
.itemOutputs(ItemList.Circuit_Good.get(1L)).fluidInputs(tMat.getMolten(144L * tMultiplier / 2L))
Expand Down
14 changes: 4 additions & 10 deletions src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4524,12 +4524,14 @@ private void golemancy() {
.add(Aspect.getAspect("instrumentum"), 9).add(Aspect.getAspect("meto"), 12)
.add(Aspect.getAspect("motus"), 6).add(Aspect.getAspect("praecantatio"), 3));
TCHelper.setResearchComplexity("CORELUMBER", 3);

TCHelper.removeArcaneRecipe(getModItem(Thaumcraft.ID, "GolemBell", 1, 0));
TCHelper.clearPages("GOLEMBELL");
TCHelper.addResearchPage("GOLEMBELL", new ResearchPage("tc.research_page.GOLEMBELL.1"));
TCHelper.addResearchPage("GOLEMBELL", new ResearchPage("tc.research_page.GOLEMBELL.2"));
ThaumcraftApi.addArcaneCraftingRecipe(
"GOLEMBELL",
createItemStack(Thaumcraft.ID, "GolemBell", 1, 0, "{markers:[0:{side:1b}]}", missing),
getModItem(Thaumcraft.ID, "GolemBell", 1, 0, missing),
new AspectList().add(Aspect.getAspect("ordo"), 10).add(Aspect.getAspect("aer"), 5),
"abc",
"def",
Expand All @@ -4554,15 +4556,7 @@ private void golemancy() {
"craftingToolFile");
TCHelper.addResearchPage(
"GOLEMBELL",
new ResearchPage(
TCHelper.findArcaneRecipe(
createItemStack(
Thaumcraft.ID,
"GolemBell",
1,
0,
"{markers:[0:{side:1b}]}",
missing))));
new ResearchPage(TCHelper.findArcaneRecipe(getModItem(Thaumcraft.ID, "GolemBell", 1, 0, missing))));
ThaumcraftApi.addArcaneCraftingRecipe(
"UPGRADEAIR",
getModItem(Thaumcraft.ID, "ItemGolemUpgrade", 1, 0, missing),
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/dreammaster/scripts/ScriptThaumicHorizons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public List<String> getDependencies() {
public void loadRecipes() {
TCHelper.removeArcaneRecipe(getModItem(ThaumicHorizons.ID, "boatGreatwood", 1, 0, missing));
TCHelper.removeArcaneRecipe(getModItem(ThaumicHorizons.ID, "boatThaumium", 1, 0, missing));
TCHelper.removeArcaneRecipe(getModItem(ThaumicHorizons.ID, "Golemancy Bell TH", 1, 0));
TCHelper.removeArcaneRecipe(getModItem(ThaumicHorizons.ID, "planarConduit", 1, 0, missing));
TCHelper.removeArcaneRecipe(getModItem(ThaumicHorizons.ID, "transductionAmplifier", 1, 0, missing));
TCHelper.removeInfusionRecipe(getModItem(ThaumicHorizons.ID, "vortexStabilizer", 1, 0, missing));
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/com/dreammaster/scripts/ScriptWarpTheory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
import static gregtech.api.enums.Mods.BiomesOPlenty;
import static gregtech.api.enums.Mods.BloodMagic;
import static gregtech.api.enums.Mods.Minecraft;
import static gregtech.api.enums.Mods.OpenBlocks;
import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.enums.Mods.ThaumicBases;
import static gregtech.api.enums.Mods.ThaumicExploration;
import static gregtech.api.enums.Mods.ThaumicTinkerer;
import static gregtech.api.enums.Mods.WarpTheory;
import static gregtech.api.enums.Mods.Witchery;
import static gregtech.api.util.GTModHandler.getModItem;
Expand Down Expand Up @@ -52,6 +55,7 @@ public void loadRecipes() {
TCHelper.removeInfusionRecipe(getModItem(WarpTheory.ID, "item.warptheory.cleanserminor", 1, 0, missing));
TCHelper.removeInfusionRecipe(getModItem(WarpTheory.ID, "item.warptheory.cleanser", 1, 0, missing));
TCHelper.removeInfusionRecipe(getModItem(WarpTheory.ID, "item.warptheory.amulet", 1, 0, missing));
TCHelper.removeInfusionRecipe(getModItem(WarpTheory.ID, "item.warptheory.portableshower", 1, 0, missing));
TCHelper.clearPrereq("warptheory.paper");
TCHelper.addResearchPrereq("warptheory.paper", "RESEARCHER2", false);
TCHelper.clearPages("warptheory.paper");
Expand Down Expand Up @@ -202,8 +206,38 @@ public void loadRecipes() {
.add(Aspect.getAspect("potentia"), 12).add(Aspect.getAspect("praecantatio"), 9)
.add(Aspect.getAspect("permutatio"), 6).add(Aspect.getAspect("terra"), 3));
TCHelper.setResearchComplexity("warptheory.amulet", 4);

TCHelper.orphanResearch("warptheory.portableshower");
TCHelper.clearPrereq("warptheory.portableshower");
TCHelper.addResearchPrereq("warptheory.portableshower", "PURETEAR", false);
ThaumcraftApi.addInfusionCraftingRecipe(
"warptheory.portableshower",
getModItem(WarpTheory.ID, "item.warptheory.portableshower", 1, 0, missing),
64,
new AspectList().add(Aspect.getAspect("custom1"), 16).add(Aspect.getAspect("custom5"), 16)
.add(Aspect.getAspect("aer"), 1024).add(Aspect.getAspect("aqua"), 1024)
.add(Aspect.getAspect("praecantatio"), 256).add(Aspect.getAspect("tutamen"), 256)
.add(Aspect.getAspect("cognitio"), 256).add(Aspect.getAspect("tutamen"), 256)
.add(Aspect.getAspect("sano"), 1024),
getModItem(WarpTheory.ID, "item.warptheory.amulet", 1, 0, missing),
new ItemStack[] { getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 1, missing),
getModItem(Thaumcraft.ID, "blockStoneDevice", 1, 12, missing),
getModItem(ThaumicExploration.ID, "everfullUrn", 1, 0, missing),
getModItem(Thaumcraft.ID, "ItemGolemCore", 1, 0, missing),
getModItem(OpenBlocks.ID, "sprinkler", 1, 0, missing),
GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 1L),
getModItem(OpenBlocks.ID, "xpshower", 1, 0, missing),
getModItem(Thaumcraft.ID, "ItemEldritchObject", 1L, 3),
GTOreDictUnificator.get(OrePrefixes.plateSuperdense, Materials.Ichorium, 1L) });
TCHelper.setResearchAspects(
"warptheory.portableshower",
new AspectList().add(Aspect.getAspect("custom1"), 5).add(Aspect.getAspect("custom3"), 5)
.add(Aspect.getAspect("potentia"), 32).add(Aspect.getAspect("praecantatio"), 20)
.add(Aspect.getAspect("aqua"), 32).add(Aspect.getAspect("aer"), 32));
TCHelper.setResearchComplexity("warptheory.portableshower", 4);
TCHelper.refreshResearchPages("warptheory.paper");
TCHelper.refreshResearchPages("warptheory.something");
TCHelper.refreshResearchPages("warptheory.amulet");
TCHelper.refreshResearchPages("warptheory.portableshower");
}
}

0 comments on commit 369279d

Please sign in to comment.