Rework entire creative category/group mapping system

GeyserMC · Apr 5, 2024 · 53ad95c · 53ad95c
1 parent 30cdb6c
commit 53ad95c
Show file tree

Hide file tree

Showing 5 changed files with 420 additions and 78 deletions.
diff --git a/shared/src/main/java/org/geysermc/hydraulic/item/CreativeMapping.java b/shared/src/main/java/org/geysermc/hydraulic/item/CreativeMapping.java
@@ -1,18 +1,15 @@
 package org.geysermc.hydraulic.item;
 
 import org.geysermc.geyser.api.util.CreativeCategory;
+import org.geysermc.hydraulic.util.ItemGroup;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Represents a creative mapping for the creative
  * group and {@link CreativeCategory category}.
  */
-public record CreativeMapping(@NotNull String creativeGroup, @NotNull CreativeCategory creativeCategory) {
-    public CreativeMapping(String creativeGroup) {
-        this(creativeGroup, CreativeCategory.ITEMS);
-    }
-
+public record CreativeMapping(@NotNull ItemGroup creativeGroup, @NotNull CreativeCategory creativeCategory) {
     public CreativeMapping(CreativeCategory creativeCategory) {
-        this("", creativeCategory);
+        this(ItemGroup.NONE, creativeCategory);
     }
 }
diff --git a/shared/src/main/java/org/geysermc/hydraulic/item/CreativeMappingTarget.java b/shared/src/main/java/org/geysermc/hydraulic/item/CreativeMappingTarget.java
@@ -0,0 +1,10 @@
+package org.geysermc.hydraulic.item;
+
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+
+import java.util.List;
+
+public record CreativeMappingTarget(List<Class<? extends Item>> itemClasses, List<TagKey<Item>> itemTags, List<Class<? extends Block>> blockClasses, List<TagKey<Block>> blockTags) {
+}