diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java index e113f7b3..f33fe915 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java @@ -19,8 +19,6 @@ package de.steamwar.bausystem.region; -import com.comphenix.tinyprotocol.TinyProtocol; -import de.steamwar.Reflection; import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.region.dynamic.DynamicRegion; import de.steamwar.bausystem.region.dynamic.MovementListener; @@ -30,15 +28,11 @@ import de.steamwar.bausystem.region.dynamic.path.PathRegion; import de.steamwar.bausystem.region.dynamic.spawn.SpawnPathRegion; import de.steamwar.bausystem.region.dynamic.spawn.SpawnRegion; import de.steamwar.bausystem.region.dynamic.spawn.SpawnResetter; -import de.steamwar.core.Core; -import de.steamwar.providers.BauServerInfo; import lombok.NonNull; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.RecordComponent; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -50,49 +44,10 @@ public class DynamicRegionSystem implements RegionSystem { private static Map regionMap = new HashMap<>(); - private Class loginPacket = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundLoginPacket"); - private Class commonPlayerSpawnInfo = Reflection.getClass("net.minecraft.network.protocol.game.CommonPlayerSpawnInfo"); - private Reflection.Constructor loginPacketConstructor = Reflection.getConstructor(loginPacket, int.class, boolean.class, Set.class, int.class, int.class, int.class, boolean.class, boolean.class, boolean.class, commonPlayerSpawnInfo, boolean.class); - private Class holderClass = Reflection.getClass("net.minecraft.core.Holder"); - private Class resourceKeyClass = Reflection.getClass("net.minecraft.resources.ResourceKey"); - private Class gameTypeClass = Reflection.getClass("net.minecraft.world.level.GameType"); - private Reflection.Constructor commonPlayerSpawnInfoConstructor = Reflection.getConstructor(commonPlayerSpawnInfo, holderClass, resourceKeyClass, long.class, gameTypeClass, gameTypeClass, boolean.class, boolean.class, Optional.class, int.class, int.class); - private Class minecraftKeyClass = Reflection.getClass("net.minecraft.resources.MinecraftKey"); - private Reflection.Constructor resourceKeyConstructor = Reflection.getConstructor(resourceKeyClass, minecraftKeyClass, minecraftKeyClass); - private Reflection.Constructor minecraftKeyConstructor = Reflection.getConstructor(minecraftKeyClass, String.class, String.class); - @Override public void load() { INSTANCE = this; - // TODO: Extract into own PR - String identifier = BauServerInfo.getOwnerUser().getUUID().toString().replace("-", ""); - Object resourceKey = resourceKeyConstructor.invoke(minecraftKeyConstructor.invoke("minecraft", "dimension"), minecraftKeyConstructor.invoke("steamwar", "bau/" + Core.getVersion() + "/" + identifier)); - TinyProtocol.instance.addFilter(loginPacket, (player, o) -> { - RecordComponent[] components = loginPacket.getRecordComponents(); - Object[] parameters_loginPacket = new Object[components.length]; - for (int i = 0; i < components.length; i++) { - try { - parameters_loginPacket[i] = components[i].getAccessor().invoke(o); - } catch (IllegalAccessException | InvocationTargetException e) { - throw new RuntimeException(e); - } - } - parameters_loginPacket[2] = Set.of(resourceKey); - components = commonPlayerSpawnInfo.getRecordComponents(); - Object[] parameters_commonPlayerSpawnInfo = new Object[components.length]; - for (int i = 0; i < components.length; i++) { - try { - parameters_commonPlayerSpawnInfo[i] = components[i].getAccessor().invoke(parameters_loginPacket[9]); - } catch (IllegalAccessException | InvocationTargetException e) { - throw new RuntimeException(e); - } - } - parameters_commonPlayerSpawnInfo[1] = resourceKey; - parameters_loginPacket[9] = commonPlayerSpawnInfoConstructor.invoke(parameters_commonPlayerSpawnInfo); - - return loginPacketConstructor.invoke(parameters_loginPacket); - }); new DynamicRegionCommand(); RegionDataRepository.loadRegions(); Bukkit.getPluginManager().registerEvents(new MovementListener(), BauSystem.getInstance());