mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 15:02:03 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse source
This commit is contained in:
Anuken 2021-03-03 10:49:57 -05:00
commit 87142b06c3
11 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/assets/bundles/bundle.properties
View file

@ -216,9 +216,11 @@ server.hidden = Hidden
trace = Trace Player
trace.playername = Player name: [accent]{0}
trace.ip = IP: [accent]{0}
trace.id = Unique ID: [accent]{0}
trace.id = ID: [accent]{0}
trace.mobile = Mobile Client: [accent]{0}
trace.modclient = Custom Client: [accent]{0}
trace.times.joined = Times Joined: [accent]{0}
trace.times.kicked = Times Kicked: [accent]{0}
invalidid = Invalid client ID! Submit a bug report.
server.bans = Bans
server.bans.none = No banned players found!

4
core/src/mindustry/content/Blocks.java
View file

@ -1370,16 +1370,12 @@ public class Blocks implements ContentList{
requirements(Category.effect, with(Items.titanium, 250, Items.thorium, 125));
size = 3;
itemCapacity = 1000;
flags = EnumSet.of(BlockFlag.storage);
group = BlockGroup.transportation;
}};
container = new StorageBlock("container"){{
requirements(Category.effect, with(Items.titanium, 100));
size = 2;
itemCapacity = 300;
flags = EnumSet.of(BlockFlag.storage);
group = BlockGroup.transportation;
}};
unloader = new Unloader("unloader"){{

3
core/src/mindustry/core/NetServer.java
View file

@ -735,7 +735,8 @@ public class NetServer implements ApplicationListener{
other.kick(KickReason.kick);
info("&lc@ has kicked @.", player.name, other.name);
}else if(action == AdminAction.trace){
TraceInfo info = new TraceInfo(other.con.address, other.uuid(), other.con.modclient, other.con.mobile);
PlayerInfo stats = netServer.admins.getInfo(other.uuid());
TraceInfo info = new TraceInfo(other.con.address, other.uuid(), other.con.modclient, other.con.mobile, stats.timesJoined, stats.timesKicked);
if(player.con != null){
Call.traceInfo(player.con, other, info);
}else{

4
core/src/mindustry/io/TypeIO.java
View file

@ -572,10 +572,12 @@ public class TypeIO{
writeString(write, trace.uuid);
write.b(trace.modded ? (byte)1 : 0);
write.b(trace.mobile ? (byte)1 : 0);
write.i(trace.timesJoined);
write.i(trace.timesKicked);
}
public static TraceInfo readTraceInfo(Reads read){
return new TraceInfo(readString(read), readString(read), read.b() == 1, read.b() == 1);
return new TraceInfo(readString(read), readString(read), read.b() == 1, read.b() == 1, read.i(), read.i());
}
public static void writeStringData(DataOutput buffer, String string) throws IOException{

5
core/src/mindustry/net/Administration.java
View file

@ -584,12 +584,15 @@ public class Administration{
public static class TraceInfo{
public String ip, uuid;
public boolean modded, mobile;
public int timesJoined, timesKicked;
public TraceInfo(String ip, String uuid, boolean modded, boolean mobile){
public TraceInfo(String ip, String uuid, boolean modded, boolean mobile, int timesJoined, int timesKicked){
this.ip = ip;
this.uuid = uuid;
this.modded = modded;
this.mobile = mobile;
this.timesJoined = timesJoined;
this.timesKicked = timesKicked;
}
}

4
core/src/mindustry/ui/dialogs/TraceDialog.java
View file

@ -32,6 +32,10 @@ public class TraceDialog extends BaseDialog{
table.row();
table.add(Core.bundle.format("trace.mobile", info.mobile));
table.row();
table.add(Core.bundle.format("trace.times.joined", info.timesJoined));
table.row();
table.add(Core.bundle.format("trace.times.kicked", info.timesKicked));
table.row();
table.add().pad(5);
table.row();

4
core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
View file

@ -1,5 +1,6 @@
package mindustry.world.blocks.defense.turrets;
import arc.struct.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.gen.*;
@ -27,6 +28,9 @@ public class BaseTurret extends Block{
update = true;
solid = true;
outlineIcon = true;
priority = TargetPriority.turret;
group = BlockGroup.turrets;
flags = EnumSet.of(BlockFlag.turret);
}
@Override

6
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View file

@ -93,12 +93,6 @@ public class Turret extends ReloadTurret{
public Turret(String name){
super(name);
priority = TargetPriority.turret;
update = true;
solid = true;
group = BlockGroup.turrets;
flags = EnumSet.of(BlockFlag.turret);
outlineIcon = true;
liquidCapacity = 20f;
}

1
core/src/mindustry/world/blocks/storage/CoreBlock.java
View file

@ -50,7 +50,6 @@ public class CoreBlock extends StorageBlock{
unitCapModifier = 10;
loopSound = Sounds.respawning;
loopSoundVolume = 1f;
group = BlockGroup.none;
drawDisabled = false;
canOverdrive = false;
}

3
core/src/mindustry/world/blocks/storage/StorageBlock.java
View file

@ -20,7 +20,8 @@ public class StorageBlock extends Block{
solid = true;
update = false;
destructible = true;
group = BlockGroup.storage;
group = BlockGroup.transportation;
flags = EnumSet.of(BlockFlag.storage);
}
@Override

2
core/src/mindustry/world/meta/BlockGroup.java
View file

@ -1,7 +1,7 @@
package mindustry.world.meta;
public enum BlockGroup{
none, walls(true), projectors(true), turrets, transportation(true), power, liquids(true), drills, storage, units, logic(true);
none, walls(true), projectors(true), turrets(true), transportation(true), power, liquids(true), drills, units, logic(true);
/** if true, any block in this category replaces any other block in this category. */
public final boolean anyReplace;