diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml deleted file mode 100644 index 4366fa96..00000000 --- a/.github/workflows/gradle.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Java CI with Gradle - -on: [ pull_request ] - -jobs: - build: - runs-on: ubuntu-22.04 - - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v2 - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 21 - check-latest: true - - name: Build with Gradle - run: ./gradlew build - - name: Upload Build Artifacts - uses: actions/upload-artifact@v4 - with: - name: 'Rubidium/Embeddium Extra Artifacts' - path: build/libs diff --git a/gradle.properties b/gradle.properties index 4627fe29..54071247 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,14 +11,14 @@ loom.platform = neoforge minecraft_version=1.21 yarn_mappings=1.21+build.1 yarn_patch=1.21+build.4 - loader_version=21.0.38-beta + loader_version=21.0.57-beta # Mod Properties - mod_version=0.5.7a + mod_version=0.5.7b maven_group=com.github.dima_dencep.mods archives_base_name=rubidium-extra # Dependencies - nanoliveconfig_version=2.2.0 + nanoliveconfig_version=2.3.0 oculus_version=1.20.1-1.6.9 - embeddium_version=1.0.3-git-b2dc012+mc1.21 + embeddium_version=1.0.5-git-81cc98b+mc1.21 diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java index b892cc33..386f0365 100644 --- a/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java +++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/SodiumExtraClientMod.java @@ -1,7 +1,5 @@ package me.flashyreese.mods.sodiumextra.client; -import static me.flashyreese.mods.sodiumextra.mixin.SodiumExtraMixinConfigPlugin.EMBEDDIUM_HACKED; - import me.flashyreese.mods.sodiumextra.client.gui.EmbeddiumExtendedOptions; import me.flashyreese.mods.sodiumextra.client.gui.SodiumExtraGameOptionPages; import me.flashyreese.mods.sodiumextra.client.gui.SodiumExtraGameOptions; @@ -16,6 +14,7 @@ import org.embeddedt.embeddium.api.OptionPageConstructionEvent; import org.embeddedt.embeddium.api.options.structure.StandardOptions; import org.embeddedt.embeddium.api.render.chunk.RenderSectionDistanceFilterEvent; +import org.embeddedt.embeddium.api.render.clouds.ModifyCloudRenderingEvent; @Mod(value = SodiumExtraClientMod.MOD_ID, dist = Dist.CLIENT) public class SodiumExtraClientMod { @@ -59,10 +58,10 @@ public static CaffeineConfig mixinConfig() { .addMixinOption("render.entity", true) .addMixinOption("sky", true) .addMixinOption("sky_colors", true) - .addMixinOption("sodium", true) + //.addMixinOption("sodium", true, true, true) //.addMixinOption("sodium.accessibility", true) in embeddium - // .addMixinOption("sodium.fog", true) via api - .addMixinOption("sodium.cloud", EMBEDDIUM_HACKED) + //.addMixinOption("sodium.fog", true) via api + //.addMixinOption("sodium.cloud", true) via api //.addMixinOption("sodium.resolution", true) via api //.addMixinOption("sodium.scrollable_page", true) in embeddium //.addMixinOption("sodium.vsync", true) via api @@ -116,5 +115,9 @@ public SodiumExtraClientMod() { RenderSectionDistanceFilterEvent.BUS.addListener(event -> { event.setFilter(ExtraRenderSectionDistanceFilter.INSTANCE); }); + + ModifyCloudRenderingEvent.BUS.addListener(event -> { + event.setCloudRenderDistance(event.getCloudRenderDistance() * SodiumExtraClientMod.options().extraSettings.cloudDistance / 100); + }); } } diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java index c1641048..c5baf713 100644 --- a/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java +++ b/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java @@ -501,7 +501,6 @@ public static OptionPage extra() { ) .add(OptionImpl.createBuilder(int.class, sodiumExtraOpts) .setId(SodiumExtraOptions.Option.EXTRA_CLOUD_DISTANCE) - .setEnabled(SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.sodium.cloud").isEnabled()) .setName(Text.translatable("sodium-extra.option.cloud_distance")) .setTooltip(Text.translatable("sodium-extra.option.cloud_distance.tooltip")) .setControl(option -> new SliderControl(option, 100, 300, 10, ControlValueFormatter.percentage())) diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java index 0f7a44d5..97f13b0a 100644 --- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java +++ b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/SodiumExtraMixinConfigPlugin.java @@ -9,28 +9,6 @@ public class SodiumExtraMixinConfigPlugin extends AbstractCaffeineConfigMixinPlugin { private static final String MIXIN_PACKAGE_ROOT = "me.flashyreese.mods.sodiumextra.mixin."; - public static boolean EMBEDDIUM_HACKED = false; - - static { - System.setProperty("embeddium.mixinTaintEnforceLevel", "WARN"); - - for (IExtension extension : MixinInternals.getExtensions().getActiveExtensions()) { - String extensionClass = extension.getClass().getName(); - - SodiumExtraClientMod.LOGGER.info("Try {}...", extensionClass); - - if (extensionClass.contains(".embeddium.")) { - MixinInternals.unregisterExtension(extension); - EMBEDDIUM_HACKED = true; - SodiumExtraClientMod.LOGGER.info("Embeddium hacked!"); - break; - } - } - - if (!EMBEDDIUM_HACKED) { - SodiumExtraClientMod.LOGGER.error("Embeddium NOT hacked!"); - } - } @Override protected CaffeineConfig createConfig() { diff --git a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/cloud/MixinCloudRenderer.java b/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/cloud/MixinCloudRenderer.java deleted file mode 100644 index 6069fc77..00000000 --- a/src/main/java/me/flashyreese/mods/sodiumextra/mixin/sodium/cloud/MixinCloudRenderer.java +++ /dev/null @@ -1,17 +0,0 @@ -package me.flashyreese.mods.sodiumextra.mixin.sodium.cloud; - -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import me.flashyreese.mods.sodiumextra.client.SodiumExtraClientMod; -import org.embeddedt.embeddium.impl.render.immediate.CloudRenderer; -import net.minecraft.client.option.GameOptions; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; - -@Mixin(CloudRenderer.class) -public class MixinCloudRenderer { - @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/GameOptions;getClampedViewDistance()I")) - public int modifyCloudRenderDistance(GameOptions instance, Operation original) { - return original.call(instance) * SodiumExtraClientMod.options().extraSettings.cloudDistance / 100; - } -} diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 2e0bd85e..87d9956e 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -29,7 +29,7 @@ side = "BOTH" [[dependencies.embeddium_extra]] modId = "embeddium" type = "required" -versionRange = "[1.0.3+mc1.21,)" +versionRange = "[1.0.4+mc1.21,)" ordering = "NONE" side = "CLIENT" diff --git a/src/main/resources/sodium-extra.mixins.json b/src/main/resources/sodium-extra.mixins.json index 86a4599c..896a0741 100644 --- a/src/main/resources/sodium-extra.mixins.json +++ b/src/main/resources/sodium-extra.mixins.json @@ -35,7 +35,6 @@ "render.entity.MixinPaintingEntityRenderer", "sky.MixinWorldRenderer", "sky_colors.MixinBiome", - "sodium.cloud.MixinCloudRenderer", "stars.MixinWorldRenderer", "steady_debug_hud.MixinDebugHud", "sun_moon.MixinWorldRenderer",