2.0.0-alpha.4

build.gradle.kts

@@ -88,20 +88,9 @@ allprojects {
         modLocalRuntime("net.glasslauncher.mods:ModMenu:${project.properties["modmenu_version"]}") {
             isTransitive = false
         }
-
-        implementation("blue.endless:jankson:1.2.1")
-        implementation("me.carleslc:Simple-Yaml:1.8.4")
-        modLocalRuntime("net.glasslauncher.mods:glass-networking:1.0.2") {
-            isTransitive = false
-        }
-        modLocalRuntime("net.glasslauncher.mods:GlassConfigAPI:${project.properties["gcapi_version"]}") {
-            isTransitive = false
-        }
-        modLocalRuntime("net.glasslauncher:HowManyItems-Fabric-Unofficial:${project.properties["hmi_version"]}") {
+        modLocalRuntime("maven.modrinth:retrocommands:${project.properties["rc_version"]}") {
             isTransitive = false
         }
-        // Optional bugfix mod for testing qol. Remove the // to enable.
-        //modLocalRuntime "maven.modrinth:mojangfix:${project.properties["mojangfix_version"]}"
 
         annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.4.1")
     }

gradle.properties

@@ -15,19 +15,17 @@ fabric.loom.multiProjectOptimisation=true
 
 # Library Properties
     typetools_version = 0.8.3
-    unsafeevents_version = 17ac2971
+    unsafeevents_version = e31096e
     fastutil_version = 8.5.8
     caffeine_version = 3.0.5
     dfu_version = 6.0.6
     spasm_version = 0.2.2
 
 # Mod Properties
-    mod_version = 2.0.0-alpha.3
+    mod_version = 2.0.0-alpha.4
     maven_group = net.modificationstation
     archives_base_name = StationAPI
 
 # Test properties
-    gcapi_version = 3.0.0
-    hmi_version = 5.2.1
     modmenu_version = 1.8.5-beta.9
-    mojangfix_version = 0.5.2
+    rc_version = 0.5.4

src/main/resources/fabric.mod.json

@@ -20,7 +20,7 @@
   "environment": "*",
 
   "depends": {
-    "java": "17",
+    "java": ">=17",
     "fabricloader": "*",
     "minecraft": "1.0.0-beta.7.3",
     "station-registry-api-v0": "*",

src/test/java/net/modificationstation/sltest/SLTest.java

@@ -6,21 +6,13 @@
 import net.mine_diver.unsafeevents.listener.EventListener;
 import net.mine_diver.unsafeevents.listener.ListenerPriority;
 import net.modificationstation.stationapi.api.event.mod.InitEvent;
-import net.modificationstation.stationapi.api.mod.entrypoint.Entrypoint;
 import net.modificationstation.stationapi.api.util.Namespace;
-import net.modificationstation.stationapi.api.util.Null;
 import org.apache.logging.log4j.Logger;
 
 public class SLTest {
+    public static final Namespace NAMESPACE = Namespace.resolve();
 
-    @Entrypoint.Logger
-    public static final Logger LOGGER = Null.get();
-
-    @Entrypoint.Instance
-    public static final SLTest INSTANCE = Null.get();
-
-    @Entrypoint.Namespace
-    public static final Namespace NAMESPACE = Null.get();
+    public static final Logger LOGGER = NAMESPACE.getLogger();
 
     @EventListener
     public void init(InitEvent event) {

src/test/java/net/modificationstation/sltest/block/Blocks.java

@@ -5,9 +5,11 @@
 import net.minecraft.block.Material;
 import net.modificationstation.sltest.mixin.BlockBaseAccessor;
 import net.modificationstation.stationapi.api.event.registry.BlockRegistryEvent;
+import net.modificationstation.stationapi.api.mod.entrypoint.EntrypointManager;
 import net.modificationstation.stationapi.api.template.block.TemplateBlock;
 import net.modificationstation.stationapi.api.util.Identifier;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.function.Function;
 
@@ -37,6 +39,9 @@ public Block get() {
     }
 
     public static class Init {
+        static {
+            EntrypointManager.registerLookup(MethodHandles.lookup());
+        }
 
         @EventListener
         private static void registerBlocks(BlockRegistryEvent event) {

src/test/java/net/modificationstation/sltest/datafixer/DataFixerListener.java

@@ -3,12 +3,18 @@
 import net.mine_diver.unsafeevents.listener.EventListener;
 import net.minecraft.nbt.NbtCompound;
 import net.modificationstation.stationapi.api.event.datafixer.DataFixerRegisterEvent;
+import net.modificationstation.stationapi.api.mod.entrypoint.EntrypointManager;
 import net.modificationstation.stationapi.api.util.Util;
 
+import java.lang.invoke.MethodHandles;
+
 import static net.modificationstation.stationapi.api.vanillafix.datafixer.schema.StationFlatteningItemStackSchema.putItem;
 import static net.modificationstation.stationapi.api.vanillafix.datafixer.schema.StationFlatteningItemStackSchema.putState;
 
 public class DataFixerListener {
+    static {
+        EntrypointManager.registerLookup(MethodHandles.lookup());
+    }
 
     @EventListener
     private static void registerFixer(DataFixerRegisterEvent event) {

src/test/java/net/modificationstation/sltest/dimension/DimensionListener.java

@@ -2,13 +2,19 @@
 
 import net.mine_diver.unsafeevents.listener.EventListener;
 import net.modificationstation.stationapi.api.event.registry.DimensionRegistryEvent;
+import net.modificationstation.stationapi.api.mod.entrypoint.EntrypointManager;
 import net.modificationstation.stationapi.api.registry.DimensionContainer;
 import net.modificationstation.stationapi.api.registry.DimensionRegistry;
 
+import java.lang.invoke.MethodHandles;
+
 import static net.modificationstation.sltest.SLTest.NAMESPACE;
 import static net.modificationstation.stationapi.api.util.Identifier.of;
 
 public class DimensionListener {
+    static {
+        EntrypointManager.registerLookup(MethodHandles.lookup());
+    }
 
     @EventListener
     private static void registerDimensions(DimensionRegistryEvent event) {

src/test/java/net/modificationstation/sltest/entity/EntityListener.java

@@ -4,7 +4,6 @@
 import net.modificationstation.stationapi.api.event.entity.EntityRegister;
 import net.modificationstation.stationapi.api.event.registry.EntityHandlerRegistryEvent;
 import net.modificationstation.stationapi.api.event.registry.MobHandlerRegistryEvent;
-import net.modificationstation.stationapi.api.registry.Registry;
 
 import static net.modificationstation.sltest.SLTest.NAMESPACE;
 import static net.modificationstation.stationapi.api.util.Identifier.of;
@@ -19,11 +18,11 @@ public void registerEntities(EntityRegister event) {
 
     @EventListener
     public void registerEntityHandlers(EntityHandlerRegistryEvent event) {
-        Registry.register(event.registry, TestEntity.ID, TestEntity::new);
+        event.register(TestEntity.ID, TestEntity::new);
     }
 
     @EventListener
     public void registerMobHandlers(MobHandlerRegistryEvent event) {
-        Registry.register(event.registry, of(NAMESPACE, "gpoor"), PoorGuy::new);
+        event.register(of(NAMESPACE, "gpoor"), PoorGuy::new);
     }
 }

src/test/java/net/modificationstation/sltest/gui/GuiListener.java

@@ -9,18 +9,15 @@
 import net.modificationstation.sltest.SLTest;
 import net.modificationstation.sltest.tileentity.TileEntityFreezer;
 import net.modificationstation.stationapi.api.client.gui.screen.GuiHandler;
-import net.modificationstation.stationapi.api.client.registry.GuiHandlerRegistry;
 import net.modificationstation.stationapi.api.event.registry.GuiHandlerRegistryEvent;
-import net.modificationstation.stationapi.api.registry.Registry;
 import net.modificationstation.stationapi.api.util.Identifier;
 
 public class GuiListener {
 
     @Environment(EnvType.CLIENT)
     @EventListener
     public void registerGuiHandlers(GuiHandlerRegistryEvent event) {
-        GuiHandlerRegistry registry = event.registry;
-        Registry.register(registry, Identifier.of(SLTest.NAMESPACE, "freezer"), new GuiHandler((GuiHandler.ScreenFactoryNoMessage) this::openFreezer, TileEntityFreezer::new));
+        event.register(Identifier.of(SLTest.NAMESPACE, "freezer"), new GuiHandler((GuiHandler.ScreenFactoryNoMessage) this::openFreezer, TileEntityFreezer::new));
     }
 
     @Environment(EnvType.CLIENT)

src/test/java/net/modificationstation/sltest/item/ItemListener.java

@@ -11,7 +11,6 @@
 import net.modificationstation.stationapi.api.item.tool.ToolMaterialFactory;
 import net.modificationstation.stationapi.api.registry.BlockRegistry;
 import net.modificationstation.stationapi.api.registry.ItemRegistry;
-import net.modificationstation.stationapi.api.registry.Registry;
 import net.modificationstation.stationapi.api.tag.TagKey;
 import net.modificationstation.stationapi.api.template.item.BlockStateItem;
 
@@ -34,8 +33,8 @@ public void registerItems(ItemRegistryEvent event) {
         testPickaxe = new ModdedPickaxeItem(NAMESPACE.id("test_pickaxe"), testMaterial).setTranslationKey(NAMESPACE, "testPickaxe"); //8476
         testNBTItem = new NBTItem(NAMESPACE.id("nbt_item")).setTranslationKey(NAMESPACE, "nbt_item"); //8477
         testModelItem = new ModelItem(NAMESPACE.id("model_item")).setMaxCount(1).setTranslationKey(NAMESPACE, "idkSomething");
-        ironOre = Registry.register(event.registry, NAMESPACE.id("ironOre"), new Item(ItemRegistry.AUTO_ID)).setTranslationKey(NAMESPACE.id("ironOre"));
-        generatedItem = Registry.register(event.registry, NAMESPACE.id("generated_item"), new Item(ItemRegistry.AUTO_ID)).setTranslationKey(NAMESPACE.id("generatedItem"));
+        ironOre = event.register(NAMESPACE.id("ironOre"), new Item(ItemRegistry.AUTO_ID)).setTranslationKey(NAMESPACE.id("ironOre"));
+        generatedItem = event.register(NAMESPACE.id("generated_item"), new Item(ItemRegistry.AUTO_ID)).setTranslationKey(NAMESPACE.id("generatedItem"));
         variationBlockIdle = new BlockStateItem(NAMESPACE.id("variation_block_idle"), Blocks.VARIATION_BLOCK.get().getDefaultState()).setTranslationKey(NAMESPACE, "variationBlockIdle");
         variationBlockPassive = new BlockStateItem(NAMESPACE.id("variation_block_passive"), Blocks.VARIATION_BLOCK.get().getDefaultState().with(VariationBlock.VARIANT, VariationBlock.Variant.PASSIVE)).setTranslationKey(NAMESPACE, "variationBlockPassive");
         variationBlockActive = new BlockStateItem(NAMESPACE.id("variation_block_active"), Blocks.VARIATION_BLOCK.get().getDefaultState().with(VariationBlock.VARIANT, VariationBlock.Variant.ACTIVE)).setTranslationKey(NAMESPACE, "variationBlockActive");

src/test/java/net/modificationstation/sltest/packet/MessageListenerListener.java

@@ -8,18 +8,14 @@
 import net.modificationstation.sltest.item.ModdedItem;
 import net.modificationstation.stationapi.api.event.registry.MessageListenerRegistryEvent;
 import net.modificationstation.stationapi.api.network.packet.MessagePacket;
-import net.modificationstation.stationapi.api.registry.Registry;
-import net.modificationstation.stationapi.api.util.Identifier;
-
-import java.util.function.BiConsumer;
 
 public class MessageListenerListener {
 
     @EventListener
     public void registerMessageListeners(MessageListenerRegistryEvent event) {
-        Registry<BiConsumer<PlayerEntity, MessagePacket>> registry = event.registry;
-        Registry.register(registry, Identifier.of(SLTest.NAMESPACE, "give_me_diamonds"), this::handleGiveMeDiamonds);
-        Registry.register(registry, Identifier.of(SLTest.NAMESPACE, "send_an_object"), this::handleSendCoords);
+        event.register(SLTest.NAMESPACE)
+                .accept("give_me_diamonds", this::handleGiveMeDiamonds)
+                .accept("send_an_object", this::handleSendCoords);
     }
 
     public void handleGiveMeDiamonds(PlayerEntity playerBase, MessagePacket message) {

src/test/resources/fabric.mod.json

@@ -25,7 +25,6 @@
       "net.modificationstation.sltest.SLTest",
       "net.modificationstation.sltest.recipe.RecipeListener",
       "net.modificationstation.sltest.achievement.AchievementListener",
-      "net.modificationstation.sltest.entity.player.PlayerHandlerListener",
       "net.modificationstation.sltest.level.gen.ChunkListener",
       "net.modificationstation.sltest.entity.EntityListener",
       "net.modificationstation.sltest.tileentity.TileEntityListener",

station-achievements-v0/src/main/java/net/modificationstation/stationapi/impl/client/gui/screen/achievement/AchievementPageImpl.java

@@ -10,15 +10,21 @@
 import net.modificationstation.stationapi.api.client.gui.screen.achievement.AchievementPage;
 import net.modificationstation.stationapi.api.event.achievement.AchievementRegisterEvent;
 import net.modificationstation.stationapi.api.mod.entrypoint.Entrypoint;
+import net.modificationstation.stationapi.api.mod.entrypoint.EntrypointManager;
 import net.modificationstation.stationapi.api.mod.entrypoint.EventBusPolicy;
 
+import java.lang.invoke.MethodHandles;
 import java.util.List;
 
 import static net.modificationstation.stationapi.api.StationAPI.NAMESPACE;
 
 @Entrypoint(eventBus = @EventBusPolicy(registerInstance = false))
 @EventListener(phase = StationAPI.INTERNAL_PHASE)
 public class AchievementPageImpl {
+    static {
+        EntrypointManager.registerLookup(MethodHandles.lookup());
+    }
+
     @EventListener
     private static void replaceBackgroundTexture(AchievementsScreenEvent.BackgroundTextureRender event) {
         event.backgroundTexture = AchievementPage.getCurrentPage().getBackgroundTexture(event.random, event.column, event.row, event.randomizedRow, event.backgroundTexture);

station-api-base/src/main/java/net/modificationstation/stationapi/api/StationAPI.java

@@ -10,7 +10,6 @@
 import net.modificationstation.stationapi.api.mod.entrypoint.EventBusPolicy;
 import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.util.Namespace;
-import net.modificationstation.stationapi.api.util.Null;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.config.Configurator;
@@ -25,20 +24,12 @@
         registerStatic = false
 ))
 public class StationAPI implements PreLaunchEntrypoint {
-    /**
-     * StationAPI's instance.
-     */
-    @Entrypoint.Instance
-    public static final StationAPI INSTANCE = Null.get();
-
     /**
      * StationAPI's namespace.
      */
-    @Entrypoint.Namespace
     public static final Namespace NAMESPACE = Namespace.of("stationapi");
 
-    @Entrypoint.Logger("Station|API")
-    public static final Logger LOGGER = Null.get();
+    public static final Logger LOGGER = NAMESPACE.getLogger("Station|API");
 
     @ApiStatus.Internal
     public static final String INTERNAL_PHASE = "stationapi:internal";
@@ -53,7 +44,6 @@ public class StationAPI implements PreLaunchEntrypoint {
      */
     @Override
     public void onPreLaunch() {
-        FabricLoader.getInstance().getModContainer("stationapi").ifPresent(modContainer -> EntrypointManager.setup(this, modContainer));
         String name = NAMESPACE.getName();
         LOGGER.info("Initializing " + name + "...");
         Configurator.setLevel("mixin", Level.TRACE);