Merge branch 'main' into Refactor/remove-old-dependencies

SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java

@@ -202,6 +202,10 @@ public final class Reflection {
 		}
 	}
 
+	public static <T> Field<T> getField(Class<?> target, String name, Class<T> fieldType) {
+		return getField(target, name, fieldType, 0);
+	}
+
 	public static <T> Field<T> getField(Class<?> target, Class<T> fieldType, int index) {
 		return getField(target, null, fieldType, index);
 	}

SpigotCore/SpigotCore_Main/src/de/steamwar/core/FlatteningWrapper.java

@@ -329,10 +329,6 @@ public class FlatteningWrapper {
         }
     }
 
-    public void setNamedSpawnPacketDataWatcher(Object packet) {
-        // field not present
-    }
-
     public Object formatDisplayName(String displayName) {
         return displayName != null ? Optional.of(ChatWrapper.impl.stringToChatComponent(displayName)) : Optional.empty();
     }
@@ -340,7 +336,7 @@ public class FlatteningWrapper {
     private static final Reflection.Field<net.minecraft.world.entity.EntityType> spawnType = Reflection.getField(ProtocolWrapper.spawnPacket, net.minecraft.world.entity.EntityType.class, 0);
     public void setSpawnPacketType(Object packet, EntityType type) {
         ResourceLocation key = CraftNamespacedKey.toMinecraft(type.getKey());
-        spawnType.set(packet, BuiltInRegistries.ENTITY_TYPE.get(key));
+        spawnType.set(packet, BuiltInRegistries.ENTITY_TYPE.get(key).get().value());
     }
 
     public int getViewDistance(Player player) {

SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java

@@ -23,9 +23,11 @@ import de.steamwar.Reflection;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import lombok.Getter;
+import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.SimpleBitStorage;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import org.bukkit.entity.Player;
@@ -90,10 +92,14 @@ public class ChunkHider {
         };
     }
 
+    private static final Registry<BlockEntityType<?>> registry = Reflection.getField(BuiltInRegistries.class, "BLOCK_ENTITY_TYPE", Registry.class).get(null);
+    private static final Reflection.Method getKey = Reflection.getTypedMethod(Reflection.getClass("net.minecraft.core.Registry"), "getKey", ResourceLocation.class, Object.class);
     public static final Class<?> tileEntity = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData$BlockEntityInfo");
     protected static final Reflection.Field<BlockEntityType> entityType = Reflection.getField(tileEntity, BlockEntityType.class, 0);
     protected boolean tileEntityVisible(Set<String> hiddenBlockEntities, Object tile) {
-        return !hiddenBlockEntities.contains(BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(entityType.get(tile)).getPath());
+        BlockEntityType type = entityType.get(tile);
+        String path = ((ResourceLocation) getKey.invoke(registry, type)).getPath();
+        return !hiddenBlockEntities.contains(path);
     }
 
     private void blocks(SectionHider section) {