Fix irremovable window borders (#20)

GTNewHorizons · Nov 19, 2024 · ac1e94b · ac1e94b
1 parent 1595ed1
commit ac1e94b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/main/java/gcewing/architecture/client/render/RenderRoof.java b/src/main/java/gcewing/architecture/client/render/RenderRoof.java
@@ -1004,10 +1004,7 @@ protected void vertex(double x, double y, double z, double u, double v) {
 
     public void prepare(TileShape te, ITexture[] textures, Trans3 t, IRenderTarget target, boolean renderBase,
             boolean renderSecondary) {
-        this.te = te;
-        this.textures = textures;
-        this.t = t;
-        this.target = target;
+        prepare(te, textures, t, target);
         this.renderBase = renderBase;
         this.renderSecondary = renderSecondary;
     }

diff --git a/src/main/java/gcewing/architecture/client/render/RenderShape.java b/src/main/java/gcewing/architecture/client/render/RenderShape.java
@@ -27,12 +27,7 @@ public abstract class RenderShape {
     protected IRenderTarget target;
 
     public RenderShape(TileShape te, ITexture[] textures, Trans3 t, IRenderTarget target) {
-        this.te = te;
-        this.blockWorld = getTileEntityWorld(te);
-        this.blockPos = te.getPos();
-        this.textures = textures;
-        this.t = t;
-        this.target = target;
+        prepare(te, textures, t, target);
     }
 
     public RenderShape() {}
@@ -43,4 +38,13 @@ protected IArchitectureModel getModel(String name) {
         return ArchitectureCraft.mod.getModel(name);
     }
 
+    protected void prepare(TileShape te, ITexture[] textures, Trans3 t, IRenderTarget target) {
+        this.te = te;
+        this.blockWorld = getTileEntityWorld(te);
+        this.blockPos = te.getPos();
+        this.textures = textures;
+        this.t = t;
+        this.target = target;
+    }
+
 }
diff --git a/src/main/java/gcewing/architecture/client/render/RenderWindow.java b/src/main/java/gcewing/architecture/client/render/RenderWindow.java
@@ -184,10 +184,7 @@ protected TileShape getConnectedNeighbourGlobal(TileShape te, EnumFacing globalD
 
     public void prepare(TileShape te, ITexture[] textures, Trans3 t, IRenderTarget target, boolean renderBase,
             boolean renderSecondary, Window kind) {
-        this.te = te;
-        this.textures = textures;
-        this.t = t;
-        this.target = target;
+        prepare(te, textures, t, target);
         this.renderBase = renderBase;
         this.renderSecondary = renderSecondary;
         this.kind = kind;