From e8bdb3ffdd290242f9c35b98cc6bf2cb5d439813 Mon Sep 17 00:00:00 2001 From: sharlotte Date: Tue, 24 Aug 2021 14:34:11 +0900 Subject: [PATCH] h --- src/UnitInfo/SUtils.java | 3 +-- src/UnitInfo/SVars.java | 2 ++ src/UnitInfo/core/Main.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/UnitInfo/SUtils.java b/src/UnitInfo/SUtils.java index a2c7002..a3a4473 100644 --- a/src/UnitInfo/SUtils.java +++ b/src/UnitInfo/SUtils.java @@ -19,11 +19,10 @@ public class SUtils { public static String floatFormat(float number){ if(number >= 1000) return UI.formatAmount((long)number); - if(String.valueOf(number).split("[.]")[1].matches("0")) return String.valueOf(number).split("[.]")[0]; + if(String.valueOf(number).length() > 2 && String.valueOf(number).split("[.]")[1].matches("0")) return String.valueOf(number).split("[.]")[0]; return Strings.fixed(number, 2); } - public static Object invoke(Object ut, String fieldName) throws IllegalAccessException, NoSuchFieldException { Field field = ut.getClass().getDeclaredField(fieldName); field.setAccessible(true); diff --git a/src/UnitInfo/SVars.java b/src/UnitInfo/SVars.java index cd9146f..d9cf715 100644 --- a/src/UnitInfo/SVars.java +++ b/src/UnitInfo/SVars.java @@ -3,7 +3,9 @@ package UnitInfo; import UnitInfo.core.*; import arc.files.*; import arc.graphics.g2d.TextureRegion; +import arc.scene.ui.TextButton; import arc.scene.ui.layout.Scl; +import arc.scene.ui.layout.Table; import arc.struct.*; import mindustry.world.Tile; diff --git a/src/UnitInfo/core/Main.java b/src/UnitInfo/core/Main.java index 9efd20d..d7aa087 100644 --- a/src/UnitInfo/core/Main.java +++ b/src/UnitInfo/core/Main.java @@ -223,7 +223,7 @@ public class Main extends Mod { float range = u.range(); float max = range + settings.getInt("rangeRadius") * tilesize; - if(Vars.player.dst(u) <= max) { // TODO: Store value of rangeRadius as an int, should increase performance + if(Vars.player.dst(u) <= max) { if (canHit || settings.getBool("allTargetRange")) // Same as above if(settings.getBool("softRangeDrawing")){ Lines.stroke(Scl.scl(), Tmp.c1.set(canHit ? u.team.color : Team.derelict.color).a(0.5f)); @@ -235,6 +235,7 @@ public class Main extends Mod { }); } } + if(!state.rules.polygonCoreProtection && settings.getBool("coreRange") && player != null){ state.teams.eachEnemyCore(player.team(), core -> { if(Core.camera.bounds(Tmp.r1).overlaps(Tmp.r2.setCentered(core.x, core.y, state.rules.enemyCoreBuildRadius * 2f))){