Skip to content

Commit

Permalink
1.19.4 support
Browse files Browse the repository at this point in the history
  • Loading branch information
cerus committed Mar 14, 2023
1 parent 0ca0189 commit 0f4d4cf
Show file tree
Hide file tree
Showing 14 changed files with 259 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Visualizes the crafting process

## Compatibility

Compatible with Spigot & Paper 1.16.5, 1.17, 1.17.1, 1.18.1 and 1.18.2
Compatible with Spigot & Paper 1.16.5, 1.17, 1.17.1, 1.18.1, 1.18.2, 1.19, 1.19.1, 1.19.2, 1.19.3 and 1.19.4

## How it works

Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>dev.cerus.visualcrafting</groupId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion bukkit-16R3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>dev.cerus.visualcrafting</groupId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion bukkit-17R1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>dev.cerus.visualcrafting</groupId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion bukkit-18R1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>dev.cerus.visualcrafting</groupId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion bukkit-18R2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>dev.cerus.visualcrafting</groupId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion bukkit-19R1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>dev.cerus.visualcrafting</groupId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion bukkit-19R2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>dev.cerus.visualcrafting</groupId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
36 changes: 36 additions & 0 deletions bukkit-19R3/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>dev.cerus.visualcrafting</groupId>
<artifactId>parent</artifactId>
<version>1.0.8</version>
</parent>

<artifactId>bukkit-19R3</artifactId>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>dev.cerus.visualcrafting</groupId>
<artifactId>api</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.19.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
package dev.cerus.visualcrafting.v19r3;

import dev.cerus.visualcrafting.api.config.Config;
import dev.cerus.visualcrafting.api.version.FakeMap;
import dev.cerus.visualcrafting.api.version.VersionAdapter;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.Collections;
import java.util.UUID;
import java.util.function.BiConsumer;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.PacketPlayInUseEntity;
import net.minecraft.network.protocol.game.PacketPlayOutEntityDestroy;
import net.minecraft.network.protocol.game.PacketPlayOutEntityMetadata;
import net.minecraft.network.protocol.game.PacketPlayOutMap;
import net.minecraft.network.protocol.game.PacketPlayOutSpawnEntity;
import net.minecraft.network.syncher.DataWatcher;
import net.minecraft.network.syncher.DataWatcherRegistry;
import net.minecraft.server.network.PlayerConnection;
import net.minecraft.world.entity.EntityTypes;
import net.minecraft.world.level.saveddata.maps.WorldMap;
import net.minecraft.world.phys.Vec3D;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Rotation;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

