From 686c451ea65d30fd1e466a25578337b838050846 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 10 May 2020 17:22:13 -0400 Subject: [PATCH] Minor tweaks --- .../mindustry/annotations/entity/EntityProcess.java | 2 +- core/src/mindustry/graphics/Drawf.java | 8 ++++++++ core/src/mindustry/graphics/LoadRenderer.java | 2 +- .../world/blocks/distribution/ItemBridge.java | 12 +++--------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java index bda86b5b88..19e72439a2 100644 --- a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java +++ b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java @@ -243,7 +243,7 @@ public class EntityProcess extends BaseProcessor{ fbuilder.initializer(varInitializers.get(f)); } - if(!isFinal) fbuilder.addModifiers(Modifier.PROTECTED); + fbuilder.addModifiers(f.has(ReadOnly.class) ? Modifier.PROTECTED : Modifier.PUBLIC); fbuilder.addAnnotations(f.annotations().map(AnnotationSpec::get)); builder.addField(fbuilder.build()); specVariables.put(builder.fieldSpecs.get(builder.fieldSpecs.size() - 1), f); diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java index cc42e6ee1d..47f33a3ee3 100644 --- a/core/src/mindustry/graphics/Drawf.java +++ b/core/src/mindustry/graphics/Drawf.java @@ -115,6 +115,14 @@ public class Drawf{ Draw.reset(); } + public static void select(float x, float y, float radius, Color color){ + Lines.stroke(3f, Pal.gray); + Lines.square(x, y, radius + 1f); + Lines.stroke(1f, color); + Lines.square(x, y, radius); + Draw.reset(); + } + public static void square(float x, float y, float radius, Color color){ Lines.stroke(3f, Pal.gray); Lines.square(x, y, radius + 1f, 45); diff --git a/core/src/mindustry/graphics/LoadRenderer.java b/core/src/mindustry/graphics/LoadRenderer.java index 1cb8b484bd..316897af24 100644 --- a/core/src/mindustry/graphics/LoadRenderer.java +++ b/core/src/mindustry/graphics/LoadRenderer.java @@ -23,7 +23,7 @@ import static arc.Core.*; public class LoadRenderer implements Disposable{ private static final Color color = new Color(Pal.accent).lerp(Color.black, 0.5f); - private static final Color colorRed = Pal.breakInvalid.lerp(Color.black, 0.3f); + private static final Color colorRed = Pal.breakInvalid.cpy().lerp(Color.black, 0.3f); private static final String red = "[#" + colorRed + "]"; private static final String orange = "[#" + color + "]"; private static final FloatArray floats = new FloatArray(); diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index ff8228bf96..84ac3325e6 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -142,25 +142,19 @@ public class ItemBridge extends Block{ @Override public void drawConfigure(){ - Draw.color(Pal.accent); - Lines.stroke(1f); - Lines.square(x, y, - tile.block().size * tilesize / 2f + 1f); + Drawf.select(x, y, tile.block().size * tilesize / 2f + 2f, Pal.accent); for(int i = 1; i <= range; i++){ for(int j = 0; j < 4; j++){ Tile other = tile.getNearby(Geometry.d4[j].x * i, Geometry.d4[j].y * i); if(linkValid(tile, other)){ boolean linked = other.pos() == link; - Draw.color(linked ? Pal.place : Pal.breakInvalid); - Lines.square(other.drawx(), other.drawy(), - other.block().size * tilesize / 2f + 1f + (linked ? 0f : Mathf.absin(Time.time(), 4f, 1f))); + Drawf.select(other.drawx(), other.drawy(), + other.block().size * tilesize / 2f + 2f + (linked ? 0f : Mathf.absin(Time.time(), 4f, 1f)), linked ? Pal.place : Pal.breakInvalid); } } } - - Draw.reset(); } @Override