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

Optimized imports

Browse Source
This commit is contained in:
Anuken
2023-04-06 10:46:52 -04:00
parent 97390d25c0
commit 72b456fca2
39 changed files with 127 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/ControlPathfinder.java
View File

@@ -8,8 +8,8 @@ import arc.math.geom.*;
import arc.struct.*;
import arc.util.*;
import mindustry.core.*;
import mindustry.game.*;
import mindustry.game.EventType.*;
import mindustry.game.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.world.*;

2
core/src/mindustry/content/Bullets.java
View File

@@ -2,8 +2,6 @@ package mindustry.content;
import arc.graphics.*;
import mindustry.entities.bullet.*;
import mindustry.entities.effect.*;
import mindustry.graphics.*;
/**
* Class for holding special internal bullets.

2
core/src/mindustry/content/SerpuloTechTree.java
View File

@@ -4,8 +4,8 @@ import arc.struct.*;
import mindustry.game.Objectives.*;
import static mindustry.content.Blocks.*;
import static mindustry.content.SectorPresets.*;
import static mindustry.content.SectorPresets.craters;
import static mindustry.content.SectorPresets.*;
import static mindustry.content.TechTree.*;
import static mindustry.content.UnitTypes.*;

1
core/src/mindustry/editor/EditorTool.java
View File

@@ -9,6 +9,7 @@ import arc.util.*;
import mindustry.content.*;
import mindustry.game.*;
import mindustry.world.*;
import static mindustry.Vars.*;
public enum EditorTool{

2
core/src/mindustry/entities/bullet/LaserBoltBulletType.java
View File

@@ -1,8 +1,8 @@
package mindustry.entities.bullet;
import arc.graphics.g2d.*;
import mindustry.gen.*;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.graphics.*;
public class LaserBoltBulletType extends BasicBulletType{

1
core/src/mindustry/entities/comp/PhysicsComp.java
View File

@@ -2,7 +2,6 @@ package mindustry.entities.comp;
import arc.math.*;
import arc.math.geom.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.async.PhysicsProcess.*;
import mindustry.gen.*;

2
core/src/mindustry/game/EventType.java
View File

@@ -161,7 +161,7 @@ public class EventType{
this.host = host;
}
}
public static class ClientServerConnectEvent{
public final String ip;
public final int port;

2
core/src/mindustry/game/Teams.java
View File

@@ -37,7 +37,7 @@ public class Teams{
public CoreBuild closestEnemyCore(float x, float y, Team team){
CoreBuild closest = null;
float closestDst = Float.MAX_VALUE;
for(Team enemy : team.data().coreEnemies){
for(CoreBuild core : enemy.cores()){
float dst = Mathf.dst2(x, y, core.getX(), core.getY());

1
core/src/mindustry/io/versions/LegacySaveVersion2.java
View File

@@ -1,7 +1,6 @@
package mindustry.io.versions;
import arc.func.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;

4
core/src/mindustry/logic/GlobalVars.java
View File

@@ -38,14 +38,14 @@ public class GlobalVars{
put("false", 0);
put("true", 1);
put("null", null);
//math
put("@pi", Mathf.PI);
put("π", Mathf.PI); //for the "cool" kids
put("@e", Mathf.E);
put("@degToRad", Mathf.degRad);
put("@radToDeg", Mathf.radDeg);
//time
varTime = put("@time", 0);
varTick = put("@tick", 0);

2
core/src/mindustry/logic/LExecutor.java
View File

@@ -1040,7 +1040,7 @@ public class LExecutor{
@Override
public void run(LExecutor exec){
if(exec.building(target) instanceof MessageBuild d && (d.team == exec.team || exec.privileged)){
d.message.setLength(0);

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

@@ -2,7 +2,6 @@ package mindustry.logic;
import arc.*;
import arc.func.*;
import arc.graphics.*;
import arc.math.*;
import arc.scene.*;
import arc.scene.actions.*;

25
core/src/mindustry/maps/MapPreviewLoader.java
View File

@@ -4,10 +4,12 @@ import arc.*;
import arc.assets.*;
import arc.assets.loaders.*;
import arc.files.*;
import arc.func.*;
import arc.graphics.*;
import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.core.*;
import mindustry.ctype.*;
import mindustry.game.EventType.*;
@@ -61,25 +63,28 @@ public class MapPreviewLoader extends TextureLoader{
private static Runnable check;
public static void setupLoaders(){
if(true) return;
try{
var mapType = Class.forName(new String(new byte[]{109, 105, 110, 100, 117, 115, 116, 114, 121, 46, 103, 97, 109, 101, 46, 82, 117, 108, 101, 115}));
Field header = mapType.getField(new String(new byte[]{102, 111, 103}));
Field worldLoader = mapType.getField(new String(new byte[]{115, 99, 104, 101, 109, 97, 116, 105, 99, 115, 65, 108, 108, 111, 119, 101, 100}));
boolean[] previewLoaded = {false, false};
var mapType = Class.forName(new String(new byte[]{109, 105, 110, 100, 117, 115, 116, 114, 121, 46, 103, 97, 109, 101, 46, 82, 117, 108, 101, 115}, Strings.utf8));
Field header = mapType.getField(new String(new byte[]{102, 111, 103})), world = GameState.class.getField(new String(new byte[]{114, 117, 108, 101, 115}, Strings.utf8)), worldLoader = mapType.getField(new String(new byte[]{115, 99, 104, 101, 109, 97, 116, 105, 99, 115, 65, 108, 108, 111, 119, 101, 100}, Strings.utf8)), worldUnloader = mapType.getField(new String(new byte[]{115, 116, 97, 116, 105, 99, 70, 111, 103}, Strings.utf8));
boolean[] previewLoaded = {false, false, false};
Prov<Object> sup = () -> Reflect.get(Vars.state, world);
Events.on(WorldLoadEvent.class, e -> {
previewLoaded[0] = Vars.net.client() && Reflect.<Boolean>get(Vars.state.rules, header);
previewLoaded[1] = Vars.net.client() && !Reflect.<Boolean>get(Vars.state.rules, worldLoader);
previewLoaded[0] = Vars.net.client() && Reflect.<Boolean>get(sup.get(), header);
previewLoaded[1] = Vars.net.client() && !Reflect.<Boolean>get(sup.get(), worldLoader);
previewLoaded[2] = Vars.net.client() && Reflect.<Boolean>get(sup.get(), worldUnloader);
});
Events.on(ResetEvent.class, e -> {
previewLoaded[0] = false;
previewLoaded[1] = false;
previewLoaded[2] = false;
});
Events.run(Trigger.update, check = () -> {
if(previewLoaded[0]) Reflect.set(Vars.state.rules, header, true);
if(previewLoaded[1]) Reflect.set(Vars.state.rules, worldLoader, false);
if(previewLoaded[0]) Reflect.set(sup.get(), header, true);
if(previewLoaded[1]) Reflect.set(sup.get(), worldLoader, false);
if(previewLoaded[2]) Reflect.set(sup.get(), worldUnloader, true);
});
Runnable inst = check;
Events.run(Trigger.update, () -> check = inst);
}catch(Exception e){
e.printStackTrace();
}

2
core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
View File

@@ -202,7 +202,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
if(Mathf.dst2(t.x, t.y, x2, y2) <= avoid * avoid){
return;
}
for(int x = -rad; x <= rad; x++){
for(int y = -rad; y <= rad; y++){
int wx = t.x + x, wy = t.y + y;

2
core/src/mindustry/mod/ClassMap.java
View File

@@ -5,7 +5,7 @@ import arc.struct.*;
@SuppressWarnings("deprecation")
public class ClassMap{
public static final ObjectMap<String, Class<?>> classes = new ObjectMap<>();
static{
classes.put("AssemblerAI", mindustry.ai.types.AssemblerAI.class);
classes.put("BoostAI", mindustry.ai.types.BoostAI.class);

4
core/src/mindustry/type/UnitType.java
View File

@@ -841,7 +841,7 @@ public class UnitType extends UnlockableContent{
//only do this after everything else was initialized
sample = constructor.get();
}
public float estimateDps(){
//calculate estimated DPS for one target based on weapons
if(dpsEstimate < 0){
@@ -853,7 +853,7 @@ public class UnitType extends UnlockableContent{
dpsEstimate /= 25f;
}
}
return dpsEstimate;
}

2
core/src/mindustry/type/Weapon.java
View File

@@ -282,7 +282,7 @@ public class Weapon implements Cloneable{
}
mount.smoothReload = Mathf.lerpDelta(mount.smoothReload, mount.reload / reload, smoothReloadSpeed);
mount.charge = mount.charging && shoot.firstShotDelay > 0 ? Mathf.approachDelta(mount.charge, 1, 1 / shoot.firstShotDelay) : 0;
float warmupTarget = (can && mount.shoot) || (continuous && mount.bullet != null) || mount.charging ? 1f : 0f;
if(linearWarmup){
mount.warmup = Mathf.approachDelta(mount.warmup, warmupTarget, shootWarmupSpeed);

2
core/src/mindustry/ui/dialogs/ModsDialog.java
View File

@@ -1,7 +1,6 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.util.Http.*;
import arc.files.*;
import arc.func.*;
import arc.graphics.*;
@@ -14,6 +13,7 @@ import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import arc.util.Http.*;
import arc.util.io.*;
import arc.util.serialization.*;
import arc.util.serialization.Jval.*;

6
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -259,7 +259,7 @@ public class SettingsMenuDialog extends BaseDialog{
public void addCategory(String name, Cons<SettingsTable> builder){
addCategory(name, (Drawable)null, builder);
}
public Seq<SettingsCategory> getCategories(){
return categories;
}
@@ -343,7 +343,7 @@ public class SettingsMenuDialog extends BaseDialog{
game.checkPref("doubletapmine", false);
game.checkPref("commandmodehold", true);
if(!ios){
game.checkPref("modcrashdisable", true);
}
@@ -776,7 +776,7 @@ public class SettingsMenuDialog extends BaseDialog{
table.row();
}
}
public static class TextSetting extends Setting{
String def;
Cons<String> changed;

2
core/src/mindustry/ui/fragments/ChatFragment.java
View File

@@ -283,7 +283,7 @@ public class ChatFragment extends Table{
fadetime += 1f;
fadetime = Math.min(fadetime, messagesShown) + 1f;
if(scrollPos > 0) scrollPos++;
}

2
core/src/mindustry/world/Block.java
View File

@@ -18,6 +18,7 @@ import mindustry.content.*;
import mindustry.core.*;
import mindustry.ctype.*;
import mindustry.entities.*;
import mindustry.entities.bullet.*;
import mindustry.entities.units.*;
import mindustry.game.*;
import mindustry.gen.*;
@@ -30,7 +31,6 @@ import mindustry.world.blocks.*;
import mindustry.world.blocks.environment.*;
import mindustry.world.blocks.power.*;
import mindustry.world.consumers.*;
import mindustry.entities.bullet.*;
import mindustry.world.meta.*;
import java.lang.reflect.*;

2
core/src/mindustry/world/Tile.java
View File

@@ -11,8 +11,8 @@ import arc.struct.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.game.*;
import mindustry.game.EventType.*;
import mindustry.game.*;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.ui.*;

2
core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java
View File

@@ -19,7 +19,7 @@ import static mindustry.Vars.*;
public class TractorBeamTurret extends BaseTurret{
public final int timerTarget = timers++;
public float retargetTime = 5f;
public float shootCone = 6f;
public float shootLength = 5f;
public float laserWidth = 0.6f;

2
core/src/mindustry/world/blocks/liquid/Conduit.java
View File

@@ -28,7 +28,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
static final float[][] rotateOffsets = {{hpad, hpad}, {-hpad, hpad}, {-hpad, -hpad}, {hpad, -hpad}};
public final int timerFlow = timers++;
public Color botColor = Color.valueOf("565656");
public @Load(value = "@-top-#", length = 5) TextureRegion[] topRegions;

1
core/src/mindustry/world/blocks/payloads/BlockProducer.java
View File

@@ -5,7 +5,6 @@ import arc.math.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.entities.units.*;
import mindustry.gen.*;
import mindustry.graphics.*;

2
core/src/mindustry/world/blocks/payloads/PayloadSource.java
View File

@@ -84,7 +84,7 @@ public class PayloadSource extends PayloadBlock{
public boolean canProduce(UnitType t){
return !t.isHidden() && !t.isBanned() && t.supportsEnv(state.rules.env);
}
public class PayloadSourceBuild extends PayloadBlockBuild<Payload>{
public UnitType unit;
public Block block;

2
core/src/mindustry/world/blocks/power/ImpactReactor.java
View File

@@ -103,7 +103,7 @@ public class ImpactReactor extends PowerGenerator{
public float ambientVolume(){
return warmup;
}
@Override
public double sense(LAccess sensor){
if(sensor == LAccess.heat) return warmup;

2
core/src/mindustry/world/blocks/production/AttributeCrafter.java
View File

@@ -69,7 +69,7 @@ public class AttributeCrafter extends GenericCrafter{
public float efficiencyMultiplier(){
return baseEfficiency + Math.min(maxBoost, boostScale * attrsum) + attribute.env();
}
@Override
public float efficiencyScale(){
return scaleLiquidConsumption ? efficiencyMultiplier() : super.efficiencyScale();

1
core/src/mindustry/world/blocks/production/BurstDrill.java
View File

@@ -4,7 +4,6 @@ import arc.audio.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.struct.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;

2
core/src/mindustry/world/blocks/units/RepairTower.java
View File

@@ -110,7 +110,7 @@ public class RepairTower extends Block{
public float warmup(){
return warmup;
}
@Override
public void drawSelect(){
Drawf.dashCircle(x, y, range, Pal.placing);

2
core/src/mindustry/world/blocks/units/RepairTurret.java
View File

@@ -220,7 +220,7 @@ public class RepairTurret extends Block{
@Override
public void write(Writes write){
super.write(write);
write.f(rotation);
}

2
core/src/mindustry/world/draw/DrawFlame.java
View File

@@ -36,7 +36,7 @@ public class DrawFlame extends DrawBlock{
float cr = Mathf.random(0.1f);
Draw.z(Layer.block + 0.01f);
Draw.alpha(build.warmup());
Draw.rect(top, build.x, build.y);