Skip to content

GitLab

Commit b0a7e0e2 authored by Ashijin's avatar Ashijin
Browse files

More 1.19.2 fixes

parent 95141207
master Terminated/dev
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 32 deletions
plugin/src/main/java/io/lumine/cosmetics/MCCosmeticsPlugin.java
View file @ b0a7e0e2
......@@ -214,9 +214,11 @@ public class MCCosmeticsPlugin extends LuminePlugin {
String packageName = Bukkit.getServer().getClass().getPackage().getName();
String version = packageName.substring(packageName.lastIndexOf('.') + 1);
if (version.equals("craftbukkit")) {
version = "pre";
}
if(version.startsWith("v1_19") && !"1.19-R0.1-SNAPSHOT".equals(Bukkit.getBukkitVersion())) {
version = "v1_19_R1_2";
}
try {
final Class<?> clazz = Class.forName("io.lumine.cosmetics.nms.VolatileCodeEnabled_" + version);
if (VolatileCodeHandler.class.isAssignableFrom(clazz)) {
......
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/VolatileCodeEnabled_v1_19_R1.java → v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/VolatileCodeEnabled_v1_19_R1_2.java
View file @ b0a7e0e2
......@@ -9,8 +9,8 @@ import io.lumine.cosmetics.managers.hats.Hat;
import io.lumine.cosmetics.managers.offhand.Offhand;
import io.lumine.cosmetics.managers.sprays.Spray;
import io.lumine.cosmetics.nms.cosmetic.VolatileCosmeticHelper;
import io.lumine.cosmetics.nms.v1_19_R1.cosmetic.*;
import io.lumine.cosmetics.nms.v1_19_R1.network.VolatileChannelHandler;
import io.lumine.cosmetics.nms.v1_19_R1_2.cosmetic.*;
import io.lumine.cosmetics.nms.v1_19_R1_2.network.VolatileChannelHandler;
import io.netty.channel.Channel;
import io.netty.channel.ChannelPipeline;
import lombok.Getter;
......@@ -31,12 +31,12 @@ import org.bukkit.entity.Player;
import java.util.Collection;
import java.util.Map;
public class VolatileCodeEnabled_v1_19_R1 implements VolatileCodeHandler {
public class VolatileCodeEnabled_v1_19_R1_2 implements VolatileCodeHandler {
@Getter private final MCCosmeticsPlugin plugin;
private final Map<Class<? extends Cosmetic>, VolatileCosmeticHelper> cosmeticHelpers = Maps.newConcurrentMap();
public VolatileCodeEnabled_v1_19_R1(MCCosmeticsPlugin plugin) {
public VolatileCodeEnabled_v1_19_R1_2(MCCosmeticsPlugin plugin) {
this.plugin = plugin;
cosmeticHelpers.put(Hat.class, new VolatileHatImpl(plugin, this));
cosmeticHelpers.put(BackAccessory.class, new VolatileBackImpl(plugin, this));
......
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1/cosmetic/VolatileBackImpl.java → v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileBackImpl.java
View file @ b0a7e0e2
package io.lumine.cosmetics.nms.v1_19_R1.cosmetic;
package io.lumine.cosmetics.nms.v1_19_R1_2.cosmetic;
import com.google.common.collect.Maps;
import com.mojang.datafixers.util.Pair;
......@@ -8,7 +8,7 @@ import io.lumine.cosmetics.api.cosmetics.ItemCosmetic;
import io.lumine.cosmetics.api.players.CosmeticProfile;
import io.lumine.cosmetics.logging.MCLogger;
import io.lumine.cosmetics.managers.back.BackAccessory;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1_2;
import io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper;
import io.lumine.cosmetics.players.Profile;
import io.netty.buffer.Unpooled;
......@@ -33,11 +33,11 @@ public class VolatileBackImpl implements VolatileEquipmentHelper {
@Getter
private final MCCosmeticsPlugin plugin;
private final VolatileCodeEnabled_v1_19_R1 nmsHandler;
private final VolatileCodeEnabled_v1_19_R1_2 nmsHandler;
private final Map<Player, ArmorStand> activeProfile = Maps.newConcurrentMap();
private final Map<Integer, Player> playerTracker = Maps.newConcurrentMap();
public VolatileBackImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_19_R1 nmsHandler) {
public VolatileBackImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_19_R1_2 nmsHandler) {
this.plugin = plugin;
this.nmsHandler = nmsHandler;
}
......
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1/cosmetic/VolatileGestureImpl.java → v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileGestureImpl.java
View file @ b0a7e0e2
package io.lumine.cosmetics.nms.v1_19_R1.cosmetic;
package io.lumine.cosmetics.nms.v1_19_R1_2.cosmetic;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
......@@ -9,7 +9,7 @@ import io.lumine.cosmetics.api.players.CosmeticProfile;
import io.lumine.cosmetics.managers.gestures.Gesture;
import io.lumine.cosmetics.managers.gestures.GestureManager;
import io.lumine.cosmetics.managers.gestures.QuitMethod;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1_2;
import io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper;
import io.lumine.cosmetics.players.Profile;
import io.netty.buffer.Unpooled;
......@@ -42,13 +42,13 @@ public class VolatileGestureImpl implements VolatileEquipmentHelper {
@Getter
private final MCCosmeticsPlugin plugin;
private final VolatileCodeEnabled_v1_19_R1 nmsHandler;
private final VolatileCodeEnabled_v1_19_R1_2 nmsHandler;
private final Set<Player> activeProfile = Sets.newConcurrentHashSet();
private final Map<Integer, Player> playerTracker = Maps.newConcurrentMap();
private Horse horse;
public VolatileGestureImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_19_R1 nmsHandler) {
public VolatileGestureImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_19_R1_2 nmsHandler) {
this.plugin = plugin;
this.nmsHandler = nmsHandler;
}
......
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1/cosmetic/VolatileHatImpl.java → v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileHatImpl.java
View file @ b0a7e0e2
package io.lumine.cosmetics.nms.v1_19_R1.cosmetic;
package io.lumine.cosmetics.nms.v1_19_R1_2.cosmetic;
import com.google.common.collect.Maps;
import com.mojang.datafixers.util.Pair;
......@@ -6,7 +6,7 @@ import io.lumine.cosmetics.MCCosmeticsPlugin;
import io.lumine.cosmetics.api.cosmetics.ItemCosmetic;
import io.lumine.cosmetics.api.players.CosmeticProfile;
import io.lumine.cosmetics.managers.hats.Hat;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1_2;
import io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper;
import io.lumine.cosmetics.players.Profile;
import io.netty.buffer.Unpooled;
......@@ -26,10 +26,10 @@ import java.util.Map;
public class VolatileHatImpl implements VolatileEquipmentHelper {
@Getter private final MCCosmeticsPlugin plugin;
private final VolatileCodeEnabled_v1_19_R1 nmsHandler;
private final VolatileCodeEnabled_v1_19_R1_2 nmsHandler;
private final Map<Integer, Player> playerTracker = Maps.newConcurrentMap();
public VolatileHatImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_19_R1 nmsHandler) {
public VolatileHatImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_19_R1_2 nmsHandler) {
this.plugin = plugin;
this.nmsHandler = nmsHandler;
}
......@@ -81,6 +81,7 @@ public class VolatileHatImpl implements VolatileEquipmentHelper {
@Override
public List<Object> write(Player receiver, Object packet) {
if(packet instanceof ClientboundAddPlayerPacket playerPacket) {
int id = playerPacket.getEntityId();
Profile profile = getProfile(receiver, id);
......@@ -94,7 +95,7 @@ public class VolatileHatImpl implements VolatileEquipmentHelper {
handleSpawn(profile);
}
}
return null;
}
......@@ -106,6 +107,7 @@ public class VolatileHatImpl implements VolatileEquipmentHelper {
}
public void handleSpawn(Profile profile) {
/*
final var maybeEquipped = profile.getEquipped(Hat.class);
if(maybeEquipped.isEmpty()) {
return;
......@@ -126,6 +128,7 @@ public class VolatileHatImpl implements VolatileEquipmentHelper {
final var pipeline = ((CraftPlayer) player).getHandle().connection.getConnection().channel.pipeline();
pipeline.writeAndFlush(byteBuf);
*/
}
}
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1/cosmetic/VolatileOffhandImpl.java → v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileOffhandImpl.java
View file @ b0a7e0e2
package io.lumine.cosmetics.nms.v1_19_R1.cosmetic;
package io.lumine.cosmetics.nms.v1_19_R1_2.cosmetic;
import com.google.common.collect.Maps;
import com.mojang.datafixers.util.Pair;
......@@ -6,7 +6,7 @@ import io.lumine.cosmetics.MCCosmeticsPlugin;
import io.lumine.cosmetics.api.cosmetics.ItemCosmetic;
import io.lumine.cosmetics.api.players.CosmeticProfile;
import io.lumine.cosmetics.managers.offhand.Offhand;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1_2;
import io.lumine.cosmetics.nms.cosmetic.VolatileEquipmentHelper;
import io.lumine.cosmetics.players.Profile;
import io.netty.buffer.Unpooled;
......@@ -25,10 +25,10 @@ import java.util.Map;
public class VolatileOffhandImpl implements VolatileEquipmentHelper {
@Getter private final MCCosmeticsPlugin plugin;
private final VolatileCodeEnabled_v1_19_R1 nmsHandler;
private final VolatileCodeEnabled_v1_19_R1_2 nmsHandler;
private final Map<Integer, Player> playerTracker = Maps.newConcurrentMap();
public VolatileOffhandImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_19_R1 nmsHandler) {
public VolatileOffhandImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_19_R1_2 nmsHandler) {
this.plugin = plugin;
this.nmsHandler = nmsHandler;
}
......@@ -94,6 +94,7 @@ public class VolatileOffhandImpl implements VolatileEquipmentHelper {
}
public void handleSpawn(Profile profile) {
/*
final var maybeEquipped = profile.getEquipped(Offhand.class);
if(maybeEquipped.isEmpty()) {
return;
......@@ -114,6 +115,7 @@ public class VolatileOffhandImpl implements VolatileEquipmentHelper {
final var pipeline = ((CraftPlayer) player).getHandle().connection.getConnection().channel.pipeline();
pipeline.writeAndFlush(byteBuf);
*/
}
}
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1/cosmetic/VolatileSprayImpl.java → v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/cosmetic/VolatileSprayImpl.java
View file @ b0a7e0e2
package io.lumine.cosmetics.nms.v1_19_R1.cosmetic;
package io.lumine.cosmetics.nms.v1_19_R1_2.cosmetic;
import io.lumine.cosmetics.MCCosmeticsPlugin;
import io.lumine.cosmetics.managers.sprays.Spray;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1_2;
import io.lumine.cosmetics.nms.cosmetic.VolatileSprayHelper;
import lombok.Getter;
import net.minecraft.core.BlockPos;
......@@ -23,9 +23,9 @@ import org.bukkit.inventory.meta.MapMeta;
public class VolatileSprayImpl implements VolatileSprayHelper {
@Getter private final MCCosmeticsPlugin plugin;
private final VolatileCodeEnabled_v1_19_R1 nmsHandler;
private final VolatileCodeEnabled_v1_19_R1_2 nmsHandler;
public VolatileSprayImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_19_R1 nmsHandler) {
public VolatileSprayImpl(MCCosmeticsPlugin plugin, VolatileCodeEnabled_v1_19_R1_2 nmsHandler) {
this.plugin = plugin;
this.nmsHandler = nmsHandler;
}
......
v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1/network/VolatileChannelHandler.java → v1_19_R1_2/src/main/java/io/lumine/cosmetics/nms/v1_19_R1_2/network/VolatileChannelHandler.java
View file @ b0a7e0e2
package io.lumine.cosmetics.nms.v1_19_R1.network;
package io.lumine.cosmetics.nms.v1_19_R1_2.network;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1;
import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_19_R1_2;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise;
......@@ -12,10 +12,10 @@ import java.util.List;
public class VolatileChannelHandler extends ChannelDuplexHandler {
private final VolatileCodeEnabled_v1_19_R1 nmsHandler;
private final VolatileCodeEnabled_v1_19_R1_2 nmsHandler;
@Getter private final Player player;
public VolatileChannelHandler(Player player, VolatileCodeEnabled_v1_19_R1 nmsHandler) {
public VolatileChannelHandler(Player player, VolatileCodeEnabled_v1_19_R1_2 nmsHandler) {
this.player = player;
this.nmsHandler = nmsHandler;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment