fix: crash on dedicated servers

JamCoreModding · Jun 21, 2023 · aa156e5 · aa156e5
2 parents b72fb12 + 6c0ed8f
commit aa156e5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
 ## Changelog
 
-- Fix final tutorial stage constantly triggering after it has already been finished.
+- Fix crash on dedicated servers.
diff --git a/gradle.properties b/gradle.properties
@@ -3,8 +3,8 @@ org.gradle.parallel=true
 
 # Name of your built jar
 archive_base_name=tutorial-lib
-mod_version=1.1.1+1.20.x
-release_name=V1.1.1 [1.20.x]
+mod_version=1.1.2+1.20.x
+release_name=V1.1.2 [1.20.x]
 supported_versions=1.20,1.20.1
 
 # Used for releasing GitHub releases

diff --git a/src/main/java/io/github/jamalam360/tutorial/lib/CustomTutorialToast.java b/src/main/java/io/github/jamalam360/tutorial/lib/CustomTutorialToast.java
@@ -25,6 +25,8 @@
 package io.github.jamalam360.tutorial.lib;
 
 import java.util.List;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.toast.Toast;
@@ -40,6 +42,7 @@
  * A copy of {@link TutorialToast} which allows custom textures and dynamically expands to fit its content.
  * Textures must be 256x256.
  */
+@Environment(EnvType.CLIENT)
 public class CustomTutorialToast extends TutorialToast implements ToastDuck {
 
     private static final int TEXT_LEFT_MARGIN = 30;

diff --git a/src/main/java/io/github/jamalam360/tutorial/lib/Tutorial.java b/src/main/java/io/github/jamalam360/tutorial/lib/Tutorial.java
@@ -25,6 +25,8 @@
 package io.github.jamalam360.tutorial.lib;
 
 import io.github.jamalam360.tutorial.lib.stage.Stage;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.tutorial.TutorialManager;
 import org.jetbrains.annotations.ApiStatus;
@@ -35,6 +37,7 @@
  *
  * @see Stage
  */
+@Environment(EnvType.CLIENT)
 public class Tutorial {
 
     private final Stage[] stages;

diff --git a/src/main/java/io/github/jamalam360/tutorial/lib/TutorialLib.java b/src/main/java/io/github/jamalam360/tutorial/lib/TutorialLib.java
@@ -27,7 +27,9 @@
 import io.github.jamalam360.tutorial.lib.stage.DelayedStage;
 import java.util.List;
 import java.util.stream.Collectors;
-import net.fabricmc.api.ModInitializer;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
 import net.minecraft.client.MinecraftClient;
@@ -40,7 +42,8 @@
 /**
  * @see Tutorial
  */
-public class TutorialLib implements ModInitializer {
+@Environment(EnvType.CLIENT)
+public class TutorialLib implements ClientModInitializer {
 
     public static final String MOD_ID = "tutorial-lib";
     public static final Registry<Tutorial> TUTORIAL_REGISTRY = FabricRegistryBuilder
@@ -57,7 +60,7 @@ public static Identifier idOf(String path) {
     }
 
     @Override
-    public void onInitialize() {
+    public void onInitializeClient() {
         ClientTickEvents.END_WORLD_TICK.register(world -> {
             for (Tutorial tutorial : getTutorials()) {
                 if (tutorial.getCurrentStage() instanceof DelayedStage delayedStage

diff --git a/src/main/java/io/github/jamalam360/tutorial/lib/stage/Stage.java b/src/main/java/io/github/jamalam360/tutorial/lib/stage/Stage.java
@@ -25,6 +25,8 @@
 package io.github.jamalam360.tutorial.lib.stage;
 
 import io.github.jamalam360.tutorial.lib.ToastDuck;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.toast.TutorialToast;
 import net.minecraft.client.tutorial.TutorialManager;
 import org.jetbrains.annotations.ApiStatus;
@@ -44,6 +46,7 @@
  *     </li>
  * </ol>
  */
+@Environment(EnvType.CLIENT)
 public abstract class Stage {
 
     private final TutorialToast toast;

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -13,10 +13,10 @@
   },
   "license": "MIT",
   "icon": "assets/tutorial-lib/icon.png",
-  "environment": "*",
+  "environment": "client",
   "accessWidener": "tutoriallib.accesswidener",
   "entrypoints": {
-    "main": [
+    "client": [
       "io.github.jamalam360.tutorial.lib.TutorialLib"
     ]
   },