mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-26 23:57:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Removed LCategory

Browse Source
This commit is contained in:
Anuken
2020-11-10 08:57:30 -05:00
parent ebdced5c6c
commit f0c4ebfd31
6 changed files with 52 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/graphics/Pal.java
View File

@ -98,5 +98,11 @@ public class Pal{
plasticSmoke = Color.valueOf("f1e479"), 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");
} }

2
core/src/mindustry/logic/LCanvas.java
View File

@ -268,7 +268,7 @@ public class LCanvas extends Table{
st.elem = this; st.elem = this;
background(Tex.whitePane); background(Tex.whitePane);
setColor(st.category().color); setColor(st.color());
margin(0f); margin(0f);
touchable = Touchable.enabled; touchable = Touchable.enabled;

17
core/src/mindustry/logic/LCategory.java
View File

@ -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;
}
}

3
core/src/mindustry/logic/LStatement.java
View File

@ -2,6 +2,7 @@ package mindustry.logic;
import arc.*; import arc.*;
import arc.func.*; import arc.func.*;
import arc.graphics.*;
import arc.math.*; import arc.math.*;
import arc.scene.*; import arc.scene.*;
import arc.scene.actions.*; import arc.scene.actions.*;
@ -21,7 +22,7 @@ public abstract class LStatement{
public transient @Nullable StatementElem elem; public transient @Nullable StatementElem elem;
public abstract void build(Table table); public abstract void build(Table table);
public abstract LCategory category(); public abstract Color color();
public abstract LInstruction build(LAssembler builder); public abstract LInstruction build(LAssembler builder);
public LStatement copy(){ public LStatement copy(){

81
core/src/mindustry/logic/LStatements.java
View File

@ -8,6 +8,7 @@ import arc.scene.ui.layout.*;
import mindustry.*; import mindustry.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.logic.LCanvas.*; import mindustry.logic.LCanvas.*;
import mindustry.logic.LExecutor.*; import mindustry.logic.LExecutor.*;
import mindustry.type.*; import mindustry.type.*;
@ -29,8 +30,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.control; return Pal.logicControl;
} }
@Override @Override
@ -47,8 +48,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.operations; return Pal.logicOperations;
} }
@Override @Override
@ -79,8 +80,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.io; return Pal.logicIo;
} }
@Override @Override
@ -111,8 +112,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.io; return Pal.logicIo;
} }
@Override @Override
@ -233,8 +234,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.io; return Pal.logicIo;
} }
@Override @Override
@ -258,8 +259,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.io; return Pal.logicIo;
} }
} }
@ -274,8 +275,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.blocks; return Pal.logicBlocks;
} }
@Override @Override
@ -295,8 +296,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.blocks; return Pal.logicBlocks;
} }
@Override @Override
@ -319,8 +320,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.blocks; return Pal.logicBlocks;
} }
@Override @Override
@ -372,8 +373,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.blocks; return Pal.logicBlocks;
} }
@Override @Override
@ -443,8 +444,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.blocks; return Pal.logicBlocks;
} }
@Override @Override
@ -546,8 +547,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.blocks; return Pal.logicBlocks;
} }
@Override @Override
@ -571,8 +572,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.operations; return Pal.logicOperations;
} }
@Override @Override
@ -629,8 +630,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.operations; return Pal.logicOperations;
} }
} }
@ -647,8 +648,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.control; return Pal.logicControl;
} }
} }
@ -712,8 +713,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.control; return Pal.logicControl;
} }
} }
@ -750,8 +751,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.units; return Pal.logicUnits;
} }
@Override @Override
@ -803,8 +804,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.units; return Pal.logicUnits;
} }
@Override @Override
@ -823,8 +824,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.units; return Pal.logicUnits;
} }
@Override @Override
@ -932,8 +933,8 @@ public class LStatements{
} }
@Override @Override
public LCategory category(){ public Color color(){
return LCategory.units; return Pal.logicUnits;
} }
@Override @Override

2
core/src/mindustry/logic/LogicDialog.java
View File

@ -65,7 +65,7 @@ public class LogicDialog extends BaseDialog{
if(example instanceof InvalidStatement || example.hidden()) continue; if(example instanceof InvalidStatement || example.hidden()) continue;
TextButtonStyle style = new TextButtonStyle(Styles.cleart); TextButtonStyle style = new TextButtonStyle(Styles.cleart);
style.fontColor = example.category().color; style.fontColor = example.color();
style.font = Fonts.outline; style.font = Fonts.outline;
t.button(example.name(), style, () -> { t.button(example.name(), style, () -> {