From 81722152da9d49be4af93851c4fdb0765895f382 Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Fri, 31 Jul 2020 13:13:55 -0400
Subject: [PATCH] Improve BER

---
 .../render/HighlightBlockEntityRenderer.java  |  37 ++++++++++--------
 .../mixin/RenderPhaseAccessor.java            |  10 +++++
 .../textures/entity/selected_energy_block.png | Bin 0 -> 490 bytes
 .../entity/unselected_energy_block.png        | Bin 0 -> 490 bytes
 .../textures/item/veridium_orb.png            | Bin 0 -> 2047 bytes
 5 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 src/main/resources/assets/energonrelics/textures/entity/selected_energy_block.png
 create mode 100644 src/main/resources/assets/energonrelics/textures/entity/unselected_energy_block.png
 create mode 100644 src/main/resources/assets/energonrelics/textures/item/veridium_orb.png

diff --git a/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java
index ac88db9..641bde6 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java
@@ -8,6 +8,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderPhase;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.VertexFormats;
@@ -16,6 +17,7 @@ import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Hand;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Matrix4f;
 
@@ -26,11 +28,12 @@ public class HighlightBlockEntityRenderer extends BlockEntityRenderer<BlockEntit
         super(dispatcher);
     }
 
-    private static RenderLayer getLayer() {
-        return RenderLayer.of("energonrelics_highlight", VertexFormats.POSITION_COLOR, 7, 256, false, true, RenderLayer.MultiPhaseParameters.builder().transparency(RenderPhaseAccessor.getTRANSLUCENT_TRANSPARENCY()).layering(RenderPhaseAccessor.getVIEW_OFFSET_Z_LAYERING()).build(false));
+    private static RenderLayer getLayer(Identifier texture) {
+        return RenderLayer.of("energonrelics_highlight", VertexFormats.POSITION_COLOR, 7, 256, false, true, RenderLayer.MultiPhaseParameters.builder().transparency(RenderPhaseAccessor.getTRANSLUCENT_TRANSPARENCY()).layering(RenderPhaseAccessor.getVIEW_OFFSET_Z_LAYERING()).texture(new RenderPhase.Texture(texture, false, false)).fog(RenderPhaseAccessor.getNO_FOG()).target(RenderPhaseAccessor.getITEM_TARGET()).build(false));
     }
 
-    private static final RenderLayer LAYER = getLayer();
+    private static final RenderLayer SELECTED_LAYER = getLayer(new Identifier(EnergonRelics.NAMESPACE, "textures/entity/selected_energy_block.png"));
+    private static final RenderLayer UNSELECTED_LAYER = getLayer(new Identifier(EnergonRelics.NAMESPACE, "textures/entity/unselected_energy_block.png"));
 
     @Override
     public void render(BlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
@@ -43,22 +46,22 @@ public class HighlightBlockEntityRenderer extends BlockEntityRenderer<BlockEntit
                 boolean contains = ((EnergyReceiverBlockEntity) entity).contains(EnergonRelics.NETWORK_CHIP_ITEM.getID(stack));
                 Matrix4f matrix4f = matrices.peek().getModel();
                 if (!contains) {
-                    renderLayer(entity, matrix4f, vertexConsumers.getBuffer(LAYER), 1.0f, 0.0f);
+                    renderLayer(entity, matrix4f, vertexConsumers.getBuffer(UNSELECTED_LAYER));
                 } else {
-                    renderLayer(entity, matrix4f, vertexConsumers.getBuffer(LAYER), 0.0f, 1.0f);
+                    renderLayer(entity, matrix4f, vertexConsumers.getBuffer(SELECTED_LAYER));
                 }
             }
         }
         matrices.pop();
     }
 
