diff --git a/dependencies.gradle b/dependencies.gradle index 2f2fd0c..e3724fb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,24 +1,24 @@ dependencies { - api("com.github.GTNewHorizons:CraftTweaker:3.3.0:dev") + api("com.github.GTNewHorizons:CraftTweaker:3.3.1:dev") - compileOnly("com.azanor:Thaumcraft:1.7.10-4.2.3.5:deobf") { transitive = false } - compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-307-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Chisel:2.13.2-GTNH:api") { transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.8.1:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Mantle:0.4.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Railcraft:9.15.3:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.3-GTNH:api") { transitive = false } + compileOnly("curse.maven:thaumcraft-223628:2227552") { transitive = false } + compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-400-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Botania:1.11.0-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Chisel:2.14.1-GTNH:api") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.0:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Mantle:0.4.1:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Railcraft:9.15.8:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.0-GTNH:api") { transitive = false } compileOnly("curse.maven:botanical-addons-237152:2281663") { transitive = false } compileOnly("curse.maven:extra-utilities-225561:2264384") { transitive = false } compileOnly("curse.maven:thermal-expansion-69163:2388759") { transitive = false } + compileOnly("curse.maven:mekanism-268560:2475797") { transitive = false } compileOnly("exnihilo:Ex-Nihilo:1.38-53:deobf") { transitive = false } compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:api") { transitive = false } compileOnly("pneumaticCraft:PneumaticCraft-1.7.10:1.7.0-74:userdev") { transitive = false } compileOnly(deobf("https://media.forgecdn.net/files/2261/766/AuraCascade-557.jar")) compileOnly(deobf("https://media.forgecdn.net/files/2322/815/Metallurgy-1.7.10-4.0.9.148.jar")) compileOnly(deobf("https://media.forgecdn.net/files/2323/944/Mariculture-Deluxe-1.7.10-1.3.0-6.jar")) - compileOnly(deobf("https://s3.amazonaws.com/aidancbrady/mekanism/265/Mekanism-1.7.10-8.1.9.265.jar")) compileOnly(sourceSets.compileHelper.output) compileHelper(sourceSets.compileStubs.output) } diff --git a/gradle.properties b/gradle.properties index 0c9810b..18196b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,7 @@ channel = stable mappingsVersion = 12 # Defines other MCP mappings for dependency deobfuscation. -remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/ +remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/ # Select a default username for testing your mod. You can always override this per-run by running # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE. @@ -61,6 +61,9 @@ 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"; @@ -114,7 +117,7 @@ minimizeShadowedDependencies = true # If disabled, won't rename the shadowed classes. relocateShadowedDependencies = true -# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories. +# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. includeWellKnownRepositories = true # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. @@ -123,7 +126,7 @@ includeWellKnownRepositories = true usesMavenPublishing = true # Maven repository to publish the mod to. -# mavenPublishUrl = https://nexus.gtnewhorizons.com/repository/releases/ +# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/ # Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token. # @@ -187,5 +190,3 @@ customArchiveBaseName = ModTweaker2 # This is meant to be set in $HOME/.gradle/gradle.properties. # ideaCheckSpotlessOnBuild = true -# Non-GTNH properties -gradleTokenGroupName = diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index e8946ad..94c2daf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.8' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22' } diff --git a/src/main/java/modtweaker2/mods/mekanism/Mekanism.java b/src/main/java/modtweaker2/mods/mekanism/Mekanism.java index d1934fb..7ec5db6 100644 --- a/src/main/java/modtweaker2/mods/mekanism/Mekanism.java +++ b/src/main/java/modtweaker2/mods/mekanism/Mekanism.java @@ -20,8 +20,8 @@ import modtweaker2.mods.mekanism.handlers.Purification; import modtweaker2.mods.mekanism.handlers.Reaction; import modtweaker2.mods.mekanism.handlers.Sawmill; import modtweaker2.mods.mekanism.handlers.Separator; -import modtweaker2.mods.mekanism.handlers.SolarEvaporation; import modtweaker2.mods.mekanism.handlers.SolarNeutronActivator; +import modtweaker2.mods.mekanism.handlers.ThermalEvaporation; import modtweaker2.utils.TweakerPlugin; public class Mekanism extends TweakerPlugin { @@ -46,7 +46,7 @@ public class Mekanism extends TweakerPlugin { MineTweakerAPI.registerClass(Reaction.class); MineTweakerAPI.registerClass(Sawmill.class); MineTweakerAPI.registerClass(Separator.class); - MineTweakerAPI.registerClass(SolarEvaporation.class); + MineTweakerAPI.registerClass(ThermalEvaporation.class); MineTweakerAPI.registerClass(SolarNeutronActivator.class); } } diff --git a/src/main/java/modtweaker2/mods/mekanism/commands/MekanismLogger.java b/src/main/java/modtweaker2/mods/mekanism/commands/MekanismLogger.java index e3671ac..bec4a16 100644 --- a/src/main/java/modtweaker2/mods/mekanism/commands/MekanismLogger.java +++ b/src/main/java/modtweaker2/mods/mekanism/commands/MekanismLogger.java @@ -21,8 +21,8 @@ import mekanism.common.recipe.machines.PurificationRecipe; import mekanism.common.recipe.machines.SawmillRecipe; import mekanism.common.recipe.machines.SeparatorRecipe; import mekanism.common.recipe.machines.SmeltingRecipe; -import mekanism.common.recipe.machines.SolarEvaporationRecipe; import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mekanism.common.recipe.machines.ThermalEvaporationRecipe; import mekanism.common.recipe.machines.WasherRecipe; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; @@ -42,7 +42,7 @@ public class MekanismLogger implements ICommandFunction { validArguments.add("Crystallizer"); validArguments.add("Dissolution"); validArguments.add("Enrichment"); - validArguments.add("SolarEvaporation"); + validArguments.add("ThermalEvaporation"); validArguments.add("Infuser"); validArguments.add("Injection"); validArguments.add("SolarNeutronActivator"); @@ -260,12 +260,12 @@ public class MekanismLogger implements ICommandFunction { } } - if (args.isEmpty() || args.contains("SolarEvaporation")) { - for (SolarEvaporationRecipe recipe : (Collection) Recipe.SOLAR_EVAPORATION_PLANT + if (args.isEmpty() || args.contains("ThermalEvaporation")) { + for (ThermalEvaporationRecipe recipe : (Collection) Recipe.THERMAL_EVAPORATION_PLANT .get().values()) { MineTweakerAPI.logCommand( String.format( - "mods.mekanism.SolarEvaporation.addRecipe(%s, %s);", + "mods.mekanism.ThermalEvaporation.addRecipe(%s, %s);", LogHelper.getStackDescription(recipe.recipeInput.ingredient), LogHelper.getStackDescription(recipe.recipeOutput.output))); } diff --git a/src/main/java/modtweaker2/mods/mekanism/handlers/SolarEvaporation.java b/src/main/java/modtweaker2/mods/mekanism/handlers/ThermalEvaporation.java similarity index 84% rename from src/main/java/modtweaker2/mods/mekanism/handlers/SolarEvaporation.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/ThermalEvaporation.java index e7f4859..8dbfd02 100644 --- a/src/main/java/modtweaker2/mods/mekanism/handlers/SolarEvaporation.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/ThermalEvaporation.java @@ -10,7 +10,7 @@ import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.FluidInput; import mekanism.common.recipe.inputs.MachineInput; import mekanism.common.recipe.machines.MachineRecipe; -import mekanism.common.recipe.machines.SolarEvaporationRecipe; +import mekanism.common.recipe.machines.ThermalEvaporationRecipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IngredientAny; @@ -24,10 +24,10 @@ import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -@ZenClass("mods.mekanism.SolarEvaporation") -public class SolarEvaporation { +@ZenClass("mods.mekanism.ThermalEvaporation") +public class ThermalEvaporation { - public static final String name = "Mekanism Solar Evaporation"; + public static final String name = "Mekanism Thermal Evaporation"; ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -39,9 +39,9 @@ public class SolarEvaporation { return; } - SolarEvaporationRecipe recipe = new SolarEvaporationRecipe(toFluid(liquidInput), toFluid(liquidOutput)); + ThermalEvaporationRecipe recipe = new ThermalEvaporationRecipe(toFluid(liquidInput), toFluid(liquidOutput)); - MineTweakerAPI.apply(new AddMekanismRecipe(name, Recipe.SOLAR_EVAPORATION_PLANT.get(), recipe)); + MineTweakerAPI.apply(new AddMekanismRecipe(name, Recipe.THERMAL_EVAPORATION_PLANT.get(), recipe)); } ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -58,7 +58,7 @@ public class SolarEvaporation { Map recipes = new HashMap(); - for (Entry entry : ((Map) Recipe.SOLAR_EVAPORATION_PLANT + for (Entry entry : ((Map) Recipe.THERMAL_EVAPORATION_PLANT .get()).entrySet()) { ILiquidStack inputLiquid = InputHelper.toILiquidStack(entry.getKey().ingredient); ILiquidStack outputLiquid = InputHelper.toILiquidStack(entry.getValue().recipeOutput.output); @@ -70,7 +70,7 @@ public class SolarEvaporation { } if (!recipes.isEmpty()) { - MineTweakerAPI.apply(new RemoveMekanismRecipe(name, Recipe.SOLAR_EVAPORATION_PLANT.get(), recipes)); + MineTweakerAPI.apply(new RemoveMekanismRecipe(name, Recipe.THERMAL_EVAPORATION_PLANT.get(), recipes)); } else { LogHelper.logWarning( String.format(