diff --git a/gradle.properties b/gradle.properties index 8a7ac1e2..10f454e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,23 +1,18 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx2G - # Fabric Properties # check these on https://fabricmc.net/versions.html minecraft_version=1.19 loader_version=0.14.6 fabric_version=0.55.2+1.19 - #Loom loom_version=0.12-SNAPSHOT - # Mod Properties -mod_version=2.0.0 +mod_version=2.0.1 maven_group=org.betterx.betterend archives_base_name=better-end - # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - -patchouli_version = 55-FABRIC-SNAPSHOT -bclib_version = 2.0.1 -rei_version = 9.0.472 +patchouli_version=55-FABRIC-SNAPSHOT +bclib_version=2.0.4 +rei_version=9.0.472 diff --git a/src/main/java/org/betterx/betterend/mixin/client/EndEffectsMixin.java b/src/main/java/org/betterx/betterend/mixin/client/EndEffectsMixin.java deleted file mode 100644 index eddd4405..00000000 --- a/src/main/java/org/betterx/betterend/mixin/client/EndEffectsMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.betterx.betterend.mixin.client; - -import org.betterx.betterend.integration.Integrations; - -import net.minecraft.client.renderer.DimensionSpecialEffects.EndEffects; -import net.minecraft.world.phys.Vec3; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(value = EndEffects.class, priority = 10) -public class EndEffectsMixin { - @Inject(method = "getBrightnessDependentFogColor", at = @At("HEAD"), cancellable = true) - private void be_restoreBrightness(Vec3 color, float sunHeight, CallbackInfoReturnable info) { - if (Integrations.ENDERSCAPE.modIsInstalled()) { - info.setReturnValue(color.scale(0.15000000596046448D)); - } - } - - @Inject(method = "isFoggyAt", at = @At("HEAD"), cancellable = true) - private void be_restoreFog(int camX, int camY, CallbackInfoReturnable info) { - if (Integrations.ENDERSCAPE.modIsInstalled()) { - info.setReturnValue(false); - } - } -} diff --git a/src/main/resources/betterend.mixins.client.json b/src/main/resources/betterend.mixins.client.json index 4cd420be..7d57e40f 100644 --- a/src/main/resources/betterend.mixins.client.json +++ b/src/main/resources/betterend.mixins.client.json @@ -1,23 +1,22 @@ { - "required": true, - "minVersion": "0.8", - "package": "org.betterx.betterend.mixin.client", - "compatibilityLevel": "JAVA_16", - "client": [ - "AbstractSoundInstanceAccessor", - "HumanoidMobRendererMixin", - "ArmorStandRendererMixin", - "MinecraftClientMixin", - "PlayerRendererMixin", - "MusicTrackerMixin", - "BiomeColorsMixin", - "LocalPlayerMixin", - "ModelLoaderMixin", - "EndEffectsMixin", - "CapeLayerMixin", - "ItemStackMixin" - ], - "injectors": { - "defaultRequire": 1 - } + "required": true, + "minVersion": "0.8", + "package": "org.betterx.betterend.mixin.client", + "compatibilityLevel": "JAVA_16", + "client": [ + "AbstractSoundInstanceAccessor", + "ArmorStandRendererMixin", + "BiomeColorsMixin", + "CapeLayerMixin", + "HumanoidMobRendererMixin", + "ItemStackMixin", + "LocalPlayerMixin", + "MinecraftClientMixin", + "ModelLoaderMixin", + "MusicTrackerMixin", + "PlayerRendererMixin" + ], + "injectors": { + "defaultRequire": 1 + } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d03edd76..0a720d27 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -44,7 +44,9 @@ "minecraft": "1.19", "bclib": "2.0.x" }, - "breaks": {"bclib": "<2.0.1"}, + "breaks": { + "bclib": "<2.0.3" + }, "suggests": { "byg": ">=1.1.3", "blockus": ">=2.0.2",