Update to StationAPI 2.0.0-alpha.4

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
         run: ./gradlew build
       - name: capture build artifacts
         if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/

gradle.properties

@@ -9,15 +9,15 @@ yarn_mappings=b1.7.3+c6a9668
 loader_version=0.15.6-babric.1
 
 # Mod Properties
-mod_version=1.1.6
+mod_version=1.1.7
 maven_group=net.mine_diver
 archives_base_name=SmoothBeta
 
 # Dependencies
-stapi_version=2.0.0-alpha.3
+stapi_version=2.0.0-alpha.4
 
 # Extra Dependencies
-glass_networking_version=1.0.3
-gcapi_version=3.0.2
-alwaysmoreitems_version=1.4.0
-modmenu_version=1.8.5-beta.9
+glass_networking_version=1.0.4
+gcapi_version=3.0.4
+alwaysmoreitems_version=1.5.3
+modmenu_version=1.8.5-beta.11

src/main/java/net/mine_diver/smoothbeta/SmoothBeta.java

@@ -3,14 +3,12 @@
 import net.modificationstation.stationapi.api.mod.entrypoint.Entrypoint;
 import net.modificationstation.stationapi.api.mod.entrypoint.EventBusPolicy;
 import net.modificationstation.stationapi.api.util.Namespace;
-import net.modificationstation.stationapi.api.util.Null;
 import org.apache.logging.log4j.Logger;
 
 @Entrypoint(eventBus = @EventBusPolicy(registerStatic = false, registerInstance = false))
 public class SmoothBeta {
-    @Entrypoint.Namespace
-    public static final Namespace NAMESPACE = Null.get();
+    @SuppressWarnings("UnstableApiUsage")
+    public static final Namespace NAMESPACE = Namespace.resolve();
 
-    @Entrypoint.Logger
-    public static final Logger LOGGER = Null.get();
+    public static final Logger LOGGER = NAMESPACE.getLogger();
 }

src/main/java/net/mine_diver/smoothbeta/client/render/Shaders.java

@@ -3,12 +3,14 @@
 import net.mine_diver.smoothbeta.client.render.gl.Program;
 import net.mine_diver.unsafeevents.listener.EventListener;
 import net.modificationstation.stationapi.api.client.event.resource.AssetsResourceReloaderRegisterEvent;
+import net.modificationstation.stationapi.api.mod.entrypoint.EntrypointManager;
 import net.modificationstation.stationapi.api.resource.IdentifiableResourceReloadListener;
 import net.modificationstation.stationapi.api.resource.ResourceManager;
 import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.util.profiler.Profiler;
 
 import java.io.IOException;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -18,6 +20,10 @@
 import static net.mine_diver.smoothbeta.SmoothBeta.NAMESPACE;
 
 public class Shaders implements IdentifiableResourceReloadListener {
+    static {
+        EntrypointManager.registerLookup(MethodHandles.lookup());
+    }
+
     public static final Identifier ID = NAMESPACE.id("shaders");
 
     private static Shader terrainShader;

src/main/java/net/mine_diver/smoothbeta/mixin/client/multidraw/WorldRendererMixin.java

@@ -24,7 +24,7 @@
 
 @Mixin(WorldRenderer.class)
 abstract class WorldRendererMixin implements SmoothWorldRenderer {
-    @Shadow private ChunkRenderer[] field_1794;
+    @Shadow private ChunkRenderer[] chunkRenderers;
 
     @Unique
     private VboPool smoothbeta_vboPool;
@@ -66,7 +66,7 @@ private ChunkRenderer smoothbeta_injectRenderRegion() {
             locals = LocalCapture.CAPTURE_FAILHARD
     )
     private void smoothbeta_addBufferToRegion(int j, int k, int d, double par4, CallbackInfoReturnable<Integer> cir, int var6, LivingEntity var7, double var8, double var10, double var12, int var14, int var15, ChunkBuilder var16, int var17) {
-        ((RenderRegion) this.field_1794[var17]).addBuffer(((SmoothChunkRenderer) var16).smoothbeta_getBuffer(d));
+        ((RenderRegion) this.chunkRenderers[var17]).addBuffer(((SmoothChunkRenderer) var16).smoothbeta_getBuffer(d));
     }
 
     @Redirect(