Skip to content

Commit 5f2b3ff

Browse files
committed
🐛 fix: allow weather everywhere
1 parent df893f0 commit 5f2b3ff

3 files changed

Lines changed: 33 additions & 61 deletions

File tree

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package org.polyfrost.polyweather.mixin.client;
22

3-
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
4-
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
53
//? if >=1.21.4 {
6-
import net.minecraft.client.multiplayer.ClientLevel;
4+
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
75
import net.minecraft.client.renderer.WeatherEffectRenderer;
8-
import org.polyfrost.polyweather.client.ClientWeatherManager;
96
//?} else {
10-
/*import net.minecraft.client.renderer.LevelRenderer;
11-
import net.minecraft.world.level.biome.Biome;
7+
/*import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
8+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
9+
import net.minecraft.client.renderer.LevelRenderer;
10+
import net.minecraft.core.BlockPos;
1211
*///?}
12+
import net.minecraft.world.level.biome.Biome;
13+
import org.polyfrost.polyweather.client.ClientWeatherManager;
1314
import org.polyfrost.polyweather.client.PolyWeatherConfig;
1415
import org.spongepowered.asm.mixin.Mixin;
1516
import org.spongepowered.asm.mixin.injection.At;
@@ -20,16 +21,34 @@
2021
/*@Mixin(LevelRenderer.class)
2122
*///?}
2223
public class Mixin_AllowWeatherEverywhere {
23-
@WrapOperation(method = /*? if >=1.21.4 {*/ "tickRainParticles" /*?} else {*/ /*"renderSnowAndRain" *//*?}*/, at = @At(value = "INVOKE", target = /*? if >=1.21.4 {*/ "Lnet/minecraft/client/multiplayer/ClientLevel;getRainLevel(F)F" /*?} else {*/ /*"Lnet/minecraft/world/level/biome/Biome;hasPrecipitation()Z" *//*?}*/))
24-
private /*? if >=1.21.4 {*/ float /*?} else {*/ /*boolean *//*?}*/ allowRainEverywhere(/*? if >=1.21.4 {*/ ClientLevel instance, float delta /*?} else {*/ /*Biome instance *//*?}*/, Operation</*? if >=1.21.4 {*/ Float /*?} else {*/ /*Boolean *//*?}*/> original) {
24+
//? if >=1.21.4 {
25+
@ModifyReturnValue(method = "getPrecipitationAt", at = @At("RETURN"))
26+
//?} else {
27+
/*@WrapOperation(method = "renderSnowAndRain", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/biome/Biome;getPrecipitationAt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/biome/Biome$Precipitation;"))
28+
*///?}
29+
private Biome.Precipitation changeWeather(/*? if >=1.21.4 {*/ Biome.Precipitation original /*?} else {*/ /*Biome instance, BlockPos pos, Operation<Biome.Precipitation> original *//*?}*/) {
30+
if (PolyWeatherConfig.isEnabled()) {
31+
if (ClientWeatherManager.isSnowy()) {
32+
return Biome.Precipitation.SNOW;
33+
} else if (ClientWeatherManager.isRainy()) {
34+
return Biome.Precipitation.RAIN;
35+
} else {
36+
return Biome.Precipitation.NONE;
37+
}
38+
}
39+
40+
41+
return original/*? if <1.21.4 {*//*.call(instance, pos) *//*?}*/;
42+
}
43+
44+
//? if <1.21.4 {
45+
/*@WrapOperation(method = "renderSnowAndRain", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/biome/Biome;hasPrecipitation()Z"))
46+
private boolean allowWeatherEverywhere(Biome instance, Operation<Boolean> original) {
2547
if (PolyWeatherConfig.isEnabled()) {
26-
//? if >=1.21.4 {
27-
return ClientWeatherManager.getPrecipitationStrength(delta);
28-
//?} else {
29-
/*return true;
30-
*///?}
48+
return true;
3149
}
3250
33-
return original.call(instance /*? if >=1.21.4 {*/, delta /*?}*/);
51+
return original.call(instance);
3452
}
53+
*///?}
3554
}

src/main/java/org/polyfrost/polyweather/mixin/client/Mixin_ForceSnow.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

src/main/resources/mixins.polyweather.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"client.Mixin_AllowWeatherEverywhere",
99
"client.Mixin_CancelGroundParticles",
1010
"client.Mixin_FixWorldColors",
11-
"client.Mixin_ForceSnow",
1211
"client.Mixin_ModifyPrecipitationStrength",
1312
"client.Mixin_ModifyThunderStrength"
1413
]

0 commit comments

Comments
 (0)