Removed EnumFactory.

station-entities-v0/src/main/java/net/modificationstation/stationapi/api/entity/EntityTypeFactory.java

@@ -5,16 +5,13 @@
 import net.minecraft.block.Material;
 import net.minecraft.class_238;
 import net.minecraft.entity.Entity;
-import net.modificationstation.stationapi.api.factory.EnumFactory;
+import net.modificationstation.stationapi.mixin.entity.EntityTypeAccessor;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class EntityTypeFactory {
+    private static int nextId = class_238.values().length;
 
     public static class_238 create(String typeName, Class<? extends Entity> typeSuperClass, int unusedInt, Material spawnMaterial, boolean unusedBoolean) {
-        return EnumFactory.addEnum(
-                class_238.class, typeName,
-                new Class[] { Class.class, int.class, Material.class, boolean.class },
-                typeSuperClass, unusedInt, spawnMaterial, unusedBoolean
-        );
+        return EntityTypeAccessor.stationapi_create(typeName, nextId++, typeSuperClass, unusedInt, spawnMaterial, unusedBoolean);
     }
 }

station-entities-v0/src/main/java/net/modificationstation/stationapi/mixin/entity/EntityTypeAccessor.java

@@ -0,0 +1,16 @@
+package net.modificationstation.stationapi.mixin.entity;
+
+import net.minecraft.block.Material;
+import net.minecraft.class_238;
+import net.minecraft.entity.Entity;
+import net.modificationstation.stationapi.api.util.Util;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(class_238.class)
+public interface EntityTypeAccessor {
+    @Invoker("<init>")
+    static class_238 stationapi_create(String typeName, int id, Class<? extends Entity> typeSuperClass, int unusedInt, Material spawnMaterial, boolean unusedBoolean) {
+        return Util.assertMixin();
+    }
+}

station-entities-v0/src/main/resources/station-entities-v0.mixins.json

@@ -4,7 +4,8 @@
   "package": "net.modificationstation.stationapi.mixin.entity",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "EntityRegistryMixin"
+    "EntityRegistryMixin",
+    "EntityTypeAccessor"
   ],
   "server": [
     "server.ServerEntityTrackerMixin",

station-keybindings-v0/src/main/java/net/modificationstation/stationapi/api/client/option/OptionFactory.java

@@ -3,15 +3,13 @@
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import net.minecraft.client.option.Option;
-import net.modificationstation.stationapi.api.factory.EnumFactory;
+import net.modificationstation.stationapi.mixin.keybinding.client.OptionAccessor;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class OptionFactory {
+    private static int nextId = Option.values().length;
+
     public static Option create(String optionName, String translationKey, boolean slider, boolean toggle) {
-        return EnumFactory.addEnum(
-                Option.class, optionName,
-                new Class[] { String.class, boolean.class, boolean.class },
-                translationKey, slider, toggle
-        );
+        return OptionAccessor.stationapi_create(optionName, nextId++, translationKey, slider, toggle);
     }
 }

station-keybindings-v0/src/main/java/net/modificationstation/stationapi/mixin/keybinding/client/OptionAccessor.java

@@ -0,0 +1,14 @@
+package net.modificationstation.stationapi.mixin.keybinding.client;
+
+import net.minecraft.client.option.Option;
+import net.modificationstation.stationapi.api.util.Util;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(Option.class)
+public interface OptionAccessor {
+    @Invoker("<init>")
+    static Option stationapi_create(String optionName, int id, String translationKey, boolean slider, boolean toggle) {
+        return Util.assertMixin();
+    }
+}

station-keybindings-v0/src/main/resources/station-keybindings-v0.mixins.json

@@ -8,6 +8,7 @@
   "client": [
     "client.GameOptionsMixin",
     "client.MinecraftMixin",
+    "client.OptionAccessor",
     "client.ScreenMixin"
   ],
   "injectors": {

station-tools-api-v1/src/main/java/net/modificationstation/stationapi/api/item/tool/ToolMaterialFactory.java

@@ -1,14 +1,12 @@
 package net.modificationstation.stationapi.api.item.tool;
 
 import net.minecraft.item.ToolMaterial;
-import net.modificationstation.stationapi.api.factory.EnumFactory;
+import net.modificationstation.stationapi.mixin.tools.ToolMaterialAccessor;
 
 public class ToolMaterialFactory {
+    private static int nextId = ToolMaterial.values().length;
+
     public static ToolMaterial create(String materialName, int miningLevel, int durability, float miningSpeed, int attackDamage) {
-        return EnumFactory.addEnum(
-                ToolMaterial.class, materialName,
-                new Class[] { int.class, int.class, float.class, int.class },
-                miningLevel, durability, miningSpeed, attackDamage
-        );
+        return ToolMaterialAccessor.stationapi_create(materialName, nextId++, miningLevel, durability, miningSpeed, attackDamage);
     }
 }

station-tools-api-v1/src/main/java/net/modificationstation/stationapi/mixin/tools/ToolMaterialAccessor.java

@@ -0,0 +1,14 @@
+package net.modificationstation.stationapi.mixin.tools;
+
+import net.minecraft.item.ToolMaterial;
+import net.modificationstation.stationapi.api.util.Util;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(ToolMaterial.class)
+public interface ToolMaterialAccessor {
+    @Invoker("<init>")
+    static ToolMaterial stationapi_create(String materialName, int id, int miningLevel, int itemDurability, float miningSpeed, int attackDamage) {
+        return Util.assertMixin();
+    }
+}

station-tools-api-v1/src/main/resources/station-tools-api-v1.mixins.json

@@ -12,6 +12,7 @@
     "ShovelItemMixin",
     "SwordItemMixin",
     "ToolItemMixin",
+    "ToolMaterialAccessor",
     "ToolMaterialMixin"
   ],
   "server": [