Fix crash when trying to upgrade a dyed shulker box. Closes #22

progwml6 · Jan 7, 2021 · 57db93a · 57db93a
1 parent 54446d2
commit 57db93a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/src/main/java/com/progwml6/ironshulkerbox/common/block/GenericIronShulkerBlock.java b/src/main/java/com/progwml6/ironshulkerbox/common/block/GenericIronShulkerBlock.java
@@ -272,13 +272,11 @@ public IronShulkerBoxesTypes getType() {
   }
 
   @Nullable
-  @OnlyIn(Dist.CLIENT)
   public static DyeColor getColorFromItem(Item itemIn) {
     return getColorFromBlock(Block.getBlockFromItem(itemIn));
   }
 
   @Nullable
-  @OnlyIn(Dist.CLIENT)
   public static DyeColor getColorFromBlock(Block blockIn) {
     return blockIn instanceof GenericIronShulkerBlock ? ((GenericIronShulkerBlock) blockIn).getColor() : null;
   }

diff --git a/.../com/progwml6/ironshulkerbox/common/block/tileentity/GenericIronShulkerBoxTileEntity.java b/.../com/progwml6/ironshulkerbox/common/block/tileentity/GenericIronShulkerBoxTileEntity.java
@@ -19,7 +19,6 @@
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.ITickableTileEntity;
 import net.minecraft.tileentity.LockableLootTileEntity;
-import net.minecraft.tileentity.ShulkerBoxTileEntity;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.NonNullList;
@@ -31,8 +30,6 @@
 import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
 import javax.annotation.Nullable;
 import java.util.List;
@@ -313,7 +310,6 @@ public float getProgress(float p_190585_1_) {
   }
 
   @Nullable
-  @OnlyIn(Dist.CLIENT)
   public DyeColor getColor() {
     if (this.needsColorFromWorld) {
       this.color = GenericIronShulkerBlock.getColorFromBlock(this.getBlockState().getBlock());