Skip to content

Commit c6477b9

Browse files
committed
Updated sky properties
1 parent 1d90316 commit c6477b9

File tree

9 files changed

+37
-29
lines changed

9 files changed

+37
-29
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx1G
22
org.gradle.parallel = false
33
org.gradle.workers.max = 1
44

5-
version=7.2.0
5+
version=7.2.1
66
maven_group=net.ludocrypt
77
archives_base_name=limlib

limlib_effects/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx1G
22
org.gradle.parallel = false
33
org.gradle.workers.max = 1
44

5-
version=7.2.0
5+
version=7.2.1
66
maven_group=net.ludocrypt
77
archives_base_name=limlib-effects

limlib_effects/src/main/java/net/ludocrypt/limlib/effects/mixin/SkyPropertiesMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class SkyPropertiesMixin {
2222
if (key.isPresent()) {
2323
Optional<SkyEffects> sky = SkyEffects.SKY_EFFECTS.getOrEmpty(key.get().getValue());
2424
if (sky.isPresent()) {
25-
ci.setReturnValue(sky.get().getMemoizedSkyProperties().get());
25+
ci.setReturnValue(sky.get().getSkyProperties());
2626
}
2727
}
2828
}

limlib_effects/src/main/java/net/ludocrypt/limlib/effects/render/sky/SkyEffects.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import javax.annotation.Nullable;
66

7-
import com.google.common.base.Supplier;
87
import com.mojang.serialization.Codec;
98

109
import net.fabricmc.api.EnvType;
@@ -44,7 +43,7 @@ public abstract class SkyEffects {
4443
public abstract Codec<? extends SkyEffects> getCodec();
4544

4645
@Environment(EnvType.CLIENT)
47-
public abstract Supplier<SkyProperties> getMemoizedSkyProperties();
46+
public abstract SkyProperties getSkyProperties();
4847

4948
public abstract float getSkyShading();
5049

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package net.ludocrypt.limlib.effects.render.sky;
2+
3+
import net.fabricmc.api.EnvType;
4+
import net.fabricmc.api.Environment;
5+
import net.minecraft.client.render.SkyProperties;
6+
import net.minecraft.client.render.SkyProperties.SkyType;
7+
import net.minecraft.util.math.Vec3d;
8+
9+
@Environment(EnvType.CLIENT)
10+
public class SkyPropertiesCreator {
11+
12+
public static SkyProperties create(float cloudHeight, boolean alternateSkyColor, String skyType, boolean brightenLighting, boolean darkened, boolean thickFog) {
13+
return new SkyProperties(cloudHeight, alternateSkyColor, SkyType.valueOf(skyType), brightenLighting, darkened) {
14+
15+
@Override
16+
public Vec3d adjustFogColor(Vec3d color, float sunHeight) {
17+
return color;
18+
}
19+
20+
@Override
21+
public boolean useThickFog(int camX, int camY) {
22+
return thickFog;
23+
}
24+
25+
};
26+
}
27+
28+
}

limlib_effects/src/main/java/net/ludocrypt/limlib/effects/render/sky/StaticSkyEffects.java

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22

33
import java.util.Optional;
44

5-
import com.google.common.base.Supplier;
6-
import com.google.common.base.Suppliers;
75
import com.mojang.serialization.Codec;
86
import com.mojang.serialization.codecs.RecordCodecBuilder;
97

108
import net.fabricmc.api.EnvType;
119
import net.fabricmc.api.Environment;
1210
import net.minecraft.client.render.SkyProperties;
13-
import net.minecraft.client.render.SkyProperties.SkyType;
14-
import net.minecraft.util.math.Vec3d;
1511

1612
/**
1713
* A Sky effects controller
@@ -47,21 +43,6 @@ public class StaticSkyEffects extends SkyEffects {
4743
private final boolean thickFog;
4844
private final float skyShading;
4945

50-
@Environment(EnvType.CLIENT)
51-
private final Supplier<SkyProperties> memoizedSkyProperties = Suppliers.memoize(() -> new SkyProperties(this.getCloudHeight(), this.hasAlternateSkyColor(), SkyType.valueOf(this.getSkyType()), this.shouldBrightenLighting(), this.isDarkened()) {
52-
53-
@Override
54-
public Vec3d adjustFogColor(Vec3d color, float sunHeight) {
55-
return color;
56-
}
57-
58-
@Override
59-
public boolean useThickFog(int camX, int camY) {
60-
return StaticSkyEffects.this.hasThickFog();
61-
}
62-
63-
});
64-
6546
public StaticSkyEffects(Optional<Float> cloudHeight, boolean alternateSkyColor, String skyType, boolean brightenLighting, boolean darkened, boolean thickFog, float skyShading) {
6647
this.cloudHeight = cloudHeight;
6748
this.alternateSkyColor = alternateSkyColor;
@@ -102,8 +83,8 @@ public boolean hasThickFog() {
10283

10384
@Override
10485
@Environment(EnvType.CLIENT)
105-
public Supplier<SkyProperties> getMemoizedSkyProperties() {
106-
return memoizedSkyProperties;
86+
public SkyProperties getSkyProperties() {
87+
return SkyPropertiesCreator.create(getCloudHeight(), hasAlternateSkyColor(), getSkyType(), shouldBrightenLighting(), isDarkened(), hasThickFog());
10788
}
10889

10990
@Override

limlib_registry/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx1G
22
org.gradle.parallel = false
33
org.gradle.workers.max = 1
44

5-
version=7.2.0
5+
version=7.2.1
66
maven_group=net.ludocrypt
77
archives_base_name=limlib-registry

limlib_render/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx1G
22
org.gradle.parallel = false
33
org.gradle.workers.max = 1
44

5-
version=7.2.0
5+
version=7.2.1
66
maven_group=net.ludocrypt
77
archives_base_name=limlib-render

limlib_world/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx1G
22
org.gradle.parallel = false
33
org.gradle.workers.max = 1
44

5-
version=7.2.0
5+
version=7.2.1
66
maven_group=net.ludocrypt
77
archives_base_name=limlib-world

0 commit comments

Comments
 (0)