From 9450b8b91b629095036d783b9b01f5a39508a80a Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 26 Apr 2020 09:16:44 +0200
Subject: Do not all methods on navigation

---
 .../mechanics/structure/IStructureDefinition.java  | 40 ++++++++++------------
 1 file changed, 18 insertions(+), 22 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java
index 97e4fe2bad..f70422fe72 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java
@@ -65,20 +65,19 @@ public interface IStructureDefinition<T> {
                     xyz[1] += basePositionY;
                     xyz[2] += basePositionZ;
 
-                    if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
-                        if(!element.check(object, world, xyz[0], xyz[1], xyz[2])){
-                            return false;
-                        }
-                    }else {
-                        return false;
-                    }
-
                     if(element instanceof IStructureNavigate) {
                         IStructureNavigate<T> navigate=(IStructureNavigate<T>)element;
                         abc[0] = (navigate.resetA() ? basePositionA : abc[0]) + navigate.getStepA();
                         abc[1] = (navigate.resetB() ? basePositionA : abc[1]) + navigate.getStepB();
                         abc[2] = (navigate.resetC() ? basePositionA : abc[2]) + navigate.getStepC();
                     }else {
+                        if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
+                            if(!element.check(object, world, xyz[0], xyz[1], xyz[2])){
+                                return false;
+                            }
+                        }else {
+                            return false;
+                        }
                         abc[0]+=1;
                     }
                 }
@@ -89,18 +88,17 @@ public interface IStructureDefinition<T> {
                     xyz[1] += basePositionY;
                     xyz[2] += basePositionZ;
 
-                    if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
-                        if(!element.check(object, world, xyz[0], xyz[1], xyz[2])){
-                            return false;
-                        }
-                    }
-
                     if(element instanceof IStructureNavigate) {
                         IStructureNavigate<T> navigate=(IStructureNavigate<T>)element;
                         abc[0] = (navigate.resetA() ? basePositionA : abc[0]) + navigate.getStepA();
                         abc[1] = (navigate.resetB() ? basePositionA : abc[1]) + navigate.getStepB();
                         abc[2] = (navigate.resetC() ? basePositionA : abc[2]) + navigate.getStepC();
                     }else {
+                        if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
+                            if(!element.check(object, world, xyz[0], xyz[1], xyz[2])){
+                                return false;
+                            }
+                        }
                         abc[0]+=1;
                     }
                 }
@@ -113,16 +111,15 @@ public interface IStructureDefinition<T> {
                     xyz[1] += basePositionY;
                     xyz[2] += basePositionZ;
 
-                    if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
-                        element.spawnHint(object, world, xyz[0], xyz[1], xyz[2]);
-                    }
-
                     if(element instanceof IStructureNavigate) {
                         IStructureNavigate<T> navigate=(IStructureNavigate<T>)element;
                         abc[0] = (navigate.resetA() ? basePositionA : abc[0]) + navigate.getStepA();
                         abc[1] = (navigate.resetB() ? basePositionA : abc[1]) + navigate.getStepB();
                         abc[2] = (navigate.resetC() ? basePositionA : abc[2]) + navigate.getStepC();
                     }else {
+                        if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
+                            element.spawnHint(object, world, xyz[0], xyz[1], xyz[2]);
+                        }
                         abc[0]+=1;
                     }
                 }
@@ -133,16 +130,15 @@ public interface IStructureDefinition<T> {
                     xyz[1] += basePositionY;
                     xyz[2] += basePositionZ;
 
-                    if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
-                        element.placeBlock(object, world, xyz[0], xyz[1], xyz[2]);
-                    }
-
                     if(element instanceof IStructureNavigate) {
                         IStructureNavigate<T> navigate=(IStructureNavigate<T>)element;
                         abc[0] = (navigate.resetA() ? basePositionA : abc[0]) + navigate.getStepA();
                         abc[1] = (navigate.resetB() ? basePositionA : abc[1]) + navigate.getStepB();
                         abc[2] = (navigate.resetC() ? basePositionA : abc[2]) + navigate.getStepC();
                     }else {
+                        if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
+                            element.placeBlock(object, world, xyz[0], xyz[1], xyz[2]);
+                        }
                         abc[0]+=1;
                     }
                 }
-- 
cgit