Skip to content

Commit 894b4d3

Browse files
LOOHPLOOHP
committed
Support for 1.16.2, note that we need to wait for lightapi to update
1 parent 7b3b6ea commit 894b4d3

6 files changed

Lines changed: 21 additions & 16 deletions

File tree

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>InteractionVisualizer</groupId>
66
<artifactId>InteractionVisualizer</artifactId>
7-
<version>1.13.5</version>
7+
<version>1.13.6</version>
88
<build>
99
<sourceDirectory>src</sourceDirectory>
1010
<resources>
@@ -13,6 +13,7 @@
1313
<excludes>
1414
<exclude>**/*.java</exclude>
1515
</excludes>
16+
<filtering>true</filtering>
1617
</resource>
1718
</resources>
1819
<plugins>

‎src/com/loohp/interactionvisualizer/InteractionVisualizer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ public void onEnable() {
126126
version = MCVersion.fromPackageName(getServer().getClass().getPackage().getName());
127127

128128
switch (version) {
129+
case V1_16_2:
129130
case V1_16:
130131
case V1_15:
131132
metaversion = 3;

‎src/com/loohp/interactionvisualizer/Managers/TaskManager.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public static void setup() {
128128
}
129129

130130
if (config.getBoolean("Blocks.Loom.Enabled") &&
131-
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.equals(MCVersion.V1_16))
131+
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.isPost1_16())
132132
) {
133133
LoomDisplay ld = new LoomDisplay();
134134
ld.register(InventoryType.LOOM);
@@ -144,7 +144,7 @@ public static void setup() {
144144
}
145145

146146
if (config.getBoolean("Blocks.CartographyTable.Enabled") &&
147-
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.equals(MCVersion.V1_16))
147+
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.isPost1_16())
148148
) {
149149
CartographyTableDisplay ctd = new CartographyTableDisplay();
150150
ctd.register(InventoryType.CARTOGRAPHY);
@@ -160,7 +160,7 @@ public static void setup() {
160160
}
161161

162162
if (config.getBoolean("Blocks.Grindstone.Enabled") &&
163-
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.equals(MCVersion.V1_16))
163+
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.isPost1_16())
164164
) {
165165
GrindstoneDisplay gd = new GrindstoneDisplay();
166166
gd.register(InventoryType.GRINDSTONE);
@@ -169,7 +169,7 @@ public static void setup() {
169169
}
170170

171171
if (config.getBoolean("Blocks.Stonecutter.Enabled") &&
172-
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.equals(MCVersion.V1_16))
172+
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.isPost1_16())
173173
) {
174174
StonecutterDisplay sd = new StonecutterDisplay();
175175
sd.register(InventoryType.STONECUTTER);
@@ -202,7 +202,7 @@ public static void setup() {
202202
}
203203

204204
if (config.getBoolean("Blocks.BlastFurnace.Enabled") &&
205-
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.equals(MCVersion.V1_16))
205+
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.isPost1_16())
206206
) {
207207
BlastFurnaceDisplay bfd = new BlastFurnaceDisplay();
208208
bfd.register();
@@ -211,7 +211,7 @@ public static void setup() {
211211
}
212212

213213
if (config.getBoolean("Blocks.Smoker.Enabled") &&
214-
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.equals(MCVersion.V1_16))
214+
(version.equals(MCVersion.V1_14) || version.equals(MCVersion.V1_15) || version.isPost1_16())
215215
) {
216216
SmokerDisplay sd = new SmokerDisplay();
217217
sd.register();
@@ -253,7 +253,7 @@ public static void setup() {
253253
}
254254

255255
if (config.getBoolean("Blocks.SmithingTable.Enabled") &&
256-
(version.equals(MCVersion.V1_16))
256+
(version.isPost1_16())
257257
) {
258258
SmithingTableDisplay std = new SmithingTableDisplay();
259259
std.register(InventoryType.SMITHING);

‎src/com/loohp/interactionvisualizer/Protocol/ServerPacketSender.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static void spawnArmorStand(List<Player> players, ArmorStand entity) {
102102

103103
PacketContainer packet3 = protocolManager.createPacket(PacketType.Play.Server.ENTITY_EQUIPMENT);
104104
packet3.getIntegers().write(0, entity.getEntityId());
105-
if (version.equals(MCVersion.V1_16)) {
105+
if ((version.equals(MCVersion.V1_16) || version.equals(MCVersion.V1_16_2))) {
106106
try {
107107
Object nmsMainHandItem = asNMSCopyMethod.invoke(entity.getItemInMainHand());
108108
Object nmsHelmetItem = asNMSCopyMethod.invoke(entity.getHelmet());
@@ -119,7 +119,7 @@ public static void spawnArmorStand(List<Player> players, ArmorStand entity) {
119119
}
120120

121121
PacketContainer packet4 = protocolManager.createPacket(PacketType.Play.Server.ENTITY_EQUIPMENT);
122-
if (!version.equals(MCVersion.V1_16)) {
122+
if (!(version.equals(MCVersion.V1_16) || version.equals(MCVersion.V1_16_2))) {
123123
packet4.getIntegers().write(0, entity.getEntityId());
124124
packet4.getItemSlots().write(0, ItemSlot.HEAD);
125125
packet4.getItemModifier().write(0, entity.getHelmet());
@@ -134,7 +134,7 @@ public static void spawnArmorStand(List<Player> players, ArmorStand entity) {
134134
protocolManager.sendServerPacket(player, packet1);
135135
protocolManager.sendServerPacket(player, packet2);
136136
protocolManager.sendServerPacket(player, packet3);
137-
if (!version.equals(MCVersion.V1_16)) {
137+
if (!(version.equals(MCVersion.V1_16) || version.equals(MCVersion.V1_16_2))) {
138138
protocolManager.sendServerPacket(player, packet4);
139139
}
140140
}
@@ -160,7 +160,7 @@ public static void updateArmorStand(List<Player> players, ArmorStand entity) {
160160

161161
PacketContainer packet3 = protocolManager.createPacket(PacketType.Play.Server.ENTITY_EQUIPMENT);
162162
packet3.getIntegers().write(0, entity.getEntityId());
163-
if (version.equals(MCVersion.V1_16)) {
163+
if ((version.equals(MCVersion.V1_16) || version.equals(MCVersion.V1_16_2))) {
164164
try {
165165
Object nmsMainHandItem = asNMSCopyMethod.invoke(entity.getItemInMainHand());
166166
Object nmsHelmetItem = asNMSCopyMethod.invoke(entity.getHelmet());
@@ -177,7 +177,7 @@ public static void updateArmorStand(List<Player> players, ArmorStand entity) {
177177
}
178178

179179
PacketContainer packet4 = protocolManager.createPacket(PacketType.Play.Server.ENTITY_EQUIPMENT);
180-
if (!version.equals(MCVersion.V1_16)) {
180+
if (!(version.equals(MCVersion.V1_16) || version.equals(MCVersion.V1_16_2))) {
181181
packet4.getIntegers().write(0, entity.getEntityId());
182182
packet4.getItemSlots().write(0, ItemSlot.HEAD);
183183
packet4.getItemModifier().write(0, entity.getHelmet());
@@ -192,7 +192,7 @@ public static void updateArmorStand(List<Player> players, ArmorStand entity) {
192192
protocolManager.sendServerPacket(player, packet1);
193193
protocolManager.sendServerPacket(player, packet2);
194194
protocolManager.sendServerPacket(player, packet3);
195-
if (!version.equals(MCVersion.V1_16)) {
195+
if (!(version.equals(MCVersion.V1_16) || version.equals(MCVersion.V1_16_2))) {
196196
protocolManager.sendServerPacket(player, packet4);
197197
}
198198
}

‎src/com/loohp/interactionvisualizer/Utils/MCVersion.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
public enum MCVersion {
44

5+
V1_16_2("1.16.2"),
56
V1_16("1.16"),
67
V1_15("1.15"),
78
V1_14("1.14"),
@@ -51,7 +52,9 @@ public enum MCVersion {
5152
}
5253

5354
public static MCVersion fromPackageName(String packageName) {
54-
if (packageName.contains("1_16_R1")) {
55+
if (packageName.contains("1_16_R2")) {
56+
return V1_16_2;
57+
} else if (packageName.contains("1_16_R1")) {
5558
return V1_16;
5659
} else if (packageName.contains("1_15_R1")) {
5760
return V1_15;

‎src/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: InteractionVisualizer
22
author: loohp
3-
version: 1.13.5
3+
version: ${project.version}
44
main: com.loohp.interactionvisualizer.InteractionVisualizer
55
api-version: 1.13
66
description: Makes function blocks better

0 commit comments

Comments
 (0)