From e9b4db47d897bab1149ab2c9c9f03ad20de06681 Mon Sep 17 00:00:00 2001
From: CoolMineman <62723322+CoolMineman@users.noreply.github.com>
Date: Sat, 21 Nov 2020 18:38:39 -0600
Subject: [PATCH] clean up terrible code

---
 .../blockentity/StarfishBlockEntity.java      | 28 ++-----------------
 .../render/StarfishBlockEntityRenderer.java   |  4 +--
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/StarfishBlockEntity.java b/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/StarfishBlockEntity.java
index 234c8b0..492df08 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/StarfishBlockEntity.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/StarfishBlockEntity.java
@@ -2,38 +2,16 @@ package eu.midnightdust.motschen.rocks.block.blockentity;
 
 import eu.midnightdust.motschen.rocks.RocksMain;
 import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
-import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.util.Tickable;
-import net.minecraft.util.math.BlockPos;
 
-public class StarfishBlockEntity extends BlockEntity implements Tickable {
-    private String variation;
+public class StarfishBlockEntity extends BlockEntity {
 
     public StarfishBlockEntity() {
         super(BlockEntityInit.STARFISH_BE);
     }
 
-    @Override
-    public void tick() {
-        BlockPos pos = this.pos;
-        BlockState state = this.world.getBlockState(pos);
-
-        if (world != null && state.get(RocksMain.STARFISH_VARIATION) == StarfishVariation.RED) {
-            variation = String.valueOf(StarfishVariation.RED);
-            return;
-        }
-        else if (world != null && state.get(RocksMain.STARFISH_VARIATION) == StarfishVariation.PINK) {
-            variation = String.valueOf(StarfishVariation.PINK);
-            return;
-        }
-        else {
-            variation = String.valueOf(StarfishVariation.ORANGE);
-            return;
-        }
-    }
-    public String getVariation() {
-        return variation;
+    public StarfishVariation getVariation() {
+        return this.world.getBlockState(pos).get(RocksMain.STARFISH_VARIATION);
     }
 }
 
diff --git a/src/main/java/eu/midnightdust/motschen/rocks/block/render/StarfishBlockEntityRenderer.java b/src/main/java/eu/midnightdust/motschen/rocks/block/render/StarfishBlockEntityRenderer.java
index 6622523..3f43028 100644
--- a/src/main/java/eu/midnightdust/motschen/rocks/block/render/StarfishBlockEntityRenderer.java
+++ b/src/main/java/eu/midnightdust/motschen/rocks/block/render/StarfishBlockEntityRenderer.java
@@ -72,7 +72,7 @@ public class StarfishBlockEntityRenderer extends BlockEntityRenderer<StarfishBlo
 	}
 	@Override
 	public void render(StarfishBlockEntity blockEntity, float tickDelta, MatrixStack matrixStack, VertexConsumerProvider vertexConsumers, int light, int overlay) {
-		if (blockEntity.getVariation() == String.valueOf(StarfishVariation.RED)) {
+		if (blockEntity.getVariation().equals(StarfishVariation.RED)) {
 			matrixStack.push();
 			VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("rocks:textures/block/starfish_red.png")));
 
@@ -85,7 +85,7 @@ public class StarfishBlockEntityRenderer extends BlockEntityRenderer<StarfishBlo
 			bb_main.render(matrixStack, vertexConsumer, light, overlay);
 			matrixStack.pop();
 		}
-		else if (blockEntity.getVariation() == String.valueOf(StarfishVariation.PINK)) {
+		else if (blockEntity.getVariation().equals(StarfishVariation.PINK)) {
 			matrixStack.push();
 			VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("rocks:textures/block/starfish_pink.png")));