fix: illumination server crash on load

MrTJP · Feb 1, 2023 · bac383d · bac383d
1 parent 1dd8cea
commit bac383d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 0 deletions.
diff --git a/src/illumination/java/mrtjp/projectred/illumination/MultipartLightProperties.java b/src/illumination/java/mrtjp/projectred/illumination/MultipartLightProperties.java
@@ -28,6 +28,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -53,10 +55,12 @@ public boolean canFloat() {
     //endregion
 
     //region Client Registration
+    @OnlyIn(Dist.CLIENT)
     public abstract void registerIcons(AtlasRegistrar registrar);
     //endregion
 
     //region Rendering
+    @OnlyIn(Dist.CLIENT)
     public abstract TextureAtlasSprite getIcon(int color);
     public abstract CCModel getBulbModel(int side);
     public abstract CCModel getChasisModel(int side);
@@ -71,13 +75,15 @@ public Cuboid6 getInventoryGlowBounds() {
         return getGlowBounds(0);
     }
 
+    @OnlyIn(Dist.CLIENT)
     public void render(MultipartLightPart part, Vector3 pos, CCRenderState ccrs) {
         IconTransformation icon = new IconTransformation(getIcon(part.getColor()));
         Translation t = pos.translation();
         getChasisModel(part.getSide()).render(ccrs, t, icon);
         getBulbModel(part.getSide()).render(ccrs, t, icon, getColourMultiplier(part.getColor(), part.isLightOn()));
     }
 
+    @OnlyIn(Dist.CLIENT)
     public void renderInventory(int colour, boolean inverted, Vector3 pos, CCRenderState ccrs) {
         IconTransformation icon = new IconTransformation(getIcon(colour));
         Translation t = pos.translation();
@@ -94,6 +100,7 @@ public ColourMultiplier getColourMultiplier(int color, boolean isOn) {
         return new ColourMultiplier(c.rgba());
     }
 
+    @OnlyIn(Dist.CLIENT)
     public IItemRenderer getItemRenderer() {
         return new IItemRenderer() {
             @Override

diff --git a/src/illumination/java/mrtjp/projectred/illumination/part/CageLightProperties.java b/src/illumination/java/mrtjp/projectred/illumination/part/CageLightProperties.java
@@ -9,6 +9,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import java.util.Map;
 
@@ -39,11 +41,13 @@ public MultipartLightPart partFactory(int color, boolean inverted) {
 
     //region Rendering
     @Override
+    @OnlyIn(Dist.CLIENT)
     public void registerIcons(AtlasRegistrar registrar) {
         registrar.registerSprite(new ResourceLocation(MOD_ID, "block/cage_lamp"), i -> icon = i);
     }
 
     @Override
+    @OnlyIn(Dist.CLIENT)
     public TextureAtlasSprite getIcon(int color) {
         return icon;
     }

diff --git a/src/illumination/java/mrtjp/projectred/illumination/part/FalloutLightProperties.java b/src/illumination/java/mrtjp/projectred/illumination/part/FalloutLightProperties.java
@@ -9,6 +9,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import java.util.Map;
 
@@ -39,11 +41,13 @@ public MultipartLightPart partFactory(int color, boolean inverted) {
 
     //region Rendering
     @Override
+    @OnlyIn(Dist.CLIENT)
     public void registerIcons(AtlasRegistrar registrar) {
         registrar.registerSprite(new ResourceLocation(MOD_ID, "block/fallout"), i -> icon = i);
     }
 
     @Override
+    @OnlyIn(Dist.CLIENT)
     public TextureAtlasSprite getIcon(int color) {
         return icon;
     }

diff --git a/src/illumination/java/mrtjp/projectred/illumination/part/FixtureLightProperties.java b/src/illumination/java/mrtjp/projectred/illumination/part/FixtureLightProperties.java
@@ -9,6 +9,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import java.util.Map;
 
@@ -39,11 +41,13 @@ public MultipartLightPart partFactory(int color, boolean inverted) {
 
     //region Rendering
     @Override
+    @OnlyIn(Dist.CLIENT)
     public void registerIcons(AtlasRegistrar registrar) {
         registrar.registerSprite(new ResourceLocation(MOD_ID, "block/fixture"), i -> icon = i);
     }
 
     @Override
+    @OnlyIn(Dist.CLIENT)
     public TextureAtlasSprite getIcon(int color) {
         return icon;
     }

diff --git a/src/illumination/java/mrtjp/projectred/illumination/part/LanternLightProperties.java b/src/illumination/java/mrtjp/projectred/illumination/part/LanternLightProperties.java
@@ -12,6 +12,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -43,11 +45,13 @@ public MultipartLightPart partFactory(int color, boolean inverted) {
 
     //region Rendering
     @Override
+    @OnlyIn(Dist.CLIENT)
     public void registerIcons(AtlasRegistrar registrar) {
         registrar.registerSprite(new ResourceLocation(MOD_ID, "block/lantern"), i -> icon = i);
     }
 
     @Override
+    @OnlyIn(Dist.CLIENT)
     public TextureAtlasSprite getIcon(int color) {
         return icon;
     }