-    private void renderLayer(BlockEntity entity, Matrix4f matrix4f, VertexConsumer vertexConsumer, float r, float b) {
-        renderSide(entity, matrix4f, vertexConsumer, 0f, 1f, 0f, 1f, 1f, 1f, 1f, 1f, r, b, Direction.SOUTH);
-        renderSide(entity, matrix4f, vertexConsumer, 0f, 1f, 1f, 0f, 0f, 0f, 0f, 0f, r, b, Direction.NORTH);
-        renderSide(entity, matrix4f, vertexConsumer, 1f, 1f, 1f, 0f, 0f, 1f, 1f, 0f, r, b, Direction.EAST);
-        renderSide(entity, matrix4f, vertexConsumer, 0f, 0f, 0f, 1f, 0f, 1f, 1f, 0f, r, b, Direction.WEST);
-        renderSide(entity, matrix4f, vertexConsumer, 0f, 1f, 0f, 0f, 0f, 0f, 1f, 1f, r, b, Direction.DOWN);
-        renderSide(entity, matrix4f, vertexConsumer, 0f, 1f, 1.0f, 1.0f, 1f, 1f, 0f, 0f, r, b, Direction.UP);
+    private void renderLayer(BlockEntity entity, Matrix4f matrix4f, VertexConsumer vertexConsumer) {
+        renderSide(entity, matrix4f, vertexConsumer, 0f, 1f, 0f, 1f, 1f, 1f, 1f, 1f, Direction.SOUTH);
+        renderSide(entity, matrix4f, vertexConsumer, 0f, 1f, 1f, 0f, 0f, 0f, 0f, 0f, Direction.NORTH);
+        renderSide(entity, matrix4f, vertexConsumer, 1f, 1f, 1f, 0f, 0f, 1f, 1f, 0f, Direction.EAST);
+        renderSide(entity, matrix4f, vertexConsumer, 0f, 0f, 0f, 1f, 0f, 1f, 1f, 0f, Direction.WEST);
+        renderSide(entity, matrix4f, vertexConsumer, 0f, 1f, 0f, 0f, 0f, 0f, 1f, 1f, Direction.DOWN);
+        renderSide(entity, matrix4f, vertexConsumer, 0f, 1f, 1.0f, 1.0f, 1f, 1f, 0f, 0f, Direction.UP);
     }
 
     private boolean shouldDrawSide(BlockEntity entity, Direction side) {
@@ -66,12 +69,12 @@ public class HighlightBlockEntityRenderer extends BlockEntityRenderer<BlockEntit
         return Block.shouldDrawSide(state, Objects.requireNonNull(entity.getWorld()), entity.getPos(), side);
     }
 
-    private void renderSide(BlockEntity entity, Matrix4f matrix4f, VertexConsumer vertexConsumer, float f, float g, float h, float i, float j, float k, float l, float m, float n, float p, Direction side) {
+    private void renderSide(BlockEntity entity, Matrix4f matrix4f, VertexConsumer vertexConsumer, float f, float g, float h, float i, float j, float k, float l, float m, Direction side) {
         if (shouldDrawSide(entity, side)) {
-            vertexConsumer.vertex(matrix4f, f, h, j).color(n, (float) 0.0, p, 0.2f).next();
-            vertexConsumer.vertex(matrix4f, g, h, k).color(n, (float) 0.0, p, 0.2f).next();
-            vertexConsumer.vertex(matrix4f, g, i, l).color(n, (float) 0.0, p, 0.2f).next();
-            vertexConsumer.vertex(matrix4f, f, i, m).color(n, (float) 0.0, p, 0.2f).next();
+            vertexConsumer.vertex(matrix4f, f, h, j).color(1f, 1f, 1f, 1f).next();
+            vertexConsumer.vertex(matrix4f, g, h, k).color(1f, 1f, 1f, 1f).next();
+            vertexConsumer.vertex(matrix4f, g, i, l).color(1f, 1f, 1f, 1f).next();
+            vertexConsumer.vertex(matrix4f, f, i, m).color(1f, 1f, 1f, 1f).next();
         }
     }
 }
diff --git a/src/main/java/com/thebrokenrail/energonrelics/mixin/RenderPhaseAccessor.java b/src/main/java/com/thebrokenrail/energonrelics/mixin/RenderPhaseAccessor.java
index b39a4bb..db8a193 100644
--- a/src/main/java/com/thebrokenrail/energonrelics/mixin/RenderPhaseAccessor.java
+++ b/src/main/java/com/thebrokenrail/energonrelics/mixin/RenderPhaseAccessor.java
@@ -15,4 +15,14 @@ public interface RenderPhaseAccessor {
     static RenderPhase.Layering getVIEW_OFFSET_Z_LAYERING() {
         throw new UnsupportedOperationException();
     }
+
+    @Accessor
+    static RenderPhase.Fog getNO_FOG() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Accessor
+    static RenderPhase.Target getITEM_TARGET() {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/src/main/resources/assets/energonrelics/textures/entity/selected_energy_block.png b/src/main/resources/assets/energonrelics/textures/entity/selected_energy_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..258d6260626684edf67721437c9b89d57d953e59
GIT binary patch
literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YGIV&P*6mHgGPga6hvd$;36Srkkz8sufUJXy-G-H(9$3@L@j*{
z{Rg!Mtp!0)1Q8AW1$`|cxA$aVgr3W}?~mu4=jEK|fIXbo3T8(D3dOP!4Fx?*@nw(m
z1t%j6;KQBJOno*I3Db6b-eFVqc3kypzpv%!Nu^B<Y+b@rnr@VZXN1G+WnJ;MaKDyI
zq=XNJ{e~P+_)6)?20ts#Huzn!5sS`&UG?;2|8VjTYdNDJJSOZd<SW|mdDKl@>Ehyo
z)FGL}m_!K?#6yw_Yvd_2F109`we|&meDjpVqsd>ViXo0HIq~{Mtw`6j)Qsq9`SMg%
z?*H>NGm{gI?yewoK3UeA51cztuUXdDk!977!SM(e#iqX`IZc0vUTbRJ18{G`*=18p
z?!x&N3_j=yBk?0SWZE+scs+&QIP~2>_evwH-*ryzA+{k;bPap^Fe>}qtKa#&Xa`Z(
z3BUjV010qNS#tmY4`BcR4`BhQKc{H`001IML_t(IPh(_Y_;1WW0brs)FIelS0i$6s
gnhqejXyEe#035ObQs_50p#T5?07*qoM6N<$f(cgFSpWb4

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/energonrelics/textures/entity/unselected_energy_block.png b/src/main/resources/assets/energonrelics/textures/entity/unselected_energy_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..35d7166b3b9cc4c14c7e39f6b2d42c1fcc6474c7
GIT binary patch
literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YGIV&P*6mHgGPga6hvd$;36Srkkz8sufUJXy-G-H(9$3@L@j*{
z{Rg!Mtp!0)1Q8AW1$`|cxA$aVgr3W}?~mu4=jEK|fIXbo3T8(D3dOP!4Fx?*@nw(m
z1t%j6;KQBJOno*I3Db6b-eFVqc3kypzpv%!Nu^B<Y+b@rnr@VZXN1G+WnJ;MaKDyI
zq=XNJ{e~P+_)6)?20ts#Huzn!5sS`&UG?;2|8VjTYdNDJJSOZd<SW|mdDKl@>Ehyo
z)FGL}m_!K?#6yw_Yvd_2F109`we|&meDjpVqsd>ViXo0HIq~{Mtw`6j)Qsq9`SMg%
z?*H>NGm{gI?yewoK3UeA51cztuUXdDk!977!SM(e#iqX`IZc0vUTbRJ18{G`*=18p
z?!x&N3_j=yBk?0SWZE+scs+&QIP~2>_evwH-*ryzA+{k;bPap^Fe>}qtKa#&Xa`Z(
z3BUjV010qNS#tmY4`BcR4`BhQKc{H`001IML_t(IPh<Sgz+lWk0brs)FIelS0i$6s
gnhqejXyEe#03NUbQf!v;pa1{>07*qoM6N<$f;6_+wEzGB

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/energonrelics/textures/item/veridium_orb.png b/src/main/resources/assets/energonrelics/textures/item/veridium_orb.png
new file mode 100644
index 0000000000000000000000000000000000000000..473aa0408f0f2cfd214db81cf7ad084b799245b0
GIT binary patch
literal 2047
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

literal 0
HcmV?d00001