Skip to content

Commit

Permalink
Merge branch 'master' into tc/recipe-trie
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master authored Sep 2, 2024
2 parents d5b8a12 + c0ee194 commit 533a397
Show file tree
Hide file tree
Showing 99 changed files with 2,921 additions and 741 deletions.
22 changes: 14 additions & 8 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
dependencies {
api("com.github.GTNewHorizons:StructureLib:1.3.4:dev")
api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.6.30-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.6.33-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughIds:2.1.0:dev")
api("com.github.GTNewHorizons:GTNHLib:0.4.8:dev")
api("com.github.GTNewHorizons:GTNHLib:0.4.9:dev")
api("com.github.GTNewHorizons:ModularUI:1.2.0:dev")
api("com.github.GTNewHorizons:ModularUI2:2.1.3-1.7.10:dev")
api("com.github.GTNewHorizons:waila:1.8.1:dev")
Expand All @@ -48,29 +48,35 @@ dependencies {
api("com.github.GTNewHorizons:Postea:1.0.9:dev")

compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev')
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.2-GTNH:dev")
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.5-GTNH:dev")
compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.6:dev")
implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
// Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath
compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}

runtimeOnlyNonPublishable('com.github.GTNewHorizons:ForestryMC:4.9.10:dev')
runtimeOnlyNonPublishable('com.github.GTNewHorizons:neiaddons:1.16.0:dev')
runtimeOnlyNonPublishable('com.github.GTNewHorizons:MagicBees:2.8.2-GTNH:dev')
runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.4.1:dev')
runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.8.17:dev')

devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.8.1-GTNH:dev")

compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.51:dev")
// this is required because forestry is an hidden hard dep, revert this if you fixed the hidden hard dep
implementation("com.github.GTNewHorizons:ForestryMC:4.9.7:dev") { transitive = false }
implementation("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false }

compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta4:api') { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.17:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.2-GTNH:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.11:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.12:dev") { transitive = false }

compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") {transitive = false}
compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
compileOnly('com.github.GTNewHorizons:VisualProspecting:1.2.11:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.10:dev') { transitive = false }

compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.1-GTNH:dev") { transitive = false }
implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.8-GTNH:dev")
Expand All @@ -85,7 +91,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev') { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150')
compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.21-GTNH:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.22-GTNH:dev") {transitive = false}
// https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953')
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.22-GTNH:dev') {transitive = false}
Expand All @@ -104,7 +110,7 @@ dependencies {
annotationProcessor("com.google.auto.value:auto-value:1.10.1")

// For testing iApiary
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.9.7:dev")
//runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.9.10:dev")

testImplementation(platform('org.junit:junit-bom:5.9.2'))
testImplementation('org.junit.jupiter:junit-jupiter')
Expand Down
45 changes: 44 additions & 1 deletion ...com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import static gregtech.api.util.GT_ModHandler.getModItem;
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;

import net.minecraft.item.ItemStack;

Expand All @@ -26,6 +27,7 @@
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;

public class ElectricImplosionCompressorRecipes implements Runnable {

Expand All @@ -43,7 +45,7 @@ public void run() {
.noOptimize()
.addTo(electricImplosionCompressorRecipes);

if (UniversalSingularities.isModLoaded())
if (UniversalSingularities.isModLoaded()) {
// Raw Exposed Optical Chip
GT_Values.RA.stdBuilder()
.itemInputs(
Expand All @@ -55,6 +57,29 @@ public void run() {
.eut(TierEU.RECIPE_UMV)
.noOptimize()
.addTo(electricImplosionCompressorRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
// fluxed electrum singularity
getModItem(UniversalSingularities.ID, "universal.general.singularity", 1L, 20))
.fluidInputs(MaterialsUEVplus.Mellion.getMolten(4 * 144L))
// spaghettic singularity
.itemOutputs(getModItem(EternalSingularity.ID, "combined_singularity", 1L, 2))
.duration(1 * SECONDS)
.eut(TierEU.RECIPE_UMV)
.addTo(electricImplosionCompressorRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(
// iron singularity
getModItem(Avaritia.ID, "Singularity", 1L, 0))
.fluidInputs(MaterialsUEVplus.Creon.getMolten(4 * 144L))
// cryptic singularity
.itemOutputs(getModItem(EternalSingularity.ID, "combined_singularity", 1L, 4))
.duration(1 * SECONDS)
.eut(TierEU.RECIPE_UMV)
.addTo(electricImplosionCompressorRecipes);
}
}

GT_Values.RA.stdBuilder()
Expand Down Expand Up @@ -124,6 +149,24 @@ public void run() {
.eut(TierEU.RECIPE_UIV)
.noOptimize()
.addTo(electricImplosionCompressorRecipes);

// Copper Singularity
GT_Values.RA.stdBuilder()
.fluidInputs(Materials.Copper.getMolten(3648 * 9 * 144L))
.itemOutputs(getModItem(Avaritia.ID, "Singularity", 1L, 5))
.duration(1 * TICKS)
.eut(TierEU.RECIPE_UIV)
.addTo(electricImplosionCompressorRecipes);

ItemStack diamondBlocks = GT_Utility
.copyAmountUnsafe(729, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Diamond, 1L));
// Diamond Singularity
GT_Values.RA.stdBuilder()
.itemInputs(diamondBlocks)
.itemOutputs(getModItem(UniversalSingularities.ID, "universal.vanilla.singularity", 1L, 2))
.duration(1 * TICKS)
.eut(TierEU.RECIPE_UIV)
.addTo(electricImplosionCompressorRecipes);
}
// MHDCSM V2
GT_Values.RA.stdBuilder()
Expand Down
4 changes: 2 additions & 2 deletions ...m/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,15 +422,15 @@ public static void run() {
.itemOutputs(WerkstoffLoader.MagnetoResonaticDust.get(gemChipped, 9))
.outputChances(90_00)
.fluidInputs(WerkstoffLoader.Neon.getFluidOrGas(1000))
.duration(3 * MINUTES + 45 * SECONDS)
.duration(25 * SECONDS)
.eut(TierEU.RECIPE_IV)
.addTo(autoclaveRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(WerkstoffLoader.MagnetoResonaticDust.get(dust))
.itemOutputs(WerkstoffLoader.MagnetoResonaticDust.get(gem))
.fluidInputs(WerkstoffLoader.Krypton.getFluidOrGas(1000))
.duration(3 * MINUTES + 45 * SECONDS)
.duration(25 * SECONDS)
.eut(TierEU.RECIPE_IV)
.addTo(autoclaveRecipes);

Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/github/technus/tectech/TecTech.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public void PostLoad(FMLPostInitializationEvent PostEvent) {
@SuppressWarnings("unused")
public void onLoadCompleted(FMLLoadCompleteEvent event) {
eyeOfHarmonyRecipeStorage = new EyeOfHarmonyRecipeStorage();
MainLoader.onLoadCompleted();
}

public static EyeOfHarmonyRecipeStorage eyeOfHarmonyRecipeStorage = null;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/github/technus/tectech/loader/MainLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.github.technus.tectech.TecTech;
import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
import com.github.technus.tectech.loader.recipe.BaseRecipeLoader;
import com.github.technus.tectech.loader.recipe.ResearchStationAssemblyLine;
import com.github.technus.tectech.loader.thing.CoverLoader;
import com.github.technus.tectech.loader.thing.MachineLoader;
import com.github.technus.tectech.loader.thing.ThingsLoader;
Expand Down Expand Up @@ -199,4 +200,8 @@ private static void adjustTwilightBlockResistance() {
safeSetResistance(GameRegistry.findBlock("TwilightForest", "tile.TFDeadrock"), 5);
}
}

public static void onLoadCompleted() {
new ResearchStationAssemblyLine().runLateRecipes();
}
}
Loading

0 comments on commit 533a397

Please sign in to comment.