fix crash on dedicated server

reoseah · Nov 3, 2024 · e4cfe5a · e4cfe5a
1 parent 3c7ec41
commit e4cfe5a
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.21.1+build.3
 loader_version=0.16.2
 
 # Mod Properties
-mod_version=0.0.2
+mod_version=0.0.3
 maven_group=io.github.reoseah
 archives_base_name=magisterium
 

diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/BookElement.java b/src/main/java/io/github/reoseah/magisterium/data/element/BookElement.java
@@ -5,6 +5,8 @@
 import com.mojang.serialization.MapCodec;
 import io.github.reoseah.magisterium.spellbook.BookLayout;
 import io.github.reoseah.magisterium.spellbook.BookProperties;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
@@ -18,6 +20,7 @@ public interface BookElement {
 
     MapCodec<? extends BookElement> getCodec();
 
+    @Environment(EnvType.CLIENT)
     void visit(BookLayout.Builder builder, BookProperties properties, TextRenderer textRenderer);
 }
 
diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/BookInventory.java b/src/main/java/io/github/reoseah/magisterium/data/element/BookInventory.java
@@ -3,6 +3,8 @@
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import io.github.reoseah.magisterium.spellbook.BookProperties;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Drawable;
@@ -40,10 +42,12 @@ protected int getHeight(int width, TextRenderer textRenderer) {
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected Drawable createWidget(int x, int y, BookProperties properties, int maxHeight, TextRenderer textRenderer) {
         return new Widget(properties, x, y, background, slots);
     }
 
+    @Environment(EnvType.CLIENT)
     private static class Widget implements Drawable, SlotPropertiesProvider {
         private final BookProperties properties;
         private final int x;

diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/BookmarkElement.java b/src/main/java/io/github/reoseah/magisterium/data/element/BookmarkElement.java
@@ -4,6 +4,8 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import io.github.reoseah.magisterium.spellbook.BookLayout;
 import io.github.reoseah.magisterium.spellbook.BookProperties;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextCodecs;
@@ -29,6 +31,7 @@ public MapCodec<? extends BookElement> getCodec() {
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     public void visit(BookLayout.Builder builder, BookProperties properties, TextRenderer textRenderer) {
         builder.startNewFold();
 

diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/DivisibleBlock.java b/src/main/java/io/github/reoseah/magisterium/data/element/DivisibleBlock.java
@@ -2,11 +2,14 @@
 
 import io.github.reoseah.magisterium.spellbook.BookLayout;
 import io.github.reoseah.magisterium.spellbook.BookProperties;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.Drawable;
 
 public abstract class DivisibleBlock extends SimpleBlock {
     @Override
+    @Environment(EnvType.CLIENT)
     public void visit(BookLayout.Builder builder, BookProperties properties, TextRenderer textRenderer) {
         int elementY = builder.getCurrentY() + (builder.isNewPage() ? 0 : this.getTopMargin());
         int elementHeight = this.getHeight(properties.pageWidth, textRenderer);
@@ -31,10 +34,13 @@ public void visit(BookLayout.Builder builder, BookProperties properties, TextRen
         builder.setCurrentY(builder.getMinY() + pair.nextHeight());
     }
 
+    @Environment(EnvType.CLIENT)
     protected abstract boolean canDivide(int height, int maxHeight, TextRenderer textRenderer);
 
+    @Environment(EnvType.CLIENT)
     protected abstract WidgetPair createWidgetPair(int x, int y, int width, int maxHeight, int nextX, int nextY, int nextHeight, TextRenderer textRenderer);
 
+    @Environment(EnvType.CLIENT)
     protected record WidgetPair(Drawable current, Drawable next, int nextHeight) {
     }
 }
diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/Fold.java b/src/main/java/io/github/reoseah/magisterium/data/element/Fold.java
@@ -4,6 +4,8 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import io.github.reoseah.magisterium.spellbook.BookLayout;
 import io.github.reoseah.magisterium.spellbook.BookProperties;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
 
 import java.util.List;
@@ -27,6 +29,7 @@ public MapCodec<? extends BookElement> getCodec() {
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     public void visit(BookLayout.Builder builder, BookProperties properties, TextRenderer textRenderer) {
         builder.startNewFold();
         builder.allowWrap(false);

diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/Heading.java b/src/main/java/io/github/reoseah/magisterium/data/element/Heading.java
@@ -4,6 +4,8 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import io.github.reoseah.magisterium.spellbook.BookProperties;
 import it.unimi.dsi.fastutil.objects.ObjectIntPair;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Drawable;
@@ -31,16 +33,19 @@ public MapCodec<? extends BookElement> getCodec() {
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected int getHeight(int width, TextRenderer textRenderer) {
         return textRenderer.getWrappedLinesHeight(this.text, width);
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected int getTopMargin() {
         return super.getTopMargin() + 2;
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected Drawable createWidget(int x, int y, BookProperties properties, int maxHeight, TextRenderer textRenderer) {
         List<OrderedText> lines = textRenderer.wrapLines(this.text, properties.pageWidth);
         List<ObjectIntPair<OrderedText>> centeredLines = new ArrayList<>(lines.size());

diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/PageBreak.java b/src/main/java/io/github/reoseah/magisterium/data/element/PageBreak.java
@@ -3,6 +3,8 @@
 import com.mojang.serialization.MapCodec;
 import io.github.reoseah.magisterium.spellbook.BookLayout;
 import io.github.reoseah.magisterium.spellbook.BookProperties;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
 
 public class PageBreak implements BookElement {
@@ -15,6 +17,7 @@ public MapCodec<? extends BookElement> getCodec() {
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     public void visit(BookLayout.Builder builder, BookProperties properties, TextRenderer textRenderer) {
         builder.advancePage();
     }

diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/Paragraph.java b/src/main/java/io/github/reoseah/magisterium/data/element/Paragraph.java
@@ -3,6 +3,8 @@
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import io.github.reoseah.magisterium.spellbook.BookProperties;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.text.Text;
@@ -25,11 +27,13 @@ public MapCodec<? extends BookElement> getCodec() {
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected int getHeight(int width, TextRenderer textRenderer) {
         return textRenderer.getWrappedLinesHeight(this.text, width);
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected Drawable createWidget(int x, int y, BookProperties properties, int maxHeight, TextRenderer textRenderer) {
         var lines = textRenderer.wrapLines(this.text, properties.pageWidth);
         return (matrices, mouseX, mouseY, delta) -> {
@@ -40,11 +44,13 @@ protected Drawable createWidget(int x, int y, BookProperties properties, int max
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected boolean canDivide(int height, int maxHeight, TextRenderer textRenderer) {
         return maxHeight >= textRenderer.fontHeight;
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected WidgetPair createWidgetPair(int x, int y, int width, int maxHeight, int nextX, int nextY, int nextHeight, TextRenderer textRenderer) {
         var lines = textRenderer.wrapLines(this.text, width);
         int lineCountOnCurrentPage = maxHeight / textRenderer.fontHeight;

diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/SimpleBlock.java b/src/main/java/io/github/reoseah/magisterium/data/element/SimpleBlock.java
@@ -4,6 +4,8 @@
 import com.mojang.serialization.DataResult;
 import io.github.reoseah.magisterium.spellbook.BookLayout;
 import io.github.reoseah.magisterium.spellbook.BookProperties;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.Drawable;
 
@@ -16,6 +18,7 @@ public abstract class SimpleBlock implements BookElement {
     }, DataResult::success);
 
     @Override
+    @Environment(EnvType.CLIENT)
     public void visit(BookLayout.Builder builder, BookProperties properties, TextRenderer textRenderer) {
         int elementHeight = this.getHeight(properties.pageWidth, textRenderer);
 
@@ -33,13 +36,15 @@ public void visit(BookLayout.Builder builder, BookProperties properties, TextRen
     /**
      * @return number of pixels to offset from the previous element
      */
+    @Environment(EnvType.CLIENT)
     protected int getTopMargin() {
         return 4;
     }
 
     /**
      * @return how many pixels this element wants to take on a page
      */
+    @Environment(EnvType.CLIENT)
     protected abstract int getHeight(int width, TextRenderer textRenderer);
 
     /**
@@ -51,5 +56,6 @@ protected int getTopMargin() {
      * @see net.minecraft.client.gui.Element
      * @see SlotPropertiesProvider
      */
+    @Environment(EnvType.CLIENT)
     protected abstract Drawable createWidget(int x, int y, BookProperties properties, int maxHeight, TextRenderer textRenderer);
 }
diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/Utterance.java b/src/main/java/io/github/reoseah/magisterium/data/element/Utterance.java
@@ -9,6 +9,8 @@
 import io.github.reoseah.magisterium.spellbook.BookProperties;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
@@ -47,6 +49,7 @@ public MapCodec<? extends BookElement> getCodec() {
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected int getHeight(int width, TextRenderer textRenderer) {
         var lines = textRenderer.wrapLines(this.text, width - 12);
         var linesAsString = lines.stream().map(t -> {
@@ -70,15 +73,19 @@ protected int getHeight(int width, TextRenderer textRenderer) {
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected int getTopMargin() {
         return super.getTopMargin() + 2;
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected Drawable createWidget(int x, int y, BookProperties properties, int maxHeight, TextRenderer textRenderer) {
         return new UtteranceWidget(this.text, x, y, properties, properties.pageWidth, textRenderer);
     }
 
+    // TODO make this a static class
+    @Environment(EnvType.CLIENT)
     private class UtteranceWidget implements Drawable, Element {
         private final int buttonX;
         private final int buttonY;

diff --git a/src/main/java/io/github/reoseah/magisterium/data/element/VerticallyCenteredElement.java b/src/main/java/io/github/reoseah/magisterium/data/element/VerticallyCenteredElement.java
@@ -3,6 +3,8 @@
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import io.github.reoseah.magisterium.spellbook.BookProperties;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.Drawable;
 
@@ -23,12 +25,14 @@ public MapCodec<? extends BookElement> getCodec() {
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected int getHeight(int width, TextRenderer textRenderer) {
         // forces new page
         return 10000;
     }
 
     @Override
+    @Environment(EnvType.CLIENT)
     protected Drawable createWidget(int x, int y, BookProperties properties, int maxHeight, TextRenderer textRenderer) {
         int height = this.element.getHeight(properties.pageWidth, textRenderer);
         int newY = y + (maxHeight - height) / 2;

diff --git a/src/main/resources/assets/magisterium/textures/item/placeholder/bottle.png b/src/main/resources/assets/magisterium/textures/item/placeholder/bottle.png
diff --git a/src/main/resources/data/magisterium/recipe/arcane_lift.json b/src/main/resources/data/magisterium/recipe/arcane_lift.json
@@ -36,7 +36,10 @@
             {
               "x": 42,
               "y": 0,
-              "background": "magisterium:item/placeholder/question_mark"
+              "background": "magisterium:item/placeholder/bottle",
+              "ingredient": {
+                "item": "minecraft:experience_bottle"
+              }
             }
           ]
         },

diff --git a/src/main/resources/data/magisterium/tags/item/spell_pages.json b/src/main/resources/data/magisterium/tags/item/spell_pages.json
@@ -5,7 +5,6 @@
     "magisterium:glyphic_ignition_page",
     "magisterium:conflagrate_page",
     "magisterium:illusory_wall_page",
-    "magisterium:unstable_charge_page",
     "magisterium:cold_snap_page",
     "magisterium:arcane_lift_page",
     "magisterium:dispel_magic_page"