Skip to content

Commit 61cd2f6

Browse files
authored
1.20.2 (#44)
1 parent 018ba84 commit 61cd2f6

8 files changed

Lines changed: 29 additions & 15 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected void init() {
8585

8686
@Override
8787
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
88-
super.renderBackground(context);
88+
super.renderBackground(context, mouseX, mouseY, delta);
8989
super.render(context, mouseX, mouseY, delta);
9090
}
9191

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected void init() {
5151

5252
@Override
5353
public void render(DrawContext context, int mouseX, int mouseY, float delta) {
54-
super.renderBackground(context);
54+
super.renderBackground(context, mouseX, mouseY, delta);
5555
super.render(context, mouseX, mouseY, delta);
5656
}
5757

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,9 @@ private void updateBoundingBox() {
233233
* @param boxCreatorName Name of the Box creator
234234
*/
235235
private void drawLengths(final Camera camera, final MatrixStack stack, final Text boxCreatorName) {
236-
final int lengthX = (int) this.box.getXLength();
237-
final int lengthY = (int) this.box.getYLength();
238-
final int lengthZ = (int) this.box.getZLength();
236+
final int lengthX = (int) this.box.getLengthX();
237+
final int lengthY = (int) this.box.getLengthY();
238+
final int lengthZ = (int) this.box.getLengthZ();
239239

240240
final Vec3d boxCenter = this.box.getCenter();
241241
final double diagonalLength = new Vec3d(this.box.minX, this.box.minY, this.box.minZ)
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package win.baruna.blockmeter.mixin;
2+
3+
import net.minecraft.client.network.ClientCommonNetworkHandler;
4+
import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.injection.At;
7+
import org.spongepowered.asm.mixin.injection.Inject;
8+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
9+
import win.baruna.blockmeter.BlockMeterClient;
10+
11+
@Mixin(ClientCommonNetworkHandler.class)
12+
public class ClientCommonNetworkHandlerMixin {
13+
14+
@Inject(method = "onDisconnect", at = @At("HEAD"))
15+
public void onDisconnectedFromServerEvent(DisconnectS2CPacket packet, CallbackInfo cbi) {
16+
BlockMeterClient.getInstance().onDisconnected();
17+
}
18+
}

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
77

88
import net.minecraft.client.network.ClientPlayNetworkHandler;
9-
import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket;
9+
import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
1010
import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
1111
import win.baruna.blockmeter.BlockMeterClient;
1212

@@ -17,9 +17,4 @@ public class ClientPlayerConnectionMixin {
1717
private void onConnectedToServerEvent(GameJoinS2CPacket packet, CallbackInfo cbi) {
1818
BlockMeterClient.getInstance().onConnected();
1919
}
20-
21-
@Inject(method = "onDisconnect", at = @At("HEAD"))
22-
public void onDisconnectedFromServerEvent(DisconnectS2CPacket packet, CallbackInfo cbi) {
23-
BlockMeterClient.getInstance().onDisconnected();
24-
}
2520
}

src/main/resources/blockmeter.mixins.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"client": [
99
"GameRendererMixin",
10-
"ClientPlayerConnectionMixin"
10+
"ClientPlayerConnectionMixin",
11+
"ClientCommonNetworkHandlerMixin"
1112
],
1213
"server": [
1314
],

version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
modVersion = 1.10.1
2-
minecraftVersion = 1.20.1
1+
modVersion = 1.10.2
2+
minecraftVersion = 1.20.2

0 commit comments

Comments
 (0)