Merge branch 'dev/0.8' of https://github.com/IntelligenceModding/AdvancedPeripherals into feat/keyboard

Author: zyxkad

build.gradle

@@ -3,17 +3,17 @@ import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import java.text.SimpleDateFormat
 
 plugins {
-    id "maven-publish"
+    id 'checkstyle'
+    id 'com.github.breadmoirai.github-release' version '2.5.2'
+    id 'com.modrinth.minotaur' version '2.+'
+    id 'java'
+    id 'maven-publish'
     id 'net.darkhax.curseforgegradle' version '1.1.16'
-    id 'org.jetbrains.changelog' version '1.2.1'
-    id "com.modrinth.minotaur" version "2.+"
-    id "org.jetbrains.kotlin.jvm" version "1.6.10"
     id 'net.minecraftforge.gradle' version '[6.0.18,6.2)'
+    id 'org.jetbrains.changelog' version '1.2.1'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.10'
     id 'org.parchmentmc.librarian.forgegradle' version '1.+'
     id 'org.spongepowered.mixin' version '0.7.+'
-    id "com.github.breadmoirai.github-release" version "2.5.2"
-    id 'checkstyle'
-    id 'java'
 }
 
 java {
@@ -213,8 +213,6 @@ repositories {
         name = "Create maven"
         url = "https://maven.tterrag.com/"
         content {
-            includeGroup("com.simibubi.create")
-            includeGroup("com.jozufozu.flywheel")
             includeGroup("com.tterrag.registrate")
         }
     }
@@ -338,8 +336,8 @@ dependencies {
     runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")
 
     // Create
-    compileOnly fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:all")
-    runtimeOnly fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:all")
+    compileOnly fg.deobf("curse.maven:create-328085:${create_version}")
+    runtimeOnly fg.deobf("curse.maven:create-328085:${create_version}")
 
     // DimStorage
     compileOnly fg.deobf("curse.maven:dimstorage-353882:${dimstorage_version}")
@@ -379,12 +377,16 @@ dependencies {
     compileOnly("org.joml:joml:1.10.4")
     compileOnly("org.joml:joml-primitives:1.10.0")
     // compileOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-common:${vs2_version}")
-    compileOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}")
+    compileOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}")  {
+        transitive = false
+    }
     compileOnly "org.valkyrienskies.core:api:${vs_core_version}"
     compileOnly "org.valkyrienskies.core:api-game:${vs_core_version}"
     compileOnly "org.valkyrienskies.core:util:${vs_core_version}"
     compileOnly "org.valkyrienskies.core:impl:${vs_core_version}"
-    runtimeOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}")
+    runtimeOnly fg.deobf("org.valkyrienskies:valkyrienskies-119-forge:${vs2_version}") {
+        transitive = false
+    }
     runtimeOnly fg.deobf("curse.maven:valkyrien-skies-258371:${valkyrien_skies_version}")
     runtimeOnly fg.deobf("curse.maven:eureka-ships-654384:${eureka_ships_version}")
     runtimeOnly fg.deobf("curse.maven:clockwork-807792:${clockwork_version}")

gradle.properties

@@ -11,7 +11,7 @@ mod_version=0.8r
 minecraft_version=1.19.2
 mod_artifact_suffix=
 
-forge_version=43.4.0
+forge_version=43.5.0
 loader_version=43
 
 release_type=release
@@ -36,7 +36,8 @@ appliedenergistics_version=12.9.12
 appliedmekanistics_version=4734608
 botania_version=1.19.2-440-FORGE
 clockwork_version=5171528
-create_version=0.5.1.f-46
+#v0.5.1
+create_version=5797604
 createca_version=5099757
 curios_version=1.19.2-5.1.4.1
 dimstorage_version=3927875

src/main/java/de/srendi/advancedperipherals/client/ClientRegistry.java

@@ -21,6 +21,7 @@
 import net.minecraftforge.client.event.ModelEvent;
 import net.minecraftforge.client.event.RegisterGuiOverlaysEvent;
 import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
+import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -74,7 +75,7 @@ public static void registeringRenderers(EntityRenderersEvent.RegisterRenderers e
         event.registerBlockEntityRenderer(APBlockEntityTypes.DISTANCE_DETECTOR.get(), DistanceDetectorRenderer::new);
     }
 
