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

Merge pull request #8 from MEEPofFaith/I-am-personally-gonna-replace-everything-with-wildcard-imports

Browse Source 
Shar not bad
This commit is contained in:
Sharlotte
2021-05-30 20:51:04 +09:00
committed by GitHub
parent 39c2f17033 e97bff3a31
commit bcd4574f87
6 changed files with 70 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,49 +1,35 @@
package UnitInfo.core; package UnitInfo.core;
import UnitInfo.ui.SBar; import UnitInfo.ui.*;
import arc.Core; import arc.*;
import arc.Events; import arc.func.*;
import arc.func.Func; import arc.graphics.*;
import arc.graphics.Color;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.math.Angles; import arc.math.*;
import arc.math.Mathf; import arc.scene.*;
import arc.scene.Element; import arc.scene.style.*;
import arc.scene.style.TransformDrawable;
import arc.scene.ui.*; import arc.scene.ui.*;
import arc.scene.ui.layout.Scl; import arc.scene.ui.layout.*;
import arc.scene.ui.layout.Stack; import arc.scene.utils.*;
import arc.scene.ui.layout.Table; import arc.struct.*;
import arc.scene.utils.Elem;
import arc.struct.ObjectIntMap;
import arc.struct.Seq;
import arc.util.*; import arc.util.*;
import mindustry.Vars; import mindustry.*;
import mindustry.ai.types.FormationAI; import mindustry.ai.types.*;
import mindustry.content.Items; import mindustry.content.*;
import mindustry.content.Liquids; import mindustry.entities.abilities.*;
import mindustry.content.StatusEffects; import mindustry.entities.units.*;
import mindustry.entities.abilities.ForceFieldAbility; import mindustry.game.*;
import mindustry.entities.abilities.ShieldRegenFieldAbility;
import mindustry.entities.units.WeaponMount;
import mindustry.game.EventType;
import mindustry.game.SpawnGroup;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.Pal; import mindustry.graphics.*;
import mindustry.input.DesktopInput; import mindustry.input.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.ui.*; import mindustry.ui.*;
import mindustry.world.blocks.defense.turrets.ItemTurret; import mindustry.world.blocks.defense.turrets.*;
import mindustry.world.blocks.defense.turrets.LiquidTurret; import mindustry.world.blocks.power.*;
import mindustry.world.blocks.defense.turrets.PowerTurret; import mindustry.world.blocks.storage.*;
import mindustry.world.blocks.defense.turrets.Turret; import mindustry.world.consumers.*;
import mindustry.world.blocks.power.ConditionalConsumePower;
import mindustry.world.blocks.storage.CoreBlock;
import mindustry.world.consumers.ConsumePower;
import mindustry.world.consumers.ConsumeType;
import static arc.Core.scene; import static arc.Core.*;
import static arc.Core.settings;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class HudUi { public class HudUi {

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

@@ -1,28 +1,21 @@
package UnitInfo.core; package UnitInfo.core;
import UnitInfo.ui.FreeBar; import UnitInfo.ui.*;
import arc.Core; import arc.*;
import arc.Events; import arc.graphics.*;
import arc.graphics.Color; import arc.graphics.g2d.*;
import arc.graphics.g2d.Draw; import arc.math.*;
import arc.graphics.g2d.Lines; import arc.util.*;
import arc.math.Mathf; import mindustry.*;
import arc.struct.Seq; import mindustry.content.*;
import arc.util.Time;
import arc.util.Tmp;
import mindustry.Vars;
import mindustry.content.Fx;
import mindustry.content.UnitTypes;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.game.Team; import mindustry.game.*;
import mindustry.gen.Building; import mindustry.gen.*;
import mindustry.gen.Groups; import mindustry.graphics.*;
import mindustry.graphics.Pal; import mindustry.mod.*;
import mindustry.mod.Mod;
import static arc.Core.settings; import static arc.Core.*;
import static mindustry.Vars.indexer; import static mindustry.Vars.*;
import static mindustry.Vars.mobile;
public class Main extends Mod { public class Main extends Mod {
public static Setting settingAdder = new Setting(); public static Setting settingAdder = new Setting();

22
src/UnitInfo/core/PrograssedReqImage.java
View File

@@ -1,20 +1,14 @@
package UnitInfo.core; package UnitInfo.core;
import arc.func.Boolp; import arc.func.*;
import arc.graphics.g2d.Draw; import arc.graphics.g2d.*;
import arc.graphics.g2d.Lines; import arc.scene.*;
import arc.graphics.g2d.TextureRegion; import arc.scene.ui.*;
import arc.scene.Element; import arc.scene.ui.layout.*;
import arc.scene.ui.Image; import mindustry.graphics.*;
import arc.scene.ui.layout.Scl;
import arc.scene.ui.layout.Stack;
import mindustry.graphics.Pal;
public class PrograssedReqImage extends Stack { public class PrograssedReqImage extends Stack {
private final Boolp valid;
public PrograssedReqImage(Element image, Boolp valid, float prograss){ public PrograssedReqImage(Element image, Boolp valid, float prograss){
this.valid = valid;
add(image); add(image);
add(new Element(){ add(new Element(){
{ {
@@ -37,9 +31,5 @@ public class PrograssedReqImage extends Stack {
public PrograssedReqImage(TextureRegion region, Boolp valid, float prograss){ public PrograssedReqImage(TextureRegion region, Boolp valid, float prograss){
this(new Image(region), valid, prograss); this(new Image(region), valid, prograss);
} }
public boolean valid(){
return valid.get();
}
} }

24
src/UnitInfo/core/Setting.java
View File

@@ -1,21 +1,15 @@
package UnitInfo.core; package UnitInfo.core;
import arc.Core; import arc.*;
import arc.Input; import arc.graphics.*;
import arc.graphics.Color; import arc.scene.ui.*;
import arc.scene.ui.Dialog; import arc.scene.ui.layout.*;
import arc.scene.ui.Label; import arc.util.*;
import arc.scene.ui.SettingsDialog; import mindustry.*;
import arc.scene.ui.TextArea; import mindustry.gen.*;
import arc.scene.ui.layout.Scl; import mindustry.ui.dialogs.*;
import arc.scene.ui.layout.Table;
import arc.util.Align;
import arc.util.Log;
import mindustry.Vars;
import mindustry.gen.Icon;
import mindustry.ui.dialogs.BaseDialog;
import static mindustry.Vars.ui; import static mindustry.Vars.*;
public class Setting { public class Setting {
public void addGraphicSetting(String key){ public void addGraphicSetting(String key){

44
src/UnitInfo/ui/FreeBar.java
View File

@@ -1,37 +1,23 @@
package UnitInfo.ui; package UnitInfo.ui;
import UnitInfo.core.PrograssedReqImage; import arc.*;
import arc.Core; import arc.func.*;
import arc.func.Func; import arc.graphics.*;
import arc.graphics.Color;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
import arc.scene.ui.Image; import arc.struct.*;
import arc.struct.FloatSeq; import arc.util.*;
import arc.util.Log; import mindustry.*;
import arc.util.Tmp; import mindustry.content.*;
import mindustry.Vars; import mindustry.entities.abilities.*;
import mindustry.content.Liquids;
import mindustry.entities.abilities.ForceFieldAbility;
import mindustry.entities.abilities.ShieldRegenFieldAbility;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.Drawf; import mindustry.graphics.*;
import mindustry.graphics.Layer; import mindustry.type.*;
import mindustry.graphics.Pal; import mindustry.world.blocks.defense.*;
import mindustry.graphics.Trail;
import mindustry.type.Item;
import mindustry.type.Liquid;
import mindustry.ui.Cicon;
import mindustry.ui.MultiReqImage;
import mindustry.ui.ReqImage;
import mindustry.world.blocks.defense.Wall;
import mindustry.world.blocks.defense.turrets.*; import mindustry.world.blocks.defense.turrets.*;
import mindustry.world.blocks.power.ConditionalConsumePower;
import mindustry.world.consumers.ConsumePower;
import mindustry.world.consumers.ConsumeType;
import static arc.Core.settings; import static arc.Core.*;
import static mindustry.Vars.content; import static mindustry.Vars.*;
public class FreeBar { public class FreeBar {
public float value; public float value;
@@ -183,10 +169,6 @@ public class FreeBar {
} }
else if(build instanceof PowerTurret.PowerTurretBuild){ else if(build instanceof PowerTurret.PowerTurretBuild){
PowerTurret.PowerTurretBuild entity = (PowerTurret.PowerTurretBuild) build; PowerTurret.PowerTurretBuild entity = (PowerTurret.PowerTurretBuild) build;
ConsumePower cons = entity.block.consumes.getPower();
double max = (Math.round(cons.usage * 10) / 10.0) * 60;
double v = (Math.round(((ConditionalConsumePower)entity.block.consumes.get(ConsumeType.power)).requestedPower(entity) * 10) / 10.0);
h = entity.power.status; h = entity.power.status;
color = Pal.powerBar; color = Pal.powerBar;

17
src/UnitInfo/ui/SBar.java
View File

@@ -1,4 +1,5 @@
package UnitInfo.ui; package UnitInfo.ui;
import arc.*; import arc.*;
import arc.func.*; import arc.func.*;
import arc.graphics.*; import arc.graphics.*;
@@ -7,13 +8,10 @@ import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.scene.*; import arc.scene.*;
import arc.scene.style.*; import arc.scene.style.*;
import arc.scene.ui.layout.Scl; import arc.scene.ui.layout.*;
import arc.util.pooling.*; import arc.util.pooling.*;
import mindustry.gen.*; import mindustry.graphics.*;
import mindustry.graphics.Pal; import mindustry.ui.*;
import mindustry.ui.Fonts;
import static arc.Core.settings;
public class SBar extends Element{ public class SBar extends Element{
private static Rect scissor = new Rect(); private static Rect scissor = new Rect();
@@ -69,11 +67,6 @@ public class SBar extends Element{
}); });
} }
public SBar(){
}
public void reset(float value){ public void reset(float value){
this.value = lastValue = blink = value; this.value = lastValue = blink = value;
} }
@@ -92,7 +85,7 @@ public class SBar extends Element{
} }
public Drawable drawable(String name){ public Drawable drawable(String name){
Drawable out = null; Drawable out;
TextureAtlas.AtlasRegion region = Core.atlas.find(name); TextureAtlas.AtlasRegion region = Core.atlas.find(name);