2.0.0-alpha.4 (#163)

* Switched from HMI to RetroCommands

* Removed broken reimplementation of Divisor's old PlayerAPI. (#139)

* Removed Indigo renderer (#140)

* Updated UnsafeEvents

* ContextVariable

* ContextVariable#get

* Feature/register helper (#146)

* Added register helper methods to RegistryEvent

* Remove unused BulkConsumer.

* Updated all registries to be entry type bound.

* Updated all usages of Registry#register to new helper methods where applicable.

* Moved bulk registration helpers implementation to Registry interface and redirected event method helpers to that.

* Swapped namespace and rawIdGetter placements so they better reflect the original method arguments.

* cleanup/java-hacks (#145)

* Cleaned up Java hacks related to entrypoints

* Removed EnumFactory.

* Removed NativeImage Unsafe buffer cleaner invocation.

* Replaced fake BlockItem with null, since MixinExtras allows that, unlike vanilla Mixin's Redirect.

* Removed UnsafeProvider.

* Updated javadoc for EntrypointManager#registerLookup

* Fix a NPE in shears override

* Fix a NPE in FuelRegistry

* Added StationFlatteningBlock#onStateReplaced

* Fixed #159

* Change version

Author: mineLdiver

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);
     }
 }