-    @SubscribeEvent
+    @SubscribeEvent(priority = EventPriority.LOWEST)
     public static void registeringOverlays(RegisterGuiOverlaysEvent event) {
         event.registerAboveAll(SaddleTurtleOverlay.ID, SADDLE_TURTLE_OVERLAY);
         event.registerAboveAll(OverlayModuleOverlay.ID, OVERLAY_MODULE_OVERLAY);

src/main/java/de/srendi/advancedperipherals/client/smartglasses/OverlayModuleLevelRenderer.java

@@ -11,7 +11,7 @@
 import de.srendi.advancedperipherals.client.RenderUtil;
 import de.srendi.advancedperipherals.client.smartglasses.objects.threedim.IThreeDObjectRenderer;
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.three_dim.ThreeDimensionalObject;
-import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.RenderableObject;
+import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.RenderableObject;
 import de.srendi.advancedperipherals.common.util.EnumColor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
@@ -65,7 +65,7 @@ public static void renderLevelState(RenderLevelStageEvent event) {
             }
 
             //TODO Everything below here is just for debugging and testing. Will be removed before we push to production
-            BlockPos blockPos = new BlockPos(2, 10, 0);
+            BlockPos blockPos = new BlockPos(2, 100, 0);
 
             float[] colors = EnumColor.DARK_PURPLE.getRgb();
 
@@ -87,7 +87,7 @@ public static void renderLevelState(RenderLevelStageEvent event) {
             posestack.pushPose();
             colors = EnumColor.WHITE.getRgb();
 
-            blockPos = new BlockPos(0, 10, 0);
+            blockPos = new BlockPos(0, 100, 0);
             posestack.translate(-view.x + blockPos.getX(), -view.y + blockPos.getY(), -view.z + blockPos.getZ());
 
             RenderUtil.drawSphere(posestack, boxVertexConsumer, 2f, 0f, 0f, 0f, 270f, 0f, 0f, colors[0], colors[1], colors[2], 0.4f, 16, 128);
@@ -101,7 +101,7 @@ public static void renderLevelState(RenderLevelStageEvent event) {
             posestack.pushPose();
 
             colors = EnumColor.WHITE.getRgb();
-            blockPos = new BlockPos(6, 10, 0);
+            blockPos = new BlockPos(6, 100, 0);
             posestack.translate(-view.x + blockPos.getX(), -view.y + blockPos.getY(), -view.z + blockPos.getZ());
 
             RenderUtil.drawTorus(posestack, boxVertexConsumer, 1f, 0.4f, 0f, 0f, 0f, 0f, 0f, 0f, colors[0], colors[1], colors[2], 1f, 48, 48);

src/main/java/de/srendi/advancedperipherals/client/smartglasses/OverlayModuleOverlay.java

@@ -2,14 +2,17 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import de.srendi.advancedperipherals.client.smartglasses.objects.twodim.ITwoDObjectRenderer;
-import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.RenderableObject;
+import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.RenderableObject;
+import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.RectangleObject;
+import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.TextObject;
 import net.minecraftforge.client.gui.overlay.ForgeGui;
 import net.minecraftforge.client.gui.overlay.IGuiOverlay;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 public class OverlayModuleOverlay implements IGuiOverlay {
     public static final String ID = "overlay_module_overlay";
@@ -18,28 +21,34 @@ public class OverlayModuleOverlay implements IGuiOverlay {
     public void render(ForgeGui gui, PoseStack poseStack, float partialTick, int screenWidth, int screenHeight) {
         poseStack.pushPose();
 
-        Map<Class<? extends RenderableObject>, List<RenderableObject>> batches = new HashMap<>();
+        Map<Integer, Map<Class<? extends RenderableObject>, List<RenderableObject>>> prioritizedBatches = new TreeMap<>();
 
         for (RenderableObject object : OverlayObjectHolder.getObjects()) {
-            if (!object.isEnabled() || !(object.getRenderObject() instanceof ITwoDObjectRenderer))
+            if (!object.isEnabled() || !(object.getRenderObject() instanceof ITwoDObjectRenderer)) {
                 continue;
+            }
 
+            // We need to sort the objects by their weight, some things can't be rendered before something else.
+            // For example, when texts are rendered before our circles, rectangles, etc., the other objects can't be transparent anymore
+            int weight = object.getRenderObject().getWeight();
             Class<? extends RenderableObject> objectClass = object.getClass();
 
-            if (batches.containsKey(objectClass)) {
-                batches.get(objectClass).add(object);
-                continue;
-            }
+            // Get or create the batch map for the current weight
+            Map<Class<? extends RenderableObject>, List<RenderableObject>> batchesForWeight = prioritizedBatches.computeIfAbsent(weight, k -> new HashMap<>());
 
-            List<RenderableObject> newBatchArray = new ArrayList<>();
-            newBatchArray.add(object);
-            batches.put(objectClass, newBatchArray);
-        }
+            List<RenderableObject> batch = batchesForWeight.computeIfAbsent(objectClass, k -> new ArrayList<>());
 
-        for (List<RenderableObject> batch : batches.values()) {
-            ((ITwoDObjectRenderer) batch.get(0).getRenderObject()).renderBatch(batch, gui, poseStack, partialTick, screenWidth, screenHeight);
+            batch.add(object);
         }
 
+        for (Map<Class<? extends RenderableObject>, List<RenderableObject>> batchesForWeight : prioritizedBatches.values()) {
+            for (List<RenderableObject> batch : batchesForWeight.values()) {
+
+                if (!batch.isEmpty()) {
+                    ((ITwoDObjectRenderer) batch.get(0).getRenderObject()).renderBatch(batch, gui, poseStack, partialTick, screenWidth, screenHeight);
+                }
+            }
+        }
         poseStack.popPose();
 
     }

src/main/java/de/srendi/advancedperipherals/client/smartglasses/OverlayObjectHolder.java

@@ -7,8 +7,9 @@
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.three_dim.TorusObject;
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.CircleObject;
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.ItemObject;
+import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.LineObject;
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.RectangleObject;
-import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.RenderableObject;
+import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.RenderableObject;
 import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.objects.two_dim.TextObject;
 
 import java.util.Collection;
@@ -49,6 +50,7 @@ public static void registerDecodeObjects() {
         ObjectDecodeRegistry.register(CircleObject.TYPE_ID, CircleObject::decode);
         ObjectDecodeRegistry.register(TextObject.TYPE_ID, TextObject::decode);
         ObjectDecodeRegistry.register(ItemObject.TYPE_ID, ItemObject::decode);
+        ObjectDecodeRegistry.register(LineObject.TYPE_ID, LineObject::decode);
 
         ObjectDecodeRegistry.register(BoxObject.TYPE_ID, BoxObject::decode);
         ObjectDecodeRegistry.register(BlockObject.TYPE_ID, BlockObject::decode);

src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/IObjectRenderer.java

@@ -1,4 +1,13 @@
 package de.srendi.advancedperipherals.client.smartglasses.objects;
 
 public interface IObjectRenderer {
+    /**
+     * Get the weight of the renderer. Lower weight means higher priority and it will render first.
+     * Some things need to be rendered before others to prevent color and opacity issues.
+     * @return the weight of the renderer.
+     */
+    default int getWeight() {
+        return 100;
+    }
+
 }

src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/threedim/BlockRenderer.java

@@ -36,7 +36,7 @@ public void renderBatch(List<ThreeDimensionalObject> batch, RenderLevelStageEven
             BlockObject block = (BlockObject) obj;
 
             poseStack.translate(-view.x + block.getX(), -view.y + block.getY(), -view.z + block.getZ());
-            poseStack.mulPose(new Quaternion(block.xRot, block.yRot, block.zRot, true));
+            poseStack.mulPose(new Quaternion(block.rotX, block.rotY, block.rotZ, true));
             poseStack.translate(-0.5f, -0.5f, -0.5f);
             float alpha = block.opacity;
             float red = RenderUtil.getRed(block.color);

src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/threedim/BoxRenderer.java

@@ -35,7 +35,7 @@ public void renderBatch(List<ThreeDimensionalObject> batch, RenderLevelStageEven
             float blue = RenderUtil.getBlue(box.color);
 
             poseStack.translate(-view.x + box.getX(), -view.y + box.getY(), -view.z + box.getZ());
-            RenderUtil.drawBox(poseStack, bufferBuilder, red, green, blue, alpha, box.x, box.y, box.z, obj.xRot, obj.yRot, obj.zRot, obj.maxX, obj.maxY, obj.maxZ);
+            RenderUtil.drawBox(poseStack, bufferBuilder, red, green, blue, alpha, box.x, box.y, box.z, obj.rotX, obj.rotY, obj.rotZ, obj.maxX, obj.maxY, obj.maxZ);
             BufferUploader.drawWithShader(bufferBuilder.end());
             onPostRender(obj);
 

src/main/java/de/srendi/advancedperipherals/client/smartglasses/objects/threedim/SphereRenderer.java

@@ -36,7 +36,7 @@ public void renderBatch(List<ThreeDimensionalObject> batch, RenderLevelStageEven
             float blue = RenderUtil.getRed(sphere.color);
 
             poseStack.translate(-view.x, -view.y, -view.z);
-            RenderUtil.drawSphere(poseStack, boxVertexConsumer, sphere.radius, sphere.x, sphere.y, sphere.z, sphere.xRot, sphere.yRot, sphere.zRot, red, green, blue, alpha, sphere.sectors, sphere.stacks);
+            RenderUtil.drawSphere(poseStack, boxVertexConsumer, sphere.radius, sphere.x, sphere.y, sphere.z, sphere.rotX, sphere.rotY, sphere.rotZ, red, green, blue, alpha, sphere.sectors, sphere.stacks);
             onPostRender(obj);
 
             poseStack.popPose();