chore: pre alpha 17

makes celestial display types also provide their draw location and size

Author: marcus8448

build.gradle.kts

@@ -15,7 +15,7 @@ val fabric = "0.37.1+1.17"
 val lba = "0.9.0"
 
 group = "dev.galacticraft"
-version ="0.4.0-prealpha.16+$mc"
+version ="0.4.0-prealpha.17+$mc"
 
 base.archivesName.set("GalacticraftAPI")
 

src/main/java/dev/galacticraft/api/universe/display/CelestialDisplay.java

@@ -29,6 +29,7 @@
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.Shader;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.Vector4f;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -37,7 +38,7 @@ public record CelestialDisplay<C extends CelestialDisplayConfig, T extends Celes
     public static final Codec<CelestialDisplay<?, ?>> CODEC = AddonRegistry.CELESTIAL_DISPLAY_TYPE.dispatch(CelestialDisplay::type, CelestialDisplayType::codec);
 
     @Environment(EnvType.CLIENT)
-    public void render(MatrixStack matrices, BufferBuilder buffer, int scale, double mouseX, double mouseY, float delta, Consumer<Supplier<Shader>> shaderSetter) {
-        this.type().render(matrices, buffer, scale, mouseX, mouseY, delta, shaderSetter, this.config());
+    public Vector4f render(MatrixStack matrices, BufferBuilder buffer, int scale, double mouseX, double mouseY, float delta, Consumer<Supplier<Shader>> shaderSetter) {
+        return this.type().render(matrices, buffer, scale, mouseX, mouseY, delta, shaderSetter, this.config());
     }
 }

src/main/java/dev/galacticraft/api/universe/display/CelestialDisplayType.java

@@ -28,18 +28,21 @@
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.Shader;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.Vector4f;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 public abstract class CelestialDisplayType<C extends CelestialDisplayConfig> {
     private final Codec<CelestialDisplay<C, CelestialDisplayType<C>>> codec;
+    public static final Vector4f NULL_VECTOR = new Vector4f(0, 0, 0, 0);
+
     public CelestialDisplayType(Codec<C> codec) {
         this.codec = codec.fieldOf("config").xmap((config) -> new CelestialDisplay<>(this, config), CelestialDisplay::config).codec();
     }
 
     @Environment(EnvType.CLIENT)
-    public abstract void render(MatrixStack matrices, BufferBuilder buffer, int size, double mouseX, double mouseY, float delta, Consumer<Supplier<Shader>> shaderSetter, C config);
+    public abstract Vector4f render(MatrixStack matrices, BufferBuilder buffer, int size, double mouseX, double mouseY, float delta, Consumer<Supplier<Shader>> shaderSetter, C config);
 
     public Codec<CelestialDisplay<C, CelestialDisplayType<C>>> codec() {
         return this.codec;

src/main/java/dev/galacticraft/impl/universe/display/type/EmptyCelestialDisplayType.java

@@ -27,6 +27,7 @@
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.Shader;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.Vector4f;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -39,6 +40,7 @@ private EmptyCelestialDisplayType() {
     }
 
     @Override
-    public void render(MatrixStack matrices, BufferBuilder buffer, int size, double mouseX, double mouseY, float delta, Consumer<Supplier<Shader>> shaderSetter, EmptyCelestialDisplayConfig config) {
+    public Vector4f render(MatrixStack matrices, BufferBuilder buffer, int size, double mouseX, double mouseY, float delta, Consumer<Supplier<Shader>> shaderSetter, EmptyCelestialDisplayConfig config) {
+        return NULL_VECTOR;
     }
 }

src/main/java/dev/galacticraft/impl/universe/display/type/IconCelestialDisplayType.java

@@ -32,6 +32,7 @@
 import net.minecraft.client.texture.AbstractTexture;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.Matrix4f;
+import net.minecraft.util.math.Vector4f;
 import org.lwjgl.opengl.GL32C;
 
 import java.util.function.Consumer;
@@ -45,7 +46,7 @@ protected IconCelestialDisplayType(Codec<IconCelestialDisplayConfig> codec) {
     }
 
     @Override
-    public void render(MatrixStack matrices, BufferBuilder buffer, int size, double mouseX, double mouseY, float delta, Consumer<Supplier<Shader>> shaderSetter, IconCelestialDisplayConfig config) {
+    public Vector4f render(MatrixStack matrices, BufferBuilder buffer, int size, double mouseX, double mouseY, float delta, Consumer<Supplier<Shader>> shaderSetter, IconCelestialDisplayConfig config) {
         shaderSetter.accept(GameRenderer::getPositionTexShader);
         Matrix4f model = matrices.peek().getModel();
         AbstractTexture texture = MinecraftClient.getInstance().getTextureManager().getTexture(config.texture());
@@ -60,5 +61,6 @@ public void render(MatrixStack matrices, BufferBuilder buffer, int size, double
         buffer.vertex(model, config.scale() * size, config.scale() * -size, 0).texture((config.u() + config.width()) / width, config.v() / height).next();
         buffer.end();
         BufferRenderer.draw(buffer);
+        return new Vector4f(config.scale() * -size, config.scale() * -size, (config.scale() * size) * 2, (config.scale() * size) * 2);
     }
 }