Merge remote-tracking branch 'origin/main'

# Conflicts:
#	gradle.properties
#	src/main/java/codes/ztereohype/nicerskies/mixin/LevelRendererMixin.java
#	src/main/java/codes/ztereohype/nicerskies/sky/nebula/SkyboxPainter.java
#	src/main/java/codes/ztereohype/nicerskies/sky/star/Star.java
#	src/main/resources/fabric.mod.json
This commit is contained in:
ZtereoHYPE 2023-06-03 01:38:12 +02:00
commit 820c6aa6e1
3 changed files with 6 additions and 6 deletions

View file

@ -37,10 +37,10 @@ dependencies {
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
// devenv mods
modRuntimeOnly "maven.modrinth:lazydfu:${project.lazydfu_version}"
modRuntimeOnly "maven.modrinth:starlight:${project.starlight_version}"
//modRuntimeOnly "maven.modrinth:lithium:${project.lithium_version}"
modRuntimeOnly "maven.modrinth:spark:${project.spark_version}"
// modRuntimeOnly "maven.modrinth:lazydfu:${project.lazydfu_version}"
// modRuntimeOnly "maven.modrinth:starlight:${project.starlight_version}"
// //modRuntimeOnly "maven.modrinth:lithium:${project.lithium_version}"
// modRuntimeOnly "maven.modrinth:spark:${project.spark_version}"
modRuntimeOnly include(fabricApi.module("fabric-command-api-v2", project.fabric_version))
modRuntimeOnly include(fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version))
modRuntimeOnly("com.terraformersmc:modmenu:${project.modmenu_version}") { transitive = false }

View file

@ -40,7 +40,7 @@ public class ConfigScreen extends Screen {
}
});
addRenderableWidget(new Checkbox(20, 84, 20, 20, Component.literal("Twinlke Stars"), cm.getTwinklingStars()) {
addRenderableWidget(new Checkbox(20, 84, 20, 20, Component.literal("Twinkle Stars"), cm.getTwinklingStars()) {
@Override
public void onPress() {
super.onPress();

View file

@ -53,7 +53,7 @@ public abstract class LevelRendererMixin {
@Inject(
method = "renderSky",
at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/BufferUploader;drawWithShader(Lcom/mojang/blaze3d/vertex/BufferBuilder$RenderedBuffer;)V", ordinal = 2, shift = At.Shift.AFTER),
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel;getStarBrightness(F)F", shift = At.Shift.BEFORE),
locals = LocalCapture.CAPTURE_FAILHARD
)
private void drawSkybox(PoseStack poseStack, Matrix4f matrix4f, float f, Camera camera, boolean bl, Runnable runnable, CallbackInfo ci, FogType fogType, Vec3 vec3, float g, float h, float i, BufferBuilder bufferBuilder, ShaderInstance shaderInstance, float[] fs, float j, Matrix4f matrix4f3, float l, int s, int t, int n, float u, float p, float q, float r) {