Improve registry and tag code

AlexProgrammerDE · Nov 21, 2024 · 5b05cb7 · 5b05cb7
1 parent 5d0e831
commit 5b05cb7
Show file tree

Hide file tree

Showing 20 changed files with 243 additions and 5 deletions.
diff --git a/data-generator/src/main/java/com/soulfiremc/generator/generators/EntitiesJsonGenerator.java b/data-generator/src/main/java/com/soulfiremc/generator/generators/EntitiesJsonGenerator.java
@@ -46,6 +46,11 @@ public static JsonObject generateEntity(EntityType<?> entityType) {
 
     entityDesc.addProperty("width", dimensions.width());
     entityDesc.addProperty("height", dimensions.height());
+    entityDesc.addProperty("eyeHeight", dimensions.eyeHeight());
+    if (dimensions.fixed()) {
+      entityDesc.addProperty("fixed", true);
+    }
+
     entityDesc.addProperty("updateInterval", entityType.updateInterval());
     entityDesc.addProperty("clientTrackingRange", entityType.clientTrackingRange());
 

diff --git a/data-generator/src/main/resources/templates/AttributeType.java b/data-generator/src/main/resources/templates/AttributeType.java
@@ -53,4 +53,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return id;
   }
+
+  @Override
+  public Registry<AttributeType> registry() {
+    return REGISTRY;
+  }
 }
diff --git a/data-generator/src/main/resources/templates/BlockType.java b/data-generator/src/main/resources/templates/BlockType.java
@@ -86,6 +86,11 @@ public int hashCode() {
     return id;
   }
 
+  @Override
+  public Registry<BlockType> registry() {
+    return REGISTRY;
+  }
+
   public record OffsetData(
     float maxHorizontalOffset, float maxVerticalOffset, OffsetType offsetType) {
     public enum OffsetType {

diff --git a/data-generator/src/main/resources/templates/EffectType.java b/data-generator/src/main/resources/templates/EffectType.java
@@ -53,6 +53,11 @@ public int hashCode() {
     return id;
   }
 
+  @Override
+  public Registry<EffectType> registry() {
+    return REGISTRY;
+  }
+
   public enum EffectCategory {
     BENEFICIAL,
     HARMFUL,

diff --git a/data-generator/src/main/resources/templates/EntityType.java b/data-generator/src/main/resources/templates/EntityType.java
@@ -27,6 +27,8 @@ public record EntityType(
   Key key,
   float width,
   float height,
+  float eyeHeight,
+  boolean fixed,
   int updateInterval,
   int clientTrackingRange,
   String category,
@@ -63,4 +65,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return id;
   }
+
+  @Override
+  public Registry<EntityType> registry() {
+    return REGISTRY;
+  }
 }
diff --git a/data-generator/src/main/resources/templates/FluidType.java b/data-generator/src/main/resources/templates/FluidType.java
@@ -52,4 +52,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return id;
   }
+
+  @Override
+  public Registry<FluidType> registry() {
+    return REGISTRY;
+  }
 }
diff --git a/data-generator/src/main/resources/templates/ItemType.java b/data-generator/src/main/resources/templates/ItemType.java
@@ -52,4 +52,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return id;
   }
+
+  @Override
+  public Registry<ItemType> registry() {
+    return REGISTRY;
+  }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/data/AttributeType.java b/server/src/main/java/com/soulfiremc/server/data/AttributeType.java
@@ -84,4 +84,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return id;
   }
+
+  @Override
+  public Registry<AttributeType> registry() {
+    return REGISTRY;
+  }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/data/BlockType.java b/server/src/main/java/com/soulfiremc/server/data/BlockType.java
@@ -1168,6 +1168,11 @@ public int hashCode() {
     return id;
   }
 
