Stop using AxisAlignedBB, ChunkPos & MathHelper

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

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/VillageRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/VillageRenderer.java
index 40c8bc9011d91efc7bbc928159541a5b8be5e243..d9034b4c8e1cc80106713fa22b2fee1c96f8a4ec 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/VillageRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/VillageRenderer.java
@@ -6,7 +6,6 @@ import com.irtimaled.bbor.config.ConfigManager;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.math.AxisAlignedBB;
 import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
@@ -31,29 +30,29 @@ public class VillageRenderer extends Renderer<BoundingBoxVillage> {
     }
 
     private void renderIronGolemSpawnArea(BoundingBoxVillage boundingBox) {
-        Coords center = boundingBox.getCenter();
-        AxisAlignedBB abb = getAxisAlignedBB(center, center, false)
-                .grow(8, 3, 8)
+        OffsetPoint offsetCenter = new OffsetPoint(boundingBox.getCenter())
                 .offset(boundingBox.getCenterOffsetX(), 0.0, boundingBox.getCenterOffsetZ());
+        OffsetBox bb = new OffsetBox(offsetCenter, offsetCenter)
+                .grow(8, 3, 8);
 
-        renderCuboid(abb, boundingBox.getColor(), false);
+        renderCuboid(bb, boundingBox.getColor(), false);
     }
 
     private void renderVillageDoors(BoundingBoxVillage boundingBox) {
         OffsetPoint center = new OffsetPoint(boundingBox.getCenter())
-                .add(boundingBox.getCenterOffsetX(), 0.0, boundingBox.getCenterOffsetZ());
+                .offset(boundingBox.getCenterOffsetX(), 0.0, boundingBox.getCenterOffsetZ());
         Color color = boundingBox.getColor();
-        GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE);
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder worldRenderer = tessellator.getBuffer();
-
         int colorR = color.getRed();
         int colorG = color.getGreen();
         int colorB = color.getBlue();
 
+        GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE);
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder worldRenderer = tessellator.getBuffer();
+
         worldRenderer.begin(GL11.GL_LINES, worldRenderer.getVertexFormat());
         for (Coords door : boundingBox.getDoors()) {
-            OffsetPoint point = new OffsetPoint(door).add(0.5, 0, 0.5);
+            OffsetPoint point = new OffsetPoint(door).offset(0.5, 0, 0.5);
 
             worldRenderer.pos(point.getX(), point.getY(), point.getZ()).color(colorR, colorG, colorB, 255).endVertex();
             worldRenderer.pos(center.getX(), center.getY(), center.getZ()).color(colorR, colorG, colorB, 255).endVertex();
@@ -63,7 +62,7 @@ public class VillageRenderer extends Renderer<BoundingBoxVillage> {
 
     private void renderBoundingBoxVillageAsSphere(BoundingBoxVillage boundingBox) {
         OffsetPoint center = new OffsetPoint(boundingBox.getCenter())
-                .add(boundingBox.getCenterOffsetX(), 0.0, boundingBox.getCenterOffsetZ());
+                .offset(boundingBox.getCenterOffsetX(), 0.0, boundingBox.getCenterOffsetZ());
         int radius = boundingBox.getRadius();
         Color color = boundingBox.getColor();
         renderSphere(center, radius, color);
@@ -86,14 +85,14 @@ public class VillageRenderer extends Renderer<BoundingBoxVillage> {
 
     private Set<OffsetPoint> buildPoints(OffsetPoint center, double radius) {
         int density = ConfigManager.villageSphereDensity.get();
-        int segments = 24 + (density*8);
+        int segments = 24 + (density * 8);
 
-        Set<OffsetPoint> points = new HashSet<>(segments*segments);
+        Set<OffsetPoint> points = new HashSet<>(segments * segments);
         double tau = 6.283185307179586D;
         double pi = tau / 2D;
 
-        double thetaSegment = pi / (double)segments;
-        double phiSegment = tau / (double)segments;
+        double thetaSegment = pi / (double) segments;
+        double phiSegment = tau / (double) segments;
 
         for (double phi = 0.0D; phi < tau; phi += phiSegment) {
             for (double theta = 0.0D; theta < pi; theta += thetaSegment) {
@@ -101,7 +100,7 @@ public class VillageRenderer extends Renderer<BoundingBoxVillage> {
                 double dz = radius * Math.sin(phi) * Math.sin(theta);
                 double dy = radius * Math.cos(phi);
 
-                points.add(center.add(dx, dy, dz));
+                points.add(center.offset(dx, dy, dz));
             }
         }
         return points;