change: big refactor for new name and organisation

This commit is contained in:
ZtereoHYPE 2022-10-13 12:55:01 +02:00
parent 2ec1c5f329
commit 707e0279a1
14 changed files with 49 additions and 151 deletions

View file

@ -3,7 +3,7 @@ package codes.ztereohype.example;
import codes.ztereohype.example.sky.SkyManager;
import net.fabricmc.api.ModInitializer;
public class ExampleMod implements ModInitializer {
public class NicerSkies implements ModInitializer {
public static boolean toggle = true;
public static SkyManager skyManager = new SkyManager();

View file

@ -1,4 +1,4 @@
package codes.ztereohype.example;
package codes.ztereohype.example.core;
import java.awt.*;
import java.util.Map;

View file

@ -1,6 +1,6 @@
package codes.ztereohype.example.mixin;
import codes.ztereohype.example.ExampleMod;
import codes.ztereohype.example.NicerSkies;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.BufferBuilder;
import com.mojang.blaze3d.vertex.PoseStack;
@ -29,16 +29,16 @@ public abstract class MixinStarRendering {
@Inject(at = @At("HEAD"), method = "createStars", cancellable = true)
private void generateStars(CallbackInfo ci) {
ExampleMod.skyManager.generateSky(321L);
NicerSkies.skyManager.generateSky(321L);
starBuffer = new VertexBuffer();
ExampleMod.skyManager.tick(ticks, starBuffer);
NicerSkies.skyManager.tick(ticks, starBuffer);
ci.cancel();
}
@Inject(at = @At("HEAD"), method = "tick")
private void tickStars(CallbackInfo ci) {
if (this.level.getStarBrightness(0) < 0.0F) return;
ExampleMod.skyManager.tick(ticks, starBuffer);
NicerSkies.skyManager.tick(ticks, starBuffer);
}
@ModifyArg(
@ -58,6 +58,6 @@ public abstract class MixinStarRendering {
private void drawSkybox(PoseStack poseStack, Matrix4f projectionMatrix, float partialTick, Camera camera, boolean bl, Runnable skyFogSetup, CallbackInfo ci, FogType fogType, Vec3 vec3, float f, float g, float h, BufferBuilder bufferBuilder, ShaderInstance shaderInstance, float[] fs, float i, Matrix4f matrix4f2, float k, int r, int s, int m, float t, float o, float p, float q) {
// todo: the star brightness limits skybox's + skyboxes render during rain which is off.
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, level.getStarBrightness(0));
ExampleMod.skyManager.getSkybox().render(poseStack, projectionMatrix);
NicerSkies.skyManager.getSkybox().render(poseStack, projectionMatrix);
}
}

View file

@ -1,6 +1,6 @@
package codes.ztereohype.example.mixin.debug;
import codes.ztereohype.example.ExampleMod;
import codes.ztereohype.example.NicerSkies;
import net.minecraft.client.KeyboardHandler;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@ -13,8 +13,8 @@ public class MixinKeyboardHandler {
private void printKey(long windowPointer, int key, int scanCode, int action, int modifiers, CallbackInfo ci) {
// \ key, keydown action
if (key == 92 && action == 1) {
ExampleMod.skyManager.generateSky(321L);
ExampleMod.toggle = !ExampleMod.toggle;
NicerSkies.skyManager.generateSky(321L);
NicerSkies.toggle = !NicerSkies.toggle;
}
}
}

View file

@ -1,9 +1,8 @@
package codes.ztereohype.example.sky;
import codes.ztereohype.example.Gradient;
import codes.ztereohype.example.core.Gradient;
import codes.ztereohype.example.sky.nebula.NebulaSkyboxPainter;
import codes.ztereohype.example.sky.nebula.Skybox;
import codes.ztereohype.example.sky.nebula.StarSkyboxPainter;
import codes.ztereohype.example.sky.star.Starbox;
import com.mojang.blaze3d.vertex.VertexBuffer;
import lombok.Getter;

View file

@ -1,6 +1,6 @@
package codes.ztereohype.example.sky.nebula;
import codes.ztereohype.example.Gradient;
import codes.ztereohype.example.core.Gradient;
import net.minecraft.util.FastColor;
import net.minecraft.util.Mth;
import net.minecraft.world.level.levelgen.synth.PerlinNoise;

View file

@ -106,22 +106,22 @@ public class Skybox {
skyboxBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX);
// +z face
skyboxBuilder.vertex(-100F, -100F, 100F).uv(0.25f, 0.25f).endVertex();
skyboxBuilder.vertex(-100F, 100F, 100F).uv(0.25f, 0.5f).endVertex();
skyboxBuilder.vertex(100F, 100F, 100F).uv(0.5f, 0.5f).endVertex();
skyboxBuilder.vertex(100F, -100F, 100F).uv(0.5f, 0.25f).endVertex();
skyboxBuilder.vertex(-80F, -80F, 80F).uv(0.25f, 0.25f).endVertex();
skyboxBuilder.vertex(-80F, 80F, 80F).uv(0.25f, 0.5f).endVertex();
skyboxBuilder.vertex(80F, 80F, 80F).uv(0.5f, 0.5f).endVertex();
skyboxBuilder.vertex(80F, -80F, 80F).uv(0.5f, 0.25f).endVertex();
// -z face
skyboxBuilder.vertex(-100F, -100F, -100F).uv(0.75f, 0.25f).endVertex();
skyboxBuilder.vertex(100F, -100F, -100F).uv(1f, 0.25f).endVertex();
skyboxBuilder.vertex(100F, 100F, -100F).uv(1f, 0.5f).endVertex();
skyboxBuilder.vertex(-100F, 100F, -100F).uv(0.75f, 0.5f).endVertex();
skyboxBuilder.vertex(-80F, -80F, -80F).uv(0.75f, 0.25f).endVertex();
skyboxBuilder.vertex(80F, -80F, -80F).uv(1f, 0.25f).endVertex();
skyboxBuilder.vertex(80F, 80F, -80F).uv(1f, 0.5f).endVertex();
skyboxBuilder.vertex(-80F, 80F, -80F).uv(0.75f, 0.5f).endVertex();
// bottom face
skyboxBuilder.vertex(-100F, -100F, -100F).uv(0.5f, 0.5f).endVertex();
skyboxBuilder.vertex(-100F, -100F, 100F).uv(0.5f, 0.75f).endVertex();
skyboxBuilder.vertex(100F, -100F, 100F).uv(0.75f, 0.75f).endVertex();
skyboxBuilder.vertex(100F, -100F, -100F).uv(0.75f, 0.5f).endVertex();
skyboxBuilder.vertex(-80F, -80F, -80F).uv(0.5f, 0.5f).endVertex();
skyboxBuilder.vertex(-80F, -80F, 80F).uv(0.5f, 0.75f).endVertex();
skyboxBuilder.vertex(80F, -80F, 80F).uv(0.75f, 0.75f).endVertex();
skyboxBuilder.vertex(80F, -80F, -80F).uv(0.75f, 0.5f).endVertex();
// skyboxBuilder.vertex(-1F, -1F, -1F).uv(0f, 0f).endVertex();
// skyboxBuilder.vertex(-1F, -1F, 1F).uv(0f, 1f).endVertex();
@ -129,22 +129,22 @@ public class Skybox {
// skyboxBuilder.vertex(1F, -1F, -1F).uv(1f, 0f).endVertex();
// top face
skyboxBuilder.vertex(-100F, 100F, -100F).uv(0.5f, 0f).endVertex();
skyboxBuilder.vertex(100F, 100F, -100F).uv(0.75f, 0f).endVertex();
skyboxBuilder.vertex(100F, 100F, 100F).uv(0.75f, 0.25f).endVertex();
skyboxBuilder.vertex(-100F, 100F, 100F).uv(0.5f, 0.25f).endVertex();
skyboxBuilder.vertex(-80F, 80F, -80F).uv(0.5f, 0f).endVertex();
skyboxBuilder.vertex(80F, 80F, -80F).uv(0.75f, 0f).endVertex();
skyboxBuilder.vertex(80F, 80F, 80F).uv(0.75f, 0.25f).endVertex();
skyboxBuilder.vertex(-80F, 80F, 80F).uv(0.5f, 0.25f).endVertex();
// +x face
skyboxBuilder.vertex(100F, -100F, -100F).uv(0.5f, 0.25f).endVertex();
skyboxBuilder.vertex(100F, -100F, 100F).uv(0.75f, 0.25f).endVertex();
skyboxBuilder.vertex(100F, 100F, 100F).uv(0.75f, 0.5f).endVertex();
skyboxBuilder.vertex(100F, 100F, -100F).uv(0.5f, 0.5f).endVertex();
skyboxBuilder.vertex(80F, -80F, -80F).uv(0.5f, 0.25f).endVertex();
skyboxBuilder.vertex(80F, -80F, 80F).uv(0.75f, 0.25f).endVertex();
skyboxBuilder.vertex(80F, 80F, 80F).uv(0.75f, 0.5f).endVertex();
skyboxBuilder.vertex(80F, 80F, -80F).uv(0.5f, 0.5f).endVertex();
// -x face
skyboxBuilder.vertex(-100F, -100F, -100F).uv(0f, 0.25f).endVertex();
skyboxBuilder.vertex(-100F, 100F, -100F).uv(0f, 0.5f).endVertex();
skyboxBuilder.vertex(-100F, 100F, 100F).uv(0.25f, 0.5f).endVertex();
skyboxBuilder.vertex(-100F, -100F, 100F).uv(0.25f, 0.25f).endVertex();
skyboxBuilder.vertex(-80F, -80F, -80F).uv(0f, 0.25f).endVertex();
skyboxBuilder.vertex(-80F, 80F, -80F).uv(0f, 0.5f).endVertex();
skyboxBuilder.vertex(-80F, 80F, 80F).uv(0.25f, 0.5f).endVertex();
skyboxBuilder.vertex(-80F, -80F, 80F).uv(0.25f, 0.25f).endVertex();
skyboxBuffer.bind();
skyboxBuffer.upload(skyboxBuilder.end());

View file

@ -1,6 +1,6 @@
package codes.ztereohype.example.sky.nebula;
import codes.ztereohype.example.Gradient;
import codes.ztereohype.example.core.Gradient;
import net.minecraft.util.FastColor;
import net.minecraft.util.Mth;
import net.minecraft.world.level.levelgen.synth.PerlinNoise;

View file

@ -1,6 +1,6 @@
package codes.ztereohype.example.sky.star;
import codes.ztereohype.example.Gradient;
import codes.ztereohype.example.core.Gradient;
import com.mojang.blaze3d.vertex.*;
import net.minecraft.util.RandomSource;
import net.minecraft.world.level.levelgen.synth.ImprovedNoise;