From 2363ad8c6c62f1d5d2afcee4069f83398fc919ee Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 12 Jun 2022 21:24:19 -0700 Subject: [PATCH] fix reflection proxies --- .../dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java | 2 +- .../com/dfsek/terra/bukkit/nms/v1_18_R2/Reflection.java | 8 ++++---- .../com/dfsek/terra/bukkit/nms/v1_19_R1/Reflection.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java index 544072061..d7a03ef1e 100644 --- a/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java +++ b/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSBiomeInjector.java @@ -121,7 +121,7 @@ public class NMSBiomeInjector { Biome.BiomeBuilder builder = new Biome.BiomeBuilder(); // Builder - builder.biomeCategory(Reflection.BIOME.getCategory(vanilla)) + builder.biomeCategory(Reflection.BIOME.getBiomeCategory(vanilla)) .precipitation(vanilla.getPrecipitation()) // getPrecipitation .mobSpawnSettings(vanilla.getMobSettings()) .generationSettings(vanilla.getGenerationSettings()) diff --git a/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/Reflection.java b/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/Reflection.java index 785c93bf5..53e9e80f9 100644 --- a/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/Reflection.java +++ b/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/Reflection.java @@ -21,15 +21,15 @@ public class Reflection { BIOME = reflectionProxyFactory.reflectionProxy(BiomeProxy.class); } - @Proxies + @Proxies(MappedRegistry.class) public interface MappedRegistryProxy { @FieldSetter("frozen") void setFrozen(MappedRegistry instance, boolean frozen); } - @Proxies + @Proxies(Biome.class) public interface BiomeProxy { - @FieldGetter("category") - Biome.BiomeCategory getCategory(Biome instance); + @FieldGetter("biomeCategory") + Biome.BiomeCategory getBiomeCategory(Biome instance); } } diff --git a/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/Reflection.java b/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/Reflection.java index 35beefb41..157157005 100644 --- a/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/Reflection.java +++ b/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/Reflection.java @@ -17,7 +17,7 @@ public class Reflection { MAPPED_REGISTRY = reflectionProxyFactory.reflectionProxy(MappedRegistryProxy.class); } - @Proxies + @Proxies(MappedRegistry.class) public interface MappedRegistryProxy { @FieldSetter("frozen") void setFrozen(MappedRegistry instance, boolean frozen);