fix 1.19.4

ModProg · ModProg · commit ccfcd0b6a3d3 · 2023-03-31T17:56:23.000+02:00
diff --git a/src/main/java/win/baruna/blockmeter/BlockMeterClient.java b/src/main/java/win/baruna/blockmeter/BlockMeterClient.java
@@ -1,19 +1,13 @@
 package win.baruna.blockmeter;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.lwjgl.glfw.GLFW;
-
 import io.netty.buffer.Unpooled;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.ConfigManager;
 import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
@@ -35,10 +29,16 @@
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
+import org.lwjgl.glfw.GLFW;
 import win.baruna.blockmeter.gui.OptionsGui;
 import win.baruna.blockmeter.gui.SelectBoxGui;
 import win.baruna.blockmeter.measurebox.ClientMeasureBox;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class BlockMeterClient implements ClientModInitializer {
     /**
      * Currently running Instance of BlockMeterClient
@@ -47,7 +47,7 @@ public class BlockMeterClient implements ClientModInitializer {
 
     /**
      * Accessor for the BlockMeterClient Instance
-     * 
+     *
      * @return running Instance of BlockMeterClient
      */
     public static BlockMeterClient getInstance() {
@@ -61,7 +61,7 @@ public static BlockMeterClient getInstance() {
 
     /**
      * Accessor for the ModConfigManager
-     * 
+     *
      * @return ConfigManager for handling the Config
      */
     public static ConfigManager<ModConfig> getConfigManager() {
@@ -124,6 +124,7 @@ public void disable() {
     public void reset() {
         otherUsersBoxes = null;
         boxes.clear();
+        disable();
 
         // Resets Color to always start with white in an other world
         ModConfig cfg = confMgr.getConfig();
@@ -220,7 +221,7 @@ public void onConnected() {
 
     /**
      * Returns the currently active box
-     * 
+     *
      * @return currently open box or null if none
      */
     public ClientMeasureBox getCurrentBox() {
@@ -260,8 +261,7 @@ public void onInitializeClient() {
                     currentItem = itemStack.getItem();
                     e.player.sendMessage(
                             Text.translatable("blockmeter.toggle.on",
-                                    new Object[] {
-                                            Text.translatable(itemStack.getTranslationKey(), new Object[0]) }),
+                                    Text.translatable(itemStack.getTranslationKey(), new Object[0])),
                             true);
                 }
             }
@@ -287,15 +287,16 @@ public void onInitializeClient() {
 
         UseBlockCallback.EVENT
                 .register((playerEntity, world, hand, hitResult) -> this.onBlockMeterClick(playerEntity, hitResult));
+        ClientPlayConnectionEvents.DISCONNECT.register((_a, _b) -> this.onDisconnected());
     }
 
     /**
      * Handles the right click Event for creating and confirming new Measuring-Boxes
-     * 
+     *
      * @param playerEntity the player object
      * @param hitResult
      * @return PASS if not active or wrong item, FAIL when successful, to not send
-     *         the event to the server
+     * the event to the server
      */
     private ActionResult onBlockMeterClick(final PlayerEntity playerEntity, final BlockHitResult hitResult) {
         if (!this.active) {
@@ -310,16 +311,16 @@ private ActionResult onBlockMeterClick(final PlayerEntity playerEntity, final Bl
                 if (Screen.hasShiftDown()) {
                     ClientMeasureBox[] boxes = findBoxes(block);
                     switch (boxes.length) {
-                    case 0:
-                        break;
-                    case 1:
-                        boxes[0].loosenCorner(block);
-                        break;
-                    default:
-                        this.selectBoxGui.setBoxes(boxes);
-                        this.selectBoxGui.setBlock(block);
-                        MinecraftClient.getInstance().setScreen((Screen) this.selectBoxGui);
-                        break;
+                        case 0:
+                            break;
+                        case 1:
+                            boxes[0].loosenCorner(block);
+                            break;
+                        default:
+                            this.selectBoxGui.setBoxes(boxes);
+                            this.selectBoxGui.setBlock(block);
+                            MinecraftClient.getInstance().setScreen((Screen) this.selectBoxGui);
+                            break;
                     }
                 } else {
                     final ClientMeasureBox box = ClientMeasureBox.getBox(block,
@@ -339,7 +340,7 @@ private ActionResult onBlockMeterClick(final PlayerEntity playerEntity, final Bl
 
     /**
      * Finds a box to be edited when selecting this block
-     * 
+     *
      * @param block selected block
      * @return Box to be edited
      */
@@ -365,7 +366,7 @@ private void sendBoxList() {
      * handles the BoxList of other Players
      */
     private void handleServerBoxList(MinecraftClient client, ClientPlayNetworkHandler handler, PacketByteBuf data,
-            PacketSender responseSender) {
+                                     PacketSender responseSender) {
         Map<Text, List<ClientMeasureBox>> receivedBoxes = new HashMap<>();
         int playerCount = data.readInt();
         for (int i = 0; i < playerCount; i++) {
diff --git a/src/main/java/win/baruna/blockmeter/gui/OptionsGui.java b/src/main/java/win/baruna/blockmeter/gui/OptionsGui.java
@@ -142,7 +142,6 @@ public void onPress() {
     public void render(MatrixStack stack, final int int_1, final int int_2, final float float_1) {
         super.render(stack, int_1, int_2, float_1);
 
-        RenderSystem.disableTexture();
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder bufferBuilder = tessellator.getBuffer();
         RenderSystem.setShader(GameRenderer::getPositionColorProgram);
@@ -166,7 +165,6 @@ public void render(MatrixStack stack, final int int_1, final int int_2, final fl
                 .next();
         tessellator.draw();
 
-        RenderSystem.enableTexture();
 
         if (text != null) {
             boolean dark = (0.299f * color.getRed() + 0.587f * color.getBlue() + 0.114f * color.getRed()) / 255f < 0.8f;
diff --git a/src/main/java/win/baruna/blockmeter/measurebox/ClientMeasureBox.java b/src/main/java/win/baruna/blockmeter/measurebox/ClientMeasureBox.java
@@ -1,24 +1,13 @@
 package win.baruna.blockmeter.measurebox;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import com.mojang.blaze3d.systems.RenderSystem;
-
 import me.shedaniel.autoconfig.AutoConfig;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.render.BufferBuilder;
-import net.minecraft.client.render.Camera;
-import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.render.Tessellator;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.VertexFormats;
+import net.minecraft.client.render.*;
 import net.minecraft.client.render.VertexFormat.DrawMode;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.network.PacketByteBuf;
-import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
@@ -30,11 +19,15 @@
 import win.baruna.blockmeter.BlockMeterClient;
 import win.baruna.blockmeter.ModConfig;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 public class ClientMeasureBox extends MeasureBox {
     private Box box;
 
     protected ClientMeasureBox(final BlockPos blockStart, final BlockPos blockEnd, final Identifier dimension,
-            final DyeColor color, final boolean finished, final int mode, final int orientation) {
+                               final DyeColor color, final boolean finished, final int mode, final int orientation) {
         super(blockStart, blockEnd, dimension, color, finished, mode, orientation);
         updateBoundingBox();
     }
@@ -52,7 +45,7 @@ public static ClientMeasureBox getBox(final BlockPos block, final Identifier dim
 
     /**
      * Sets the second box corner
-     * 
+     *
      * @param block second corner position
      */
     public void setBlockEnd(final BlockPos block) {
@@ -62,7 +55,7 @@ public void setBlockEnd(final BlockPos block) {
 
     /**
      * The current creation state of the MeasureBox
-     * 
+     *
      * @return true if MeasureBox is completed
      */
     public boolean isFinished() {
@@ -78,7 +71,7 @@ public void setFinished() {
 
     /**
      * Sets the Color of the MeasureBox
-     * 
+     *
      * @param color Color to be applied
      */
     public void setColor(final DyeColor color) {
@@ -87,7 +80,7 @@ public void setColor(final DyeColor color) {
 
     /**
      * Tests if the block is on a corner of the box
-     * 
+     *
      * @param block Position to test
      * @return true if block is a corner
      */
@@ -100,7 +93,7 @@ public boolean isCorner(final BlockPos block) {
     /**
      * Loosens the selected Corner i.e. the opposite corner gets fixed, and the
      * current one can be moved
-     * 
+     *
      * @param block The corner to loosen, needs to be an actual corner of the box
      */
     public void loosenCorner(final BlockPos block) {
@@ -114,7 +107,7 @@ public void loosenCorner(final BlockPos block) {
 
     /**
      * Renders the Box
-     * 
+     *
      * @param camera           rendering Camera
      * @param stack
      * @param currentDimension Dimension the Player currently is in
@@ -125,24 +118,23 @@ public void render(final Camera camera, final MatrixStack stack, final Identifie
 
     /**
      * Renders the Box
-     * 
+     *
      * @param camera           rendering Camera
      * @param stack
      * @param currentDimension Dimension the Player currently is in
      * @param boxCreatorName   Name of the Player that created the Box
      */
     public void render(final Camera camera, final MatrixStack stack, final Identifier currentDimension,
-            final Text boxCreatorName) {
+                       final Text boxCreatorName) {
         if (!(currentDimension.equals(this.dimension))) {
             return;
         }
         final Vec3d pos = camera.getPos();
 
         // FIXME This actually does nothing
         RenderSystem.lineWidth(2.0f);
-        
+
         RenderSystem.disableDepthTest();
-        RenderSystem.disableTexture();
         RenderSystem.disableBlend();
 
         stack.push();
@@ -211,7 +203,6 @@ public void render(final Camera camera, final MatrixStack stack, final Identifie
             tess.draw();
 
         }
-        RenderSystem.enableTexture();
         RenderSystem.lineWidth(1.0f);
 
         this.drawLengths(camera, stack, boxCreatorName);
@@ -239,7 +230,7 @@ private void updateBoundingBox() {
 
     /**
      * Draws the length label
-     * 
+     *
      * @param camera         rendering Camera
      * @param stack
      * @param boxCreatorName Name of the Box creator
@@ -317,7 +308,7 @@ private void drawLengths(final Camera camera, final MatrixStack stack, final Tex
 
     /**
      * Draws a text with orientation and position
-     * 
+     *
      * @param stack
      * @param x
      * @param y
@@ -328,9 +319,8 @@ private void drawLengths(final Camera camera, final MatrixStack stack, final Tex
      * @param playerPos
      */
     private void drawText(final MatrixStack stack, final double x, final double y, final double z, final float yaw,
-            final float pitch, final String text, final Vec3d playerPos) {
-        @SuppressWarnings("resource")
-        final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+                          final float pitch, final String text, final Vec3d playerPos) {
+        @SuppressWarnings("resource") final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
 
         final var literalText = Text.literal(text);
 
@@ -380,7 +370,7 @@ private void drawText(final MatrixStack stack, final double x, final double y, f
                 !conf.backgroundForLabels, // shadow
                 model, // matrix
                 immediate, // draw buffer
-                true, // seeThrough
+                TextRenderer.TextLayerType.SEE_THROUGH,
                 0, // backgroundColor => underlineColor,
                 15728880 // light
         );
@@ -402,7 +392,7 @@ static private void incrementColor() {
 
     /**
      * Accessor for the currently selected color
-     * 
+     *
      * @return currently selected color
      */
     static private DyeColor getSelectedColor() {
@@ -417,7 +407,7 @@ public static void setColorIndex(final int newColor) {
 
     /**
      * Parses a ClientMeasureBox from a PacketByteBuf
-     * 
+     *
      * @param attachedData a PacketByteBuf containing the ClientMeasureBox
      * @return the PacketByteBuf submitted
      */
diff --git a/src/main/java/win/baruna/blockmeter/mixin/GameMixin.java b/src/main/java/win/baruna/blockmeter/mixin/GameMixin.java
diff --git a/src/main/resources/blockmeter.mixins.json b/src/main/resources/blockmeter.mixins.json
@@ -7,7 +7,6 @@
   ],
   "client": [
     "GameRendererMixin",
-    "GameMixin",
     "ClientPlayerConnectionMixin"
   ],
   "server": [
@@ -16,4 +15,4 @@
     "defaultRequire": 1
   },
   "refmap": "blockmeter-refmap.json"
-}
+}
diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
-modVersion = 1.9
-minecraftVersion = 1.19.3
+modVersion = 1.9.1
+minecraftVersion = 1.19.4
