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 Mar 2, 2025
2 parents 8d0826f + f122cd5 commit d658e47
Show file tree
Hide file tree
Showing 44 changed files with 1,749 additions and 962 deletions.
24 changes: 13 additions & 11 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.121:dev")
api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.155:dev")
api("com.github.GTNewHorizons:Yamcl:0.7.0:dev")
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")

implementation("com.github.GTNewHorizons:GTNHLib:0.6.10:dev")
implementation("com.github.GTNewHorizons:GTNHLib:0.6.11:dev")

compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.61:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.4:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.31:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.33:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.8-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.9-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
Expand All @@ -22,12 +22,14 @@ dependencies {
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.8.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.4-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev")
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.5-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.3:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.22-GTNH:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.1-GTNH:dev")
//compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false }

runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.2.1-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.2-GTNH:dev")

// Core unit testing platform
testImplementation(platform('org.junit:junit-bom:5.9.2'))
Expand Down
13 changes: 2 additions & 11 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,13 @@ generateGradleTokenClass = com.dreammaster.lib.BuildVersion
# Name of the token containing the project's current version to generate/replace.
gradleTokenVersion = VERSION

# [DEPRECATED] Mod ID replacement token.
gradleTokenModId =

# [DEPRECATED] Mod name replacement token.
gradleTokenModName =

# [DEPRECATED] Mod Group replacement token.
gradleTokenGroupName =

# [DEPRECATED]
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
# public static final String VERSION = "GRADLETOKEN_VERSION";
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...]).
# Leave these properties empty to skip individual token replacements.
replaceGradleTokenInFile =
# replaceGradleTokenInFile =

# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty.
Expand All @@ -80,7 +71,7 @@ apiPackage =
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
# There can be multiple files in a space-separated list.
# Example value: mymodid_at.cfg nei_at.cfg
accessTransformersFile =
accessTransformersFile = dreamcraft_at.cfg

# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
usesMixins = true
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions gradlew
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.32'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.33'
}


57 changes: 20 additions & 37 deletions src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ private void runAdditionalFuelRecipes() {

// super heavy -> heavy radox conversion
GTValues.RA.stdBuilder().itemOutputs().fluidInputs(RadoxSuperHeavy.getFluid(1000))
.fluidOutputs(RadoxHeavy.getFluid(2000)).duration(50 * MINUTES).eut(TierEU.RECIPE_UV).noOptimize()
.fluidOutputs(RadoxHeavy.getFluid(2000)).duration(50 * MINUTES).eut(TierEU.RECIPE_UV)
.addTo(centrifugeRecipes);

// heavy radox + Nq+ -> Nq*
Expand Down Expand Up @@ -270,8 +270,7 @@ private void bacterialVatRecipes() {
GTValues.RA.stdBuilder().itemInputs(AntimonyTrioxide.getDust(16), Osmium.getDust(16))
.special(BioItemList.getPetriDish(CultureSet.get("CombinedBac"))).fluidInputs(Oil.getFluid(20))
.fluidOutputs(Xenoxene.getFluid(20)).duration(3 * MINUTES).eut(TierEU.RECIPE_UEV).metadata(GLASS, 8)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand All @@ -282,8 +281,7 @@ private void bacterialVatRecipes() {
.special(BioItemList.getPetriDish(CultureSet.get("StemCellBac")))
.fluidInputs(GrowthMediumRaw.getFluid(8)).fluidOutputs(BioMediumRaw.getFluid(2)).duration(3 * MINUTES)
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 6)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand All @@ -294,8 +292,7 @@ private void bacterialVatRecipes() {
.special(BioItemList.getPetriDish(CultureSet.get("BioCellBac")))
.fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(5)).duration(3 * MINUTES)
.eut(TierEU.RECIPE_ZPM).metadata(GLASS, 7)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand All @@ -305,124 +302,110 @@ private void bacterialVatRecipes() {
.special(BioItemList.getPetriDish(CultureSet.get("BioCellBac")))
.fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(10)).duration(3 * MINUTES)
.eut(TierEU.RECIPE_UV).metadata(GLASS, 8)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Naquadria), true)).noOptimize().requiresCleanRoom()
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Naquadria), true)).requiresCleanRoom()
.addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Genetics.ID, "misc", 2L, 4))
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
.fluidInputs(GTModHandler.getDistilledWater(4L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 2)).duration(7 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_HV).metadata(GLASS, 4).noOptimize().addTo(bacterialVatRecipes);
.eut(TierEU.RECIPE_HV).metadata(GLASS, 4).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
.fluidInputs(GTModHandler.getDistilledWater(8L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 4)).duration(7 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_EV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
.fluidInputs(GTModHandler.getDistilledWater(16L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8)).duration(7 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_IV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8 * 9))
.duration(9 * (7 * SECONDS + 10 * TICKS)).eut(TierEU.RECIPE_IV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 4L, 0))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(4L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 2)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_HV).metadata(GLASS, 4)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(8L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 4)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_EV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(16L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8)).duration(15 * SECONDS)
.eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8 * 9)).duration(9 * 15 * SECONDS)
.eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(CustomItemList.MarsStoneDust.get(16L))
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
.fluidInputs(GTModHandler.getDistilledWater(4L))
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 1)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_EV).metadata(GLASS, 5)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
.fluidInputs(GTModHandler.getDistilledWater(8L))
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 2)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
.fluidInputs(GTModHandler.getDistilledWater(16L))
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4 * 9)).duration(9 * 30 * SECONDS)
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(4))
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
.fluidInputs(GTModHandler.getDistilledWater(4L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 1))
.duration(1 * MINUTES).eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
.fluidInputs(GTModHandler.getDistilledWater(8L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2))
.duration(1 * MINUTES).eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes);

GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
.fluidInputs(GTModHandler.getDistilledWater(8L * 9L))
.fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2 * 9)).duration(9 * MINUTES)
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
.addTo(bacterialVatRecipes);
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes);
}

private void bioLabRecipes() {
Expand Down
Loading

0 comments on commit d658e47

Please sign in to comment.