Revert "1.20.2 (#44)"

This reverts commit 61cd2f6.

Author: ModProg

Versionfiles

@@ -85,7 +85,7 @@ protected void init() {
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        super.renderBackground(context, mouseX, mouseY, delta);
+        super.renderBackground(context);
         super.render(context, mouseX, mouseY, delta);
     }
 

src/main/java/win/baruna/blockmeter/gui/OptionsGui.java

@@ -51,7 +51,7 @@ protected void init() {
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        super.renderBackground(context, mouseX, mouseY, delta);
+        super.renderBackground(context);
         super.render(context, mouseX, mouseY, delta);
     }
 

src/main/java/win/baruna/blockmeter/gui/SelectBoxGui.java

@@ -233,9 +233,9 @@ private void updateBoundingBox() {
      * @param boxCreatorName Name of the Box creator
      */
     private void drawLengths(final Camera camera, final MatrixStack stack, final Text boxCreatorName) {
-        final int lengthX = (int) this.box.getLengthX();
-        final int lengthY = (int) this.box.getLengthY();
-        final int lengthZ = (int) this.box.getLengthZ();
+        final int lengthX = (int) this.box.getXLength();
+        final int lengthY = (int) this.box.getYLength();
+        final int lengthZ = (int) this.box.getZLength();
 
         final Vec3d boxCenter = this.box.getCenter();
         final double diagonalLength = new Vec3d(this.box.minX, this.box.minY, this.box.minZ)

src/main/java/win/baruna/blockmeter/measurebox/ClientMeasureBox.java

@@ -6,7 +6,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.network.ClientPlayNetworkHandler;
-import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
+import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket;
 import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
 import win.baruna.blockmeter.BlockMeterClient;
 
@@ -17,4 +17,9 @@ public class ClientPlayerConnectionMixin {
     private void onConnectedToServerEvent(GameJoinS2CPacket packet, CallbackInfo cbi) {
         BlockMeterClient.getInstance().onConnected();
     }
+
+    @Inject(method = "onDisconnect", at = @At("HEAD"))
+    public void onDisconnectedFromServerEvent(DisconnectS2CPacket packet, CallbackInfo cbi) {
+        BlockMeterClient.getInstance().onDisconnected();
+    }
 }

src/main/java/win/baruna/blockmeter/mixin/ClientCommonNetworkHandlerMixin.java

@@ -7,8 +7,7 @@
   ],
   "client": [
     "GameRendererMixin",
-    "ClientPlayerConnectionMixin",
-    "ClientCommonNetworkHandlerMixin"
+    "ClientPlayerConnectionMixin"
   ],
   "server": [
   ],

src/main/java/win/baruna/blockmeter/mixin/ClientPlayerConnectionMixin.java

@@ -4,9 +4,15 @@
   "version": "${version}",
   "environment": "*",
   "entrypoints": {
-    "client": ["win.baruna.blockmeter.BlockMeterClient"],
-    "main": ["win.baruna.blockmeter.BlockMeterServer"],
-    "modmenu": ["win.baruna.blockmeter.gui.ModMenu"]
+    "client": [
+      "win.baruna.blockmeter.BlockMeterClient"
+    ],
+    "main": [
+      "win.baruna.blockmeter.BlockMeterServer"
+    ],
+    "modmenu": [
+      "win.baruna.blockmeter.gui.ModMenu"
+    ]
   },
   "custom": {
     "xxxmodmenu:clientsideOnly": true,
@@ -15,25 +21,32 @@
       "modrinth": "oGU9LXKC"
     }
   },
-  "mixins": ["blockmeter.mixins.json"],
+  "mixins": [
+    "blockmeter.mixins.json"
+  ],
   "depends": {
     "fabricloader": ">=0.4.0",
     "fabric": "*",
-    "minecraft": ">=1.20.2"
+    "minecraft": [
+      "1.20.0",
+      "1.20.1"
+    ]
   },
   "recommends": {
     "modmenu": "*"
   },
   "name": "Block Meter",
   "description": "A simple mod to measure your blocks!",
   "icon": "icon.png",
-  "authors": ["MadeOke", "Giselbaer", "ModProg"],
-
+  "authors": [
+    "MadeOke",
+    "Giselbaer",
+    "ModProg"
+  ],
   "contact": {
     "homepage": "https://www.curseforge.com/minecraft/mc-mods/blockmeterfabric",
     "sources": "https://github.com/modprog/BlockMeter",
     "issues": "https://github.com/modprog/BlockMeter/issues"
   },
-
   "license": "MIT"
 }

src/main/resources/blockmeter.mixins.json

@@ -1,2 +1,2 @@
 modVersion = 1.11.0
-minecraftVersion = 1.20.2
+minecraftVersion = 1.20.1