public class VersionAdapter19R3 extends VersionAdapter {

private Config config;
private BiConsumer<Player, Integer> entityClickCallback;
private int nextEntityId;
private int nextMapId;
private Field netManField;

private NetworkManager getNetworkManager(final PlayerConnection b) {
try {
if (this.netManField == null) {
this.netManField = PlayerConnection.class.getDeclaredField("h");
this.netManField.setAccessible(true);
}
return (NetworkManager) this.netManField.get(b);
} catch (final NoSuchFieldException | IllegalAccessException e) {
throw new RuntimeException(e);
}
}

@Override
public void init(final Config config, final BiConsumer<Player, Integer> entityClickCallback) {
this.config = config;
this.entityClickCallback = entityClickCallback;
this.nextEntityId = config.entityIdRangeMin();
this.nextMapId = config.mapIdRangeMin();
}

@Override
public void inject(final Player player) {
if (this.config.enablePacketListening()) {
final NetworkManager netMan = this.getNetworkManager(((CraftPlayer) player).getHandle().b);
netMan.m.pipeline()
.addBefore("packet_handler", "visual_crafting", new ChannelDuplexHandler() {
@Override
public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception {
if (msg instanceof PacketPlayInUseEntity useEntity) {
VersionAdapter19R3.this.handlePacketIn(player, useEntity);
}
super.channelRead(ctx, msg);
}
});
}
}

private void handlePacketIn(final Player player, final PacketPlayInUseEntity packet) {
try {
final Field a = packet.getClass().getDeclaredField("a");
a.setAccessible(true);
this.entityClickCallback.accept(player, (Integer) a.get(packet));
} catch (final NoSuchFieldException | IllegalAccessException e) {
e.printStackTrace();
}
}

@Override
public int spawnItemFrame(final Location location, final BlockFace direction) {
final int eid = this.getNewEntityId();
final PacketPlayOutSpawnEntity packet = new PacketPlayOutSpawnEntity(
eid,
UUID.randomUUID(),
location.getBlockX(),
location.getBlockY(),
location.getBlockZ(),
direction == BlockFace.DOWN ? 90 : direction == BlockFace.UP ? -90 : 0,
switch (direction) {
case NORTH -> -180;
case EAST -> -90;
case WEST -> 90;
default -> 0;
},
EntityTypes.af,
switch (direction) {
case UP -> 1;
case NORTH -> 2;
case SOUTH -> 3;
case WEST -> 4;
case EAST -> 5;
default -> 0;
},
new Vec3D(0, 0, 0),
switch (direction) {
case NORTH -> -180;
case EAST -> -90;
case WEST -> 90;
default -> 0;
}
);
Bukkit.getOnlinePlayers().forEach(player -> this.sendPacket(player, packet));
return eid;
}

@Override
public void updateItemFrame(final int frameId, final ItemStack itemStack, final Rotation rotation, final boolean invisible) {
final PacketPlayOutEntityMetadata packet = new PacketPlayOutEntityMetadata(frameId, Arrays.asList(
new DataWatcher.b<>(8, DataWatcherRegistry.h, CraftItemStack.asNMSCopy(itemStack)),
new DataWatcher.b<>(9, DataWatcherRegistry.b, rotation.ordinal()),
new DataWatcher.b<>(0, DataWatcherRegistry.a, (byte) (invisible ? 0x20 : 0))
));
Bukkit.getOnlinePlayers().forEach(player -> this.sendPacket(player, packet));
}

@Override
public void destroyEntity(final int entityId) {
final PacketPlayOutEntityDestroy packet = new PacketPlayOutEntityDestroy(entityId);
Bukkit.getOnlinePlayers().forEach(player -> this.sendPacket(player, packet));
}

@Override
public FakeMap createMap() {
return this.createMap(this.getNewMapId());
}

@Override
public void sendMap(final FakeMap map) {
final PacketPlayOutMap packet = new PacketPlayOutMap(
map.getId(),
(byte) 0,
true,
Collections.emptyList(),
new WorldMap.b(0,
0,
128,
128,
this.getMapData(map))
);
Bukkit.getOnlinePlayers().forEach(player -> this.sendPacket(player, packet));
}

private void sendPacket(final Player player, final Packet<?> packet) {
((CraftPlayer) player).getHandle().b.a(packet);
}

private int getNewEntityId() {
if (this.nextEntityId >= this.config.entityIdRangeMax()) {
this.nextEntityId = this.config.entityIdRangeMin();
return this.nextEntityId;
} else {
return this.nextEntityId++;
}
}

private int getNewMapId() {
if (this.nextMapId >= this.config.mapIdRangeMax()) {
this.nextMapId = this.config.mapIdRangeMin();
return this.nextMapId;
} else {
return this.nextMapId++;
}
}

}
8 changes: 7 additions & 1 deletion plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>dev.cerus.visualcrafting</groupId>
<version>1.0.7</version>
<version>1.0.8</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -65,6 +65,12 @@
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>dev.cerus.visualcrafting</groupId>
<artifactId>bukkit-19R3</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>dev.cerus.maps</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import dev.cerus.visualcrafting.v18r2.VersionAdapter18R2;
import dev.cerus.visualcrafting.v19r1.VersionAdapter19R1;
import dev.cerus.visualcrafting.v19r2.VersionAdapter19R2;
import dev.cerus.visualcrafting.v19r3.VersionAdapter19R3;
import java.io.File;
import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie;
Expand All @@ -26,8 +27,17 @@ public class VisualCraftingPlugin extends JavaPlugin implements Config {
public void onEnable() {
this.saveDefaultConfig();

String version = Bukkit.getVersion();
version = version.substring(version.indexOf("MC: ") + 4, version.lastIndexOf(')'));
if (!version.matches("\\d+\\.\\d+(\\.\\d+)?")) {
this.getLogger().severe("Could not detect server version for " + version);
this.getPluginLoader().disablePlugin(this);
return;
}
final String major = version.split("\\.")[1];

// Initialize textures
final File textureCacheFile = new File(this.getDataFolder(), "textures");
final File textureCacheFile = new File(this.getDataFolder(), "textures_" + major);
final TextureCache textureCache = new TextureCache();
if (textureCacheFile.exists()) {
textureCache.read(textureCacheFile);
Expand All @@ -41,15 +51,14 @@ public void onEnable() {
}

// Initialize version adapter
String version = Bukkit.getVersion();
version = version.substring(version.indexOf("MC: ") + 4, version.lastIndexOf(')'));
final VersionAdapter versionAdapter = switch (version) {
case "1.16.5" -> new VersionAdapter16R3();
case "1.17", "1.17.1" -> new VersionAdapter17R1();
case "1.18.1" -> new VersionAdapter18R1();
case "1.18.2" -> new VersionAdapter18R2();
case "1.19", "1.19.1", "1.19.2" -> new VersionAdapter19R1();
case "1.19.3" -> new VersionAdapter19R2();
case "1.19.4" -> new VersionAdapter19R3();
default -> null;
};
if (versionAdapter == null) {
Expand Down
Loading

0 comments on commit 0f4d4cf

Please sign in to comment.