Simplify commands to use Coords & Pos objects

[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / client / renderers / MobSpawnerRenderer.java

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java
index 52207ac9b305ae0a3120998ec12795a4450cfc15..2408aca5049b43df807bfcd710b47a6bad945032 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java
@@ -1,11 +1,10 @@
 package com.irtimaled.bbor.client.renderers;
 
-import com.irtimaled.bbor.client.PlayerCoords;
-import com.irtimaled.bbor.common.models.BoundingBoxMobSpawner;
+import com.irtimaled.bbor.client.Player;
+import com.irtimaled.bbor.client.config.ConfigManager;
+import com.irtimaled.bbor.client.models.BoundingBoxMobSpawner;
 import com.irtimaled.bbor.common.models.Colors;
 import com.irtimaled.bbor.common.models.Coords;
-import com.irtimaled.bbor.config.ConfigManager;
-import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
 
@@ -14,24 +13,27 @@ public class MobSpawnerRenderer extends AbstractRenderer<BoundingBoxMobSpawner>
     public void render(BoundingBoxMobSpawner boundingBox) {
         Coords coords = boundingBox.getCoords();
         Color color = boundingBox.getColor();
-        OffsetBox bb = ConfigManager.renderMobSpawnerSpawnArea.get() ?
-                new OffsetBox(boundingBox.getMinCoords(), boundingBox.getMaxCoords()) :
-                new OffsetBox(coords, coords);
-        renderCuboid(bb, color);
 
-        if (!ConfigManager.renderMobSpawnerActivationLines.get()) return;
+        renderCuboid(new OffsetBox(coords, coords), color);
 
-        renderActivationLine(new OffsetPoint(coords).offset(0.5, 0.5, 0.5));
+        if (ConfigManager.renderMobSpawnerActivationLines.get()) {
+            renderActivationLine(new OffsetPoint(coords).offset(0.5, 0.5, 0.5));
+        }
+
+        if (ConfigManager.renderMobSpawnerSpawnArea.get()) {
+            OffsetBox bb = new OffsetBox(boundingBox.getMinCoords(), boundingBox.getMaxCoords());
+            renderCuboid(bb, color);
+        }
     }
 
     private void renderActivationLine(OffsetPoint centerPoint) {
-        OffsetPoint playerPos = new OffsetPoint(PlayerCoords.getX(), PlayerCoords.getY(), PlayerCoords.getZ());
+        OffsetPoint playerPos = new OffsetPoint(Player.getPoint());
         double distance = centerPoint.getDistance(playerPos);
         if (distance <= 20) {
             Color color = distance > 18 ? Color.RED : distance > 16 ? Colors.DARK_ORANGE : Color.GREEN;
 
-            GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE);
-            Renderer.startLines().setColor(color).addPoint(centerPoint).addPoint(playerPos.offset(0, 0.1, 0)).render();
+            OffsetPoint playerPoint = playerPos.offset(0, 0.1, 0);
+            renderLine(centerPoint, playerPoint, color);
         }
     }
 }