diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 34d6fdb..b7f479a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -31,7 +31,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11", "26.1", "26.2"] + version: ["1.8.9"] steps: - uses: actions/checkout@v6 diff --git a/CHANGELOG.md b/CHANGELOG.md index cde39ca..2080588 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,2 @@ -## 1.2.3 -- Fixed the game crashing on launch if you live in a timezone with a fractional UTC offset (e.g. UTC+05:30) -- Fixed some invalid API responses causing the game to crash \ No newline at end of file +## 1.3.0 +- Added support for Minecraft 26.3 \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 1edb3be..8f8117c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,21 +1,42 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import net.ornithemc.ploceus.api.PloceusGradleExtensionApi import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("dev.kikugie.loom-back-compat") id("org.jetbrains.kotlin.jvm") version "2.4.10" + id("net.fabricmc.fabric-loom-remap") version "1.17-SNAPSHOT" apply false + id("ploceus") version "1.17.4" apply false id("dev.deftu.gradle.bloom") version "0.2.0" id("me.modmuss50.mod-publish-plugin") version "2.2.0" } +val isOrnithe = stonecutter.current.version == "1.8.9" +val ploceus = if (isOrnithe) { + pluginManager.apply("net.fabricmc.fabric-loom-remap") + pluginManager.apply("ploceus") + + configurations.configureEach { + exclude(group = "org.lwjgl.lwjgl") + } + + extensions.getByType().apply { + setIntermediaryGeneration(2) + } +} else { + null +} + val modid: String = sc.properties["mod.id"] val modname: String = sc.properties["mod.name"] val modversion: String = sc.properties["mod.version"] val mcversion: String = sc.current.version +val mcDependencyVersion: String = sc.properties.getOrNull("deps.minecraft") ?: mcversion val versionrange: String = sc.properties["mod.mc_compat"] val loaderversion: String = sc.properties["deps.fabric_loader"] val oneconfigversion: String = sc.properties["deps.oneconfig"] +val loader = if (isOrnithe) "ornithe" else "fabric" version = "$modversion+$mcversion" base.archivesName = modid @@ -25,7 +46,7 @@ val requiredJava: JavaVersion = when { sc.current.parsed >= "1.20.5" -> JavaVersion.VERSION_21 sc.current.parsed >= "1.18" -> JavaVersion.VERSION_17 sc.current.parsed >= "1.17" -> JavaVersion.VERSION_16 - else -> JavaVersion.VERSION_1_8 + else -> JavaVersion.VERSION_25 } val compatibleVersions: List = sc.properties.rawOrNull("mod", "mc_releases") @@ -37,6 +58,7 @@ repositories { filter { groups.forEach(::includeGroup) } } + mavenLocal() mavenCentral() google() maven("https://repo.polyfrost.org/releases") { name = "Polyfrost Releases" } @@ -45,6 +67,9 @@ repositories { name = "Sonatype Snapshots" content { includeGroup("net.kyori") } } + maven("https://maven.cloverclient.com/releases") { + content { includeGroup("pl.tomgirl") } + } strictMaven("https://maven.deftu.dev/releases", "Deftu", "dev.deftu") strictMaven("https://maven.terraformersmc.com/", "TerraformersMC", "com.terraformersmc") strictMaven("https://maven.fabricmc.net/", "FabricMC", "net.fabricmc") @@ -53,20 +78,25 @@ repositories { } dependencies { - minecraft("com.mojang:minecraft:$mcversion") - loomx.applyMojangMappings() + minecraft("com.mojang:minecraft:$mcDependencyVersion") + if (isOrnithe) { + mappings(ploceus!!.layeredMappings { + mappings("net.ornithemc:feather-gen2:$mcversion+build.${sc.properties["feather_build"] as String}:v2") { + containsUnpick() + } + mappings(rootProject.file("mappings/feather-overrides.tiny")) + }) + testCompileOnly("net.ornithemc.osl-gen2:entrypoints:${sc.properties["deps.osl_entrypoints"] as String}") + } else { + loomx.applyMojangMappings() + } modImplementation("net.fabricmc:fabric-loader:$loaderversion") - modImplementation("org.polyfrost.oneconfig:$mcversion-fabric:$oneconfigversion") + modImplementation("org.polyfrost.oneconfig:$mcversion-$loader:$oneconfigversion") for (module in arrayOf("config", "config-impl", "internal", "ui")) { implementation("org.polyfrost.oneconfig:$module:$oneconfigversion") } - // only some versions need Fabric API - sc.properties.getOrNull("deps.fabric_api")?.let { - modImplementation("net.fabricmc.fabric-api:fabric-api:$it") - } - testImplementation("org.junit.jupiter:junit-jupiter:${sc.properties.get("deps.junit")}") testImplementation("net.fabricmc:fabric-loader-junit:$loaderversion") } @@ -189,7 +219,7 @@ publishMods { changelog = changelogs type = STABLE - modLoaders.add("fabric") + modLoaders.add(loader) dryRun = modrinthId == null || modrinthToken == null diff --git a/mappings/feather-overrides.tiny b/mappings/feather-overrides.tiny new file mode 100644 index 0000000..803096c --- /dev/null +++ b/mappings/feather-overrides.tiny @@ -0,0 +1,11 @@ +tiny 2 0 intermediary named +c net/minecraft/unmapped/C_24384787 net/minecraft/client/renderer/LevelRenderer +c net/minecraft/unmapped/C_28105876 net/minecraft/world/level/biome/Biome + m ()Z m_07177229 hasPrecipitation +c net/minecraft/unmapped/C_32220415 net/minecraft/server/Bootstrap + m ()V m_84022598 bootStrap +c net/minecraft/unmapped/C_34399650 net/minecraft/client/multiplayer/ClientLevel +c net/minecraft/unmapped/C_64041439 net/minecraft/world/level/Level + m (F)F m_31573274 getSkyDarken + m (F)F m_77661568 getRainLevel + m (F)F m_10970845 getThunderLevel diff --git a/settings.gradle.kts b/settings.gradle.kts index 4109ec7..fa02069 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,6 +3,7 @@ pluginManagement { mavenCentral() gradlePluginPortal() maven("https://maven.fabricmc.net/") + maven("https://maven.ornithemc.net/releases") maven("https://maven.kikugie.dev/releases") { name = "KikuGie Releases" } maven("https://maven.kikugie.dev/snapshots") { name = "KikuGie Snapshots" } maven("https://maven.deftu.dev/releases") @@ -22,9 +23,9 @@ plugins { stonecutter { create(rootProject) { - versions("1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11", "26.1", "26.2") + versions("1.8.9", "1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11", "26.1", "26.2", "26.3") - vcsVersion = "26.2" + vcsVersion = "26.3" } } diff --git a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_AllowWeatherEverywhere.java b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_AllowWeatherEverywhere.java index 1d3f609..becdc9c 100644 --- a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_AllowWeatherEverywhere.java +++ b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_AllowWeatherEverywhere.java @@ -6,11 +6,16 @@ //?} else if >=1.21.4 { /*import com.llamalad7.mixinextras.injector.ModifyReturnValue; import net.minecraft.client.renderer.WeatherEffectRenderer; -*///?} else { +*///?} elif >1.8.9 { /*import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.core.BlockPos; +*///?} else { +/*import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.world.biome.source.BiomeSource; *///?} import net.minecraft.world.level.biome.Biome; import org.polyfrost.polyweather.client.ClientWeatherManager; @@ -22,10 +27,12 @@ @Mixin(ClientLevel.class) //?} else if >=1.21.4 { /*@Mixin(WeatherEffectRenderer.class) -*///?} else { +*///?} elif >1.8.9 { /*@Mixin(LevelRenderer.class) -*///?} +*///?} else +//@Mixin(GameRenderer.class) public class Mixin_AllowWeatherEverywhere { + //? if >1.8.9 { //? if >=1.21.4 { @ModifyReturnValue(method = "getPrecipitationAt", at = @At("RETURN")) //?} else { @@ -45,6 +52,7 @@ private Biome.Precipitation changeWeather(/*? if >=1.21.4 {*/ Biome.Precipitatio return original/*? if <1.21.4 {*//*.call(instance, pos) *//*?}*/; } + //?} //? if <1.21.4 { /*@WrapOperation(method = "renderSnowAndRain", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/biome/Biome;hasPrecipitation()Z")) @@ -56,4 +64,15 @@ private boolean allowWeatherEverywhere(Biome instance, Operation origin return original.call(instance); } *///?} + + //? if =1.8.9 { + /*@WrapOperation(method = "renderSnowAndRain", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/biome/source/BiomeSource;adjustTemperatureForHeight(FI)F")) + private float changeWeather(BiomeSource instance, float temperature, int height, Operation original) { + if (PolyWeatherConfig.isEnabled()) { + return ClientWeatherManager.isSnowy() ? 0.0F : 0.15F; + } + + return original.call(instance, temperature, height); + } + *///?} } diff --git a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_CancelGroundParticles.java b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_CancelGroundParticles.java index 575d851..e02a109 100644 --- a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_CancelGroundParticles.java +++ b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_CancelGroundParticles.java @@ -7,8 +7,10 @@ import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.WeatherEffectRenderer; import net.minecraft.server.level.ParticleStatus; -*///?} else { +*///?} elif >1.8.9 { /*import net.minecraft.client.renderer.LevelRenderer; +*///?} else { +/*import net.minecraft.client.render.GameRenderer; *///?} import org.polyfrost.polyweather.client.ClientWeatherManager; import org.polyfrost.polyweather.client.PolyWeatherConfig; @@ -21,9 +23,10 @@ @Mixin(ClientLevel.class) //?} else if >=1.21.4 { /*@Mixin(WeatherEffectRenderer.class) -*///?} else { +*///?} elif >1.8.9 { /*@Mixin(LevelRenderer.class) -*///?} +*///?} else +//@Mixin(GameRenderer.class) public class Mixin_CancelGroundParticles { @Inject(method = /*? if >=26.2 {*/ "tickWeatherEffects" /*?} else if >=1.21.4 {*/ /*"tickRainParticles" *//*?} else {*/ /*"tickRain" *//*?}*/, at = @At("HEAD"), cancellable = true) private void cancelGroundParticles(/*? if >=1.21.4 <26.2 {*/ /*ClientLevel clientLevel, Camera camera, int m, ParticleStatus particleStatus, *//*?}*/ /*? if >=1.21.11 <26.2 {*/ /*int j, *//*?}*/ CallbackInfo ci) { diff --git a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_FixWorldColors.java b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_FixWorldColors.java index e1f89d8..b9a0aaf 100644 --- a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_FixWorldColors.java +++ b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_FixWorldColors.java @@ -4,10 +4,14 @@ import com.llamalad7.mixinextras.injector.ModifyReturnValue; import net.minecraft.world.attribute.WeatherAttributes; import net.minecraft.world.level.Level; -//?} else { +//?} elif >1.8.9 { /*import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.minecraft.client.multiplayer.ClientLevel; +*///?} else { +/*import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import net.minecraft.world.level.Level; *///?} import org.polyfrost.polyweather.client.ClientWeatherManager; import org.polyfrost.polyweather.client.PolyWeatherConfig; @@ -16,9 +20,10 @@ //? if >=1.21.11 { @Mixin(WeatherAttributes.WeatherAccess.class) -//?} else { +//?} elif >1.8.9 { /*@Mixin(ClientLevel.class) -*///?} +*///?} else +//@Mixin(Level.class) public /*? if >=1.21.11 {*/ interface /*?} else {*//* class *//*?}*/ Mixin_FixWorldColors { //? if >=1.21.11 { @ModifyReturnValue(method = "from", at = @At("RETURN")) @@ -38,7 +43,7 @@ public float thunderLevel() { } }; } - //?} else { + //?} elif >1.8.9 { /*@WrapOperation(method = {"getSkyColor", "getSkyDarken", "getCloudColor"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel;getRainLevel(F)F")) private float modifyPrecipitationStrength(ClientLevel instance, float delta, Operation original) { if (PolyWeatherConfig.isEnabled()) { @@ -56,5 +61,23 @@ private float modifyThunderStrength(ClientLevel instance, float delta, Operation return original.call(instance, delta); } + *///?} else { + /*@WrapOperation(method = {"getSkyColor", "getSkyDarken", "getCloudColor"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getRainLevel(F)F")) + private float modifyPrecipitationStrength(Level instance, float delta, Operation original) { + if (PolyWeatherConfig.isEnabled()) { + return ClientWeatherManager.getPrecipitationStrength(delta); + } + + return original.call(instance, delta); + } + + @WrapOperation(method = {"getSkyColor", "getSkyDarken", "getCloudColor"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getThunderLevel(F)F")) + private float modifyThunderStrength(Level instance, float delta, Operation original) { + if (PolyWeatherConfig.isEnabled()) { + return ClientWeatherManager.getStormStrength(delta); + } + + return original.call(instance, delta); + } *///?} } diff --git a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyPrecipitationStrength.java b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyPrecipitationStrength.java index 952bc22..68b01f5 100644 --- a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyPrecipitationStrength.java +++ b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyPrecipitationStrength.java @@ -8,9 +8,12 @@ //?} else if >=1.21.4 { /*import net.minecraft.client.renderer.WeatherEffectRenderer; import net.minecraft.world.level.Level; -*///?} else { +*///?} elif >1.8.9 { /*import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.LevelRenderer; +*///?} else { +/*import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.render.GameRenderer; *///?} import org.polyfrost.polyweather.client.ClientWeatherManager; import org.polyfrost.polyweather.client.PolyWeatherConfig; @@ -19,9 +22,10 @@ //? if >=1.21.4 { @Mixin(WeatherEffectRenderer.class) -//?} else { +//?} elif >1.8.9 { /*@Mixin(LevelRenderer.class) -*///?} +*///?} else +//@Mixin(GameRenderer.class) public class Mixin_ModifyPrecipitationStrength { @WrapOperation(method = /*? if >=1.21.10 {*/ "extractRenderState" /*?} else if >=1.21.4 {*/ /*"render(Lnet/minecraft/world/level/Level;Lnet/minecraft/client/renderer/MultiBufferSource;IFLnet/minecraft/world/phys/Vec3;)V" *//*?} else {*/ /*"renderSnowAndRain" *//*?}*/, at = @At(value = "INVOKE", target = /*? if >=26.2 {*/ "Lnet/minecraft/client/multiplayer/ClientLevel;getRainLevel(F)F" /*?} else if >=1.21.4 {*/ /*"Lnet/minecraft/world/level/Level;getRainLevel(F)F" *//*?} else {*/ /*"Lnet/minecraft/client/multiplayer/ClientLevel;getRainLevel(F)F" *//*?}*/)) private float modifyPrecipitationStrength(/*? if >=26.2 {*/ ClientLevel /*?} else if >=1.21.4 {*/ /*Level *//*?} else {*/ /*ClientLevel *//*?}*/ instance, float delta, Operation original) { diff --git a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyThunderStrength.java b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyThunderStrength.java index 5e91276..332cde5 100644 --- a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyThunderStrength.java +++ b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyThunderStrength.java @@ -7,8 +7,11 @@ import net.minecraft.client.renderer.fog.environment.AtmosphericFogEnvironment; //?} else if >=1.21.8 { /*import net.minecraft.client.renderer.fog.environment.AirBasedFogEnvironment; -*///?} else { +*///?} elif >1.8.9 { /*import net.minecraft.client.renderer.FogRenderer; +*///?} else { +/*import net.minecraft.client.render.GameRenderer; +import net.minecraft.world.level.Level; *///?} import org.polyfrost.polyweather.client.ClientWeatherManager; import org.polyfrost.polyweather.client.PolyWeatherConfig; @@ -19,12 +22,18 @@ @Mixin(AtmosphericFogEnvironment.class) //?} else if >=1.21.8 { /*@Mixin(AirBasedFogEnvironment.class) -*///?} else { +*///?} elif >1.8.9 { /*@Mixin(FogRenderer.class) -*///?} +*///?} else +//@Mixin(GameRenderer.class) public class Mixin_ModifyThunderStrength { + //? if >1.8.9 { @WrapOperation(method = /*? if >=1.21.8 {*/ "getBaseColor" /*?} else if >=1.21.4 {*/ /*"computeFogColor" *//*?} else {*/ /*"setupColor" *//*?}*/, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel;getThunderLevel(F)F")) private static float modifyThunderStrength(ClientLevel instance, float delta, Operation original) { + //?} else { + /*@WrapOperation(method = "setupClearColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getThunderLevel(F)F")) + private static float modifyThunderStrength(Level instance, float delta, Operation original) { + *///?} if (PolyWeatherConfig.isEnabled()) { return ClientWeatherManager.getStormStrength(delta); } diff --git a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyWeatherFog.java b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyWeatherFog.java index a4d3626..1e7054f 100644 --- a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyWeatherFog.java +++ b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ModifyWeatherFog.java @@ -5,8 +5,11 @@ import net.minecraft.client.multiplayer.ClientLevel; //? if >=1.21.8 { import net.minecraft.client.renderer.fog.environment.AtmosphericFogEnvironment; -//?} else { +//?} elif >1.8.9 { /*import net.minecraft.client.renderer.FogRenderer; +*///?} else { +/*import net.minecraft.client.render.GameRenderer; +import net.minecraft.world.level.Level; *///?} import org.polyfrost.polyweather.client.ClientWeatherManager; import org.polyfrost.polyweather.client.PolyWeatherConfig; @@ -15,12 +18,18 @@ //? if >=1.21.8 { @Mixin(AtmosphericFogEnvironment.class) -//?} else { +//?} elif >1.8.9 { /*@Mixin(FogRenderer.class) -*///?} +*///?} else +//@Mixin(GameRenderer.class) public class Mixin_ModifyWeatherFog { + //? if >1.8.9 { @WrapOperation(method = /*? if >=1.21.11 {*/ {"getBaseColor", "updateRainFogState"} /*?} else if >=1.21.8 {*/ /*"setupFog" *//*?} else >=1.21.4 {*/ /*"computeFogColor" *//*?} else {*//* "setupColor" *//*?}*/, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel;getRainLevel(F)F")) private static float modifyPrecipitationStrength(ClientLevel instance, float delta, Operation original) { + //?} else { + /*@WrapOperation(method = "setupClearColor", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getRainLevel(F)F")) + private static float modifyPrecipitationStrength(Level instance, float delta, Operation original) { + *///?} if (PolyWeatherConfig.isEnabled()) { return ClientWeatherManager.getPrecipitationStrength(delta); } diff --git a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_WeatherSound.java b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_WeatherSound.java index 08524eb..a94032c 100644 --- a/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_WeatherSound.java +++ b/src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_WeatherSound.java @@ -5,8 +5,10 @@ import net.minecraft.client.multiplayer.ClientLevel; //? if >=1.21.4 <26.2 { /*import net.minecraft.client.renderer.WeatherEffectRenderer; -*///?} else if <1.21.4 { +*///?} elif <1.21.4 >1.8.9 { /*import net.minecraft.client.renderer.LevelRenderer; +*///?} elif =1.8.9 { +/*import net.minecraft.client.render.GameRenderer; *///?} import org.polyfrost.polyweather.client.ClientWeatherManager; import org.polyfrost.polyweather.client.PolyWeatherConfig; @@ -17,9 +19,10 @@ @Mixin(ClientLevel.class) //?} else if >=1.21.4 { /*@Mixin(WeatherEffectRenderer.class) -*///?} else { +*///?} elif >1.8.9 { /*@Mixin(LevelRenderer.class) -*///?} +*///?} else +//@Mixin(GameRenderer.class) public class Mixin_WeatherSound { @WrapOperation(method = /*? if >=26.2 {*/ "tickWeatherEffects" /*?} else if >=1.21.4 {*/ /*"tickRainParticles" *//*?} else {*/ /*"tickRain" *//*?}*/, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel;getRainLevel(F)F")) private float modifyPrecipitationSoundStrength(ClientLevel instance, float delta, Operation original) { diff --git a/src/test/kotlin/org/polyfrost/polyweather/test/MixinTest.kt b/src/test/kotlin/org/polyfrost/polyweather/test/MixinTest.kt index 0d1406e..27af033 100644 --- a/src/test/kotlin/org/polyfrost/polyweather/test/MixinTest.kt +++ b/src/test/kotlin/org/polyfrost/polyweather/test/MixinTest.kt @@ -1,7 +1,12 @@ package org.polyfrost.polyweather.test +//? if > 1.8.9 import net.minecraft.SharedConstants import net.minecraft.server.Bootstrap +//? if = 1.8.9 { +/*import net.fabricmc.loader.api.FabricLoader +import net.ornithemc.osl.entrypoints.api.ModInitializer +*///?} import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test @@ -19,7 +24,15 @@ class MixinTest { @JvmStatic @BeforeAll fun setupEnvironment() { + //? if > 1.8.9 { SharedConstants.tryDetectVersion() + //?} else { + /*FabricLoader.getInstance().invokeEntrypoints( + ModInitializer.ENTRYPOINT_KEY, + ModInitializer::class.java, + ModInitializer::init, + ) + *///?} Bootstrap.bootStrap() } } diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml new file mode 100644 index 0000000..e403921 --- /dev/null +++ b/src/test/resources/log4j2.xml @@ -0,0 +1 @@ + diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts index a32e65d..e8a59ae 100644 --- a/stonecutter.gradle.kts +++ b/stonecutter.gradle.kts @@ -2,7 +2,7 @@ plugins { id("dev.kikugie.stonecutter") } -stonecutter active "26.2" /* [SC] DO NOT EDIT */ +stonecutter active "26.3" /* [SC] DO NOT EDIT */ stonecutter tasks { order("publishModrinth") diff --git a/stonecutter.properties.toml b/stonecutter.properties.toml index 6dfa942..b590c5b 100644 --- a/stonecutter.properties.toml +++ b/stonecutter.properties.toml @@ -1,16 +1,22 @@ mod.id = "polyweather" mod.name = "PolyWeather" mod.group = "org.polyfrost" -mod.version = "1.2.3" +mod.version = "1.3.0" deps.fabric_loader = "0.19.3" -deps.oneconfig = "1.0.7" +deps.oneconfig = "1.2.7" deps.junit = "6.1.2" loomx.loom_version = "1.17-SNAPSHOT" publish.modrinth = "r8Cr8YRg" +["1.8.9"] +mod.mc_compat = "1.8.9" +mod.mc_releases = ["1.8.9"] +feather_build = 1 +deps.osl_entrypoints = "0.6.1+mc13w16a-mc1.14.4" + ["1.21.1"] mod.mc_compat = "1.21.1" mod.mc_releases = ["1.21.1"] @@ -42,3 +48,7 @@ mod.mc_releases = ["26.1", "26.1.1", "26.1.2"] ["26.2"] mod.mc_compat = "~26.2" mod.mc_releases = ["26.2"] + +["26.3"] +mod.mc_compat = "~26.3" +mod.mc_releases = ["26.3"]