+  @Override
+  public Registry<BlockType> registry() {
+    return REGISTRY;
+  }
+
   public record OffsetData(
     float maxHorizontalOffset, float maxVerticalOffset, OffsetType offsetType) {
     public enum OffsetType {

diff --git a/server/src/main/java/com/soulfiremc/server/data/EffectType.java b/server/src/main/java/com/soulfiremc/server/data/EffectType.java
@@ -91,6 +91,11 @@ public int hashCode() {
     return id;
   }
 
+  @Override
+  public Registry<EffectType> registry() {
+    return REGISTRY;
+  }
+
   public enum EffectCategory {
     BENEFICIAL,
     HARMFUL,

diff --git a/server/src/main/java/com/soulfiremc/server/data/EntityType.java b/server/src/main/java/com/soulfiremc/server/data/EntityType.java
@@ -27,6 +27,8 @@ public record EntityType(
   Key key,
   float width,
   float height,
+  float eyeHeight,
+  boolean fixed,
   int updateInterval,
   int clientTrackingRange,
   String category,
@@ -212,4 +214,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return id;
   }
+
+  @Override
+  public Registry<EntityType> registry() {
+    return REGISTRY;
+  }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/data/FluidType.java b/server/src/main/java/com/soulfiremc/server/data/FluidType.java
@@ -56,4 +56,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return id;
   }
+
+  @Override
+  public Registry<FluidType> registry() {
+    return REGISTRY;
+  }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/data/ItemType.java b/server/src/main/java/com/soulfiremc/server/data/ItemType.java
@@ -1426,4 +1426,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return id;
   }
+
+  @Override
+  public Registry<ItemType> registry() {
+    return REGISTRY;
+  }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/data/Registry.java b/server/src/main/java/com/soulfiremc/server/data/Registry.java
@@ -62,7 +62,7 @@ public int size() {
   }
 
   public RegistryDataWriter writer(FromRegistryDataFactory<T> factory) {
-    return (key, id, data) -> register(factory.create(key, id, data));
+    return (key, id, data) -> register(factory.create(key, id, this, data));
   }
 
   public interface RegistryDataWriter {
@@ -72,6 +72,6 @@ public interface RegistryDataWriter {
   }
 
   public interface FromRegistryDataFactory<T extends RegistryValue<T>> {
-    T create(Key key, int id, NbtMap data);
+    T create(Key key, int id, Registry<T> registry, NbtMap data);
   }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/data/RegistryValue.java b/server/src/main/java/com/soulfiremc/server/data/RegistryValue.java
@@ -23,4 +23,6 @@ public interface RegistryValue<T extends RegistryValue<T>> {
   int id();
 
   Key key();
+
+  Registry<T> registry();
 }
diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/TagsState.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/TagsState.java
@@ -24,6 +24,7 @@
 import net.kyori.adventure.key.Key;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 @Getter
@@ -39,6 +40,13 @@ public <T extends RegistryValue<T>> boolean is(T value, TagKey<T> tagKey) {
     return Arrays.stream(getValuesOfTag(tagKey)).anyMatch(t -> t == value.id());
   }
 
+  public <T extends RegistryValue<T>> List<TagKey<T>> getTags(T value) {
+    return tags.getOrDefault(value.registry().registryKey().key(), Map.of()).entrySet().stream()
+      .filter(entry -> Arrays.stream(entry.getValue()).anyMatch(t -> t == value.id()))
+      .map(entry -> new TagKey<>(value.registry().registryKey(), entry.getKey()))
+      .toList();
+  }
+
   public <T extends RegistryValue<T>> int[] getValuesOfTag(TagKey<T> tagKey) {
     return tags.getOrDefault(tagKey.registry().key(), Map.of())
       .getOrDefault(tagKey.key(), EMPTY_INT_ARRAY);

diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/registry/Biome.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/registry/Biome.java
@@ -17,6 +17,7 @@
  */
 package com.soulfiremc.server.protocol.bot.state.registry;
 
+import com.soulfiremc.server.data.Registry;
 import com.soulfiremc.server.data.RegistryValue;
 import lombok.Getter;
 import net.kyori.adventure.key.Key;
@@ -26,12 +27,14 @@
 public class Biome implements RegistryValue<Biome> {
   private final Key key;
   private final int id;
+  private final Registry<Biome> registry;
   private final float temperature;
   private final float downfall;
 
-  public Biome(Key key, int id, NbtMap biomeData) {
+  public Biome(Key key, int id, Registry<Biome> registry, NbtMap biomeData) {
     this.key = key;
     this.id = id;
+    this.registry = registry;
     this.temperature = biomeData.getFloat("temperature");
     this.downfall = biomeData.getFloat("downfall");
   }

diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/registry/DimensionType.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/registry/DimensionType.java
@@ -17,6 +17,7 @@
  */
 package com.soulfiremc.server.protocol.bot.state.registry;
 
+import com.soulfiremc.server.data.Registry;
 import com.soulfiremc.server.data.RegistryValue;
 import lombok.Getter;
 import net.kyori.adventure.key.Key;
@@ -27,6 +28,7 @@
 public class DimensionType implements RegistryValue<DimensionType> {
   private final Key key;
   private final int id;
+  private final Registry<DimensionType> registry;
   private final String infiniburn;
   private final String effects;
   private final byte ultrawarm;
@@ -45,9 +47,10 @@ public class DimensionType implements RegistryValue<DimensionType> {
   private final byte hasRaids;
   private final byte respawnAnchorWorks;
 
-  public DimensionType(Key key, int id, NbtMap dimensionTypeData) {
+  public DimensionType(Key key, int id, Registry<DimensionType> registry, NbtMap dimensionTypeData) {
     this.key = key;
     this.id = id;
+    this.registry = registry;
     this.infiniburn = dimensionTypeData.getString("infiniburn");
     this.effects = dimensionTypeData.getString("effects");
     this.ultrawarm = dimensionTypeData.getByte("ultrawarm");

diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/registry/SFChatType.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/registry/SFChatType.java
@@ -18,6 +18,7 @@
 package com.soulfiremc.server.protocol.bot.state.registry;
 
 import com.google.gson.JsonElement;
+import com.soulfiremc.server.data.Registry;
 import com.soulfiremc.server.data.RegistryValue;
 import lombok.Getter;
 import lombok.SneakyThrows;
@@ -54,11 +55,13 @@ public class SFChatType implements RegistryValue<SFChatType> {
   private static final IStyleSerializer<JsonElement> JSON_STYLE_SERIALIZER = CODEC.getJsonSerializer().getStyleSerializer();
   private final Key key;
   private final int id;
+  private final Registry<SFChatType> registry;
   private final ChatType mcplChatType;
 
-  public SFChatType(Key key, int id, NbtMap chatTypeData) {
+  public SFChatType(Key key, int id, Registry<SFChatType> registry, NbtMap chatTypeData) {
     this.key = key;
     this.id = id;
+    this.registry = registry;
     this.mcplChatType = new ChatType(
       readDecoration(chatTypeData.getCompound("chat")),
       readDecoration(chatTypeData.getCompound("narration"))