From f0c4ebfd317475f554ffe6e69a54fb93ecd2ac82 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 10 Nov 2020 08:57:30 -0500 Subject: [PATCH] Removed LCategory --- core/src/mindustry/graphics/Pal.java | 8 ++- core/src/mindustry/logic/LCanvas.java | 2 +- core/src/mindustry/logic/LCategory.java | 17 ----- core/src/mindustry/logic/LStatement.java | 3 +- core/src/mindustry/logic/LStatements.java | 81 ++++++++++++----------- core/src/mindustry/logic/LogicDialog.java | 2 +- 6 files changed, 52 insertions(+), 61 deletions(-) delete mode 100644 core/src/mindustry/logic/LCategory.java diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java index 8a6fefa8a4..1b2b10ff94 100644 --- a/core/src/mindustry/graphics/Pal.java +++ b/core/src/mindustry/graphics/Pal.java @@ -98,5 +98,11 @@ public class Pal{ plasticSmoke = Color.valueOf("f1e479"), - adminChat = Color.valueOf("ff4000"); + adminChat = Color.valueOf("ff4000"), + + logicBlocks = Color.valueOf("d4816b"), + logicControl = Color.valueOf("6bb2b2"), + logicOperations = Color.valueOf("877bad"), + logicIo = Color.valueOf("a08a8a"), + logicUnits = Color.valueOf("c7b59d"); } diff --git a/core/src/mindustry/logic/LCanvas.java b/core/src/mindustry/logic/LCanvas.java index 6821ac0993..92c8f61d53 100644 --- a/core/src/mindustry/logic/LCanvas.java +++ b/core/src/mindustry/logic/LCanvas.java @@ -268,7 +268,7 @@ public class LCanvas extends Table{ st.elem = this; background(Tex.whitePane); - setColor(st.category().color); + setColor(st.color()); margin(0f); touchable = Touchable.enabled; diff --git a/core/src/mindustry/logic/LCategory.java b/core/src/mindustry/logic/LCategory.java deleted file mode 100644 index 01d127cb6e..0000000000 --- a/core/src/mindustry/logic/LCategory.java +++ /dev/null @@ -1,17 +0,0 @@ -package mindustry.logic; - -import arc.graphics.*; - -public enum LCategory{ - blocks(Color.valueOf("d4816b")), - control(Color.valueOf("6bb2b2")), - operations(Color.valueOf("877bad")), - io(Color.valueOf("a08a8a")), - units(Color.valueOf("c7b59d")); - - public final Color color; - - LCategory(Color color){ - this.color = color; - } -} diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java index 9fdc6407ef..67e415c25f 100644 --- a/core/src/mindustry/logic/LStatement.java +++ b/core/src/mindustry/logic/LStatement.java @@ -2,6 +2,7 @@ package mindustry.logic; import arc.*; import arc.func.*; +import arc.graphics.*; import arc.math.*; import arc.scene.*; import arc.scene.actions.*; @@ -21,7 +22,7 @@ public abstract class LStatement{ public transient @Nullable StatementElem elem; public abstract void build(Table table); - public abstract LCategory category(); + public abstract Color color(); public abstract LInstruction build(LAssembler builder); public LStatement copy(){ diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index d2a1dfa111..f7f5d2ea4f 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -8,6 +8,7 @@ import arc.scene.ui.layout.*; import mindustry.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; +import mindustry.graphics.*; import mindustry.logic.LCanvas.*; import mindustry.logic.LExecutor.*; import mindustry.type.*; @@ -29,8 +30,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.control; + public Color color(){ + return Pal.logicControl; } @Override @@ -47,8 +48,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.operations; + public Color color(){ + return Pal.logicOperations; } @Override @@ -79,8 +80,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.io; + public Color color(){ + return Pal.logicIo; } @Override @@ -111,8 +112,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.io; + public Color color(){ + return Pal.logicIo; } @Override @@ -233,8 +234,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.io; + public Color color(){ + return Pal.logicIo; } @Override @@ -258,8 +259,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.io; + public Color color(){ + return Pal.logicIo; } } @@ -274,8 +275,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.blocks; + public Color color(){ + return Pal.logicBlocks; } @Override @@ -295,8 +296,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.blocks; + public Color color(){ + return Pal.logicBlocks; } @Override @@ -319,8 +320,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.blocks; + public Color color(){ + return Pal.logicBlocks; } @Override @@ -372,8 +373,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.blocks; + public Color color(){ + return Pal.logicBlocks; } @Override @@ -443,8 +444,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.blocks; + public Color color(){ + return Pal.logicBlocks; } @Override @@ -546,8 +547,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.blocks; + public Color color(){ + return Pal.logicBlocks; } @Override @@ -571,8 +572,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.operations; + public Color color(){ + return Pal.logicOperations; } @Override @@ -629,8 +630,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.operations; + public Color color(){ + return Pal.logicOperations; } } @@ -647,8 +648,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.control; + public Color color(){ + return Pal.logicControl; } } @@ -712,8 +713,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.control; + public Color color(){ + return Pal.logicControl; } } @@ -750,8 +751,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.units; + public Color color(){ + return Pal.logicUnits; } @Override @@ -803,8 +804,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.units; + public Color color(){ + return Pal.logicUnits; } @Override @@ -823,8 +824,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.units; + public Color color(){ + return Pal.logicUnits; } @Override @@ -932,8 +933,8 @@ public class LStatements{ } @Override - public LCategory category(){ - return LCategory.units; + public Color color(){ + return Pal.logicUnits; } @Override diff --git a/core/src/mindustry/logic/LogicDialog.java b/core/src/mindustry/logic/LogicDialog.java index 8a0dd896a9..51b6468c77 100644 --- a/core/src/mindustry/logic/LogicDialog.java +++ b/core/src/mindustry/logic/LogicDialog.java @@ -65,7 +65,7 @@ public class LogicDialog extends BaseDialog{ if(example instanceof InvalidStatement || example.hidden()) continue; TextButtonStyle style = new TextButtonStyle(Styles.cleart); - style.fontColor = example.category().color; + style.fontColor = example.color(); style.font = Fonts.outline; t.button(example.name(), style, () -> {