yawaflua/Informatis
1
0
Fork 0
mirror of https://github.com/yawaflua/Informatis.git synced 2025-12-10 12:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug

Browse Source
This commit is contained in:
sharlotte
2021-08-25 10:08:38 +09:00
parent 2c98adde28
commit 2c8a6c1792
6 changed files with 11 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/UnitInfo/core/HudUi.java
View File

@@ -429,7 +429,7 @@ public class HudUi {
});
});
Table pathlineTable = new Table(t -> {
t.left();
t.right();
Button pathBtn = new ImageButton(new ScaledNinePatchDrawable(new NinePatch(Icon.grid.getRegion()), 0.5f), Styles.clearToggleTransi);
Button unitBtn = new ImageButton(new ScaledNinePatchDrawable(new NinePatch(Icon.grid.getRegion()), 0.5f), Styles.clearToggleTransi);
@@ -453,11 +453,9 @@ public class HudUi {
logicBtn.setChecked(logicLine);
});
t.add(pathBtn).padLeft(16).size(24);
t.row();
t.add(unitBtn).padLeft(16).size(24);
t.row();
t.add(logicBtn).padLeft(16).size(24);
t.add(pathBtn).padLeft(4 * 8f).size(3 * 8f).row();
t.add(unitBtn).padLeft(4 * 8f).size(3 * 8f).row();
t.add(logicBtn).padLeft(4 * 8f).size(3 * 8f).row();
});
Table waveTable = (Table)((Group)((Group)ui.hudGroup.getChildren().get(5)) //HudFragment#118, name: overlaymarker

2
src/UnitInfo/core/Main.java
View File

@@ -65,8 +65,6 @@ public class Main extends Mod {
hud.addTable();
hud.addWaveInfoTable();
hud.setEvent();
playerinfo.createFile();
playerinfo.setEvent();
});
Events.on(WorldLoadEvent.class, e -> {

64
src/UnitInfo/core/PlayerParser.java
View File

@@ -1,64 +0,0 @@
package UnitInfo.core;
import UnitInfo.*;
import arc.*;
import arc.struct.*;
import mindustry.*;
import mindustry.game.*;
import mindustry.gen.*;
import org.hjson.*;
import static UnitInfo.SVars.modRoot;
public class PlayerParser{
ObjectMap<Player, Seq<String>> chats = new ObjectMap<>();
public void setEvent() {
Events.on(EventType.PlayerChatEvent.class, e -> {
chats.get(e.player,Seq::new).add(e.message);
writeJson(e.player);
save();
});
Events.run(EventType.Trigger.update, ()->{
if(Vars.net.active()) Groups.player.each(this::writeJson);
save();
});
}
public void createFile() {
if(!modRoot.child("players.hjson").exists()) save();
}
public void writeJson(Player player1){
PlayerInfo info = SVars.playerInfos.find(pi -> pi.player == player1);
if(info != null){
if(!info.names.contains(player1.name)) info.names.add(player1.name);
}
else{
SVars.playerInfos.add(new PlayerInfo(){{
player = player1;
names.add(player1.name);
}});
}
}
public void save() {
JsonObject data = new JsonObject();
SVars.playerInfos.each(pi->{
JsonArray arr = new JsonArray();
JsonArray chatArr = new JsonArray();
pi.names.each(arr::add);
if(chats.get(pi.player) != null) chats.get(pi.player).each(chatArr::add);
data.add("names", arr);
data.add("chats", chatArr);
});
modRoot.child("players.hjson").writeString(data.toString(Stringify.HJSON));
}
public static class PlayerInfo{
Player player;
Seq<String> names = new Seq<>();
}
}

8
src/UnitInfo/core/SettingS.java
View File

@@ -71,12 +71,16 @@ public class SettingS {
public void add(Table table) {
final String[] str = {""};
Table table1 = new Table(t -> {
final float[] value = new float[1];
t.add(new Label(title + ": ")).left().padRight(5)
.update(a -> a.setColor(condition.get() ? Color.white : Color.gray));
t.field((integer ? settings.getInt(key) : settings.getFloat(key)) + str[0], s -> {
settings.put(key, integer ? Strings.parseInt(s) : Strings.parseFloat(s));
t.field(value[0] + str[0], s -> {
value[0] = Strings.parseFloat(s);
str[0] = h.get(s);
if(integer) settings.put(key, Strings.parseInt(s.split("[.]")[0]));
else settings.put(key, Strings.parseFloat(s));
}).update(a -> a.setDisabled(!condition.get()))
.valid(f -> Strings.canParsePositiveFloat(f) && Strings.parseFloat(f) >= min && Strings.parseFloat(f) <= max).width(120f).left();
});