Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
Anuken
2025-06-17 11:20:35 -04:00
parent 536f4db5fe 2d14cd2232
commit 1e3b6b7524
3 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/mindustry/game/MapObjectives.java
View File

@@ -822,13 +822,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
switch(type){ switch(type){
case fontSize -> fontSize = (float)p1; case fontSize -> fontSize = (float)p1;
case textHeight -> textHeight = (float)p1; case textHeight -> textHeight = (float)p1;
case labelFlags -> { case outline -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p1, 0f));
if(!Mathf.equal((float)p1, 0f)){ case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagBackground, !Mathf.equal((float)p1, 0f));
flags |= WorldLabel.flagBackground;
}else{
flags &= ~WorldLabel.flagBackground;
}
}
case radius -> radius = (float)p1; case radius -> radius = (float)p1;
case rotation -> rotation = (float)p1; case rotation -> rotation = (float)p1;
case color -> color.fromDouble(p1); case color -> color.fromDouble(p1);
@@ -838,13 +833,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
if(!Double.isNaN(p2)){ if(!Double.isNaN(p2)){
switch(type){ switch(type){
case labelFlags -> { case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p2, 0f));
if(!Mathf.equal((float)p2, 0f)){
flags |= WorldLabel.flagOutline;
}else{
flags &= ~WorldLabel.flagOutline;
}
}
} }
} }
} }
@@ -962,6 +951,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
switch(type){ switch(type){
case radius -> radius = (float)p1; case radius -> radius = (float)p1;
case stroke -> stroke = (float)p1; case stroke -> stroke = (float)p1;
case outline -> outline = !Mathf.equal((float)p1, 0f);
case rotation -> rotation = (float)p1; case rotation -> rotation = (float)p1;
case color -> color.fromDouble(p1); case color -> color.fromDouble(p1);
case shape -> sides = (int)p1; case shape -> sides = (int)p1;
@@ -1025,25 +1015,14 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
if(!Double.isNaN(p1)){ if(!Double.isNaN(p1)){
switch(type){ switch(type){
case fontSize -> fontSize = (float)p1; case fontSize -> fontSize = (float)p1;
case labelFlags -> { case outline -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p1, 0f));
if(!Mathf.equal((float)p1, 0f)){ case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagBackground, !Mathf.equal((float)p1, 0f));
flags |= WorldLabel.flagBackground;
}else{
flags &= ~WorldLabel.flagBackground;
}
}
} }
} }
if(!Double.isNaN(p2)){ if(!Double.isNaN(p2)){
switch(type){ switch(type){
case labelFlags -> { case labelFlags -> flags = (byte)Pack.bitmask(flags, WorldLabel.flagOutline, !Mathf.equal((float)p2, 0f));
if(!Mathf.equal((float)p2, 0f)){
flags |= WorldLabel.flagOutline;
}else{
flags &= ~WorldLabel.flagOutline;
}
}
} }
} }
} }
@@ -1101,6 +1080,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
case endPos -> endPos.x = (float)p1 * tilesize; case endPos -> endPos.x = (float)p1 * tilesize;
case stroke -> stroke = (float)p1; case stroke -> stroke = (float)p1;
case color -> color1.set(color2.fromDouble(p1)); case color -> color1.set(color2.fromDouble(p1));
case outline -> outline = !Mathf.equal((float)p1, 0f);
} }
} }

1
core/src/mindustry/logic/LMarkerControl.java
View File

@@ -11,6 +11,7 @@ public enum LMarkerControl{
color("color"), color("color"),
radius("radius"), radius("radius"),
stroke("stroke"), stroke("stroke"),
outline("outline"),
rotation("rotation"), rotation("rotation"),
shape("sides", "fill", "outline"), shape("sides", "fill", "outline"),
arc("start", "end"), arc("start", "end"),

20
servers_v7.json
View File

@@ -1,4 +1,16 @@
[ [
{
"name": "EscoCorp",
"address": [
"95.215.56.128",
"95.215.56.128:6568",
"95.215.56.128:6569",
"95.215.56.128:6570",
"95.215.56.128:6571",
"95.215.56.128:6572",
"95.215.56.128:6573"
]
},
{ {
"name": "EchoDustry", "name": "EchoDustry",
"address": [ "address": [
@@ -278,11 +290,11 @@
"194.164.245.218:6569", "194.164.245.218:6569",
"194.164.245.218:6570", "194.164.245.218:6570",
"194.164.245.218:6571", "194.164.245.218:6571",
"194.164.245.218:6572",
"194.164.245.218:6573",
"194.164.245.218:6574",
"194.164.245.218:6597", "194.164.245.218:6597",
"194.164.245.218:6598", "194.164.245.218:6598"
"194.164.245.218:6599",
"194.164.245.218:6600",
"194.164.245.218:6601"
] ]
}, },
{ {