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

Autogeneration of some IO code

Browse Source
This commit is contained in:
Anuken
2020-02-13 13:30:30 -05:00
parent 47f075133f
commit ad248e2e20
40 changed files with 163 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/mindustry/content/UnitTypes.java
View File

@@ -6,22 +6,22 @@ import mindustry.gen.*;
import mindustry.type.*;
public class UnitTypes implements ContentList{
public static UnitDef
public static UnitType
draug, spirit, phantom,
wraith, ghoul, revenant, lich, reaper,
crawler, titan, fortress, eruptor, chaosArray, eradicator;
public static @EntityDef({Unitc.class, Legsc.class}) UnitDef dagger;
public static @EntityDef({Unitc.class, WaterMovec.class}) UnitDef vanguard;
public static @EntityDef({Unitc.class, Legsc.class}) UnitType dagger;
public static @EntityDef({Unitc.class, WaterMovec.class}) UnitType vanguard;
public static UnitDef alpha, delta, tau, omega, dart, javelin, trident, glaive;
public static UnitDef starter;
public static UnitType alpha, delta, tau, omega, dart, javelin, trident, glaive;
public static UnitType starter;
@Override
public void load(){
dagger = new UnitDef("dagger"){{
dagger = new UnitType("dagger"){{
speed = 1f;
drag = 0.3f;
hitsize = 8f;
@@ -36,7 +36,7 @@ public class UnitTypes implements ContentList{
}});
}};
vanguard = new UnitDef("vanguard"){{
vanguard = new UnitType("vanguard"){{
speed = 1.3f;
drag = 0.1f;
hitsize = 8f;

2
core/src/mindustry/core/ContentLoader.java
View File

@@ -261,7 +261,7 @@ public class ContentLoader{
return getBy(ContentType.zone);
}
public Array<UnitDef> units(){
public Array<UnitType> units(){
return getBy(ContentType.unit);
}
}

6
core/src/mindustry/editor/WaveInfoDialog.java
View File

@@ -30,7 +30,7 @@ public class WaveInfoDialog extends FloatingDialog{
private Table table, preview;
private int start = 0;
private UnitDef lastType = UnitTypes.dagger;
private UnitType lastType = UnitTypes.dagger;
private float updateTimer, updatePeriod = 1f;
public WaveInfoDialog(MapEditor editor){
@@ -221,7 +221,7 @@ public class WaveInfoDialog extends FloatingDialog{
dialog.setFillParent(true);
dialog.cont.pane(p -> {
int i = 0;
for(UnitDef type : content.units()){
for(UnitType type : content.units()){
p.addButton(t -> {
t.left();
t.addImage(type.icon(mindustry.ui.Cicon.medium)).size(40f).padRight(2f);
@@ -256,7 +256,7 @@ public class WaveInfoDialog extends FloatingDialog{
for(int j = 0; j < spawned.length; j++){
if(spawned[j] > 0){
UnitDef type = content.getByID(ContentType.unit, j);
UnitType type = content.getByID(ContentType.unit, j);
table.addImage(type.icon(Cicon.medium)).size(8f * 4f).padRight(4);
table.add(spawned[j] + "x").color(Color.lightGray).padRight(6);
table.row();

4
core/src/mindustry/entities/def/BoundedComp.java
View File

@@ -11,8 +11,8 @@ import static mindustry.Vars.*;
abstract class BoundedComp implements Velc, Posc, Healthc, Flyingc{
static final float warpDst = 180f;
transient float x, y;
transient Vec2 vel;
@Import float x, y;
@Import Vec2 vel;
@Override
public void update(){

7
core/src/mindustry/entities/def/BuilderComp.java
View File

@@ -4,10 +4,9 @@ import arc.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.struct.Queue;
import arc.util.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
@@ -27,10 +26,10 @@ import static mindustry.Vars.*;
abstract class BuilderComp implements Unitc{
static final Vec2[] tmptr = new Vec2[]{new Vec2(), new Vec2(), new Vec2(), new Vec2()};
transient float x, y, rotation;
@Import float x, y, rotation;
Queue<BuildRequest> requests = new Queue<>();
float buildSpeed = 1f;
transient float buildSpeed = 1f;
//boolean building;
void updateBuilding(){

2
core/src/mindustry/entities/def/ChildComp.java
View File

@@ -6,7 +6,7 @@ import mindustry.gen.*;
@Component
abstract class ChildComp implements Posc{
transient float x, y;
@Import float x, y;
@Nullable Posc parent;
float offsetX, offsetY;

2
core/src/mindustry/entities/def/DecalComp.java
View File

@@ -9,7 +9,7 @@ import mindustry.gen.*;
@EntityDef(value = {Decalc.class}, pooled = true)
@Component
abstract class DecalComp implements Drawc, Timedc, Rotc, Posc, DrawLayerFloorc{
transient float x, y, rotation;
@Import float x, y, rotation;
Color color = new Color(1, 1, 1, 1);
TextureRegion region;

2
core/src/mindustry/entities/def/ElevationMoveComp.java
View File

@@ -7,7 +7,7 @@ import static mindustry.Vars.collisions;
@Component
abstract class ElevationMoveComp implements Velc, Posc, Flyingc, Hitboxc{
transient float x, y;
@Import float x, y;
@Replace
@Override

7
core/src/mindustry/entities/def/EntityComp.java
View File

@@ -12,8 +12,8 @@ import static mindustry.Vars.player;
@Component
@BaseComponent
abstract class EntityComp{
private boolean added;
int id = EntityGroup.nextId();
private transient boolean added;
transient int id = EntityGroup.nextId();
boolean isAdded(){
return added;
@@ -49,6 +49,9 @@ abstract class EntityComp{
@InternalImpl
abstract int classId();
@InternalImpl
abstract boolean serialize();
void read(DataInput input) throws IOException{
//TODO dynamic io
}

2
core/src/mindustry/entities/def/FireComp.java
View File

@@ -18,7 +18,7 @@ import static mindustry.Vars.*;
abstract class FireComp implements Timedc, Posc, Firec{
private static final float spreadChance = 0.05f, fireballChance = 0.07f;
transient float time, lifetime, x, y;
@Import float time, lifetime, x, y;
Tile tile;
private Block block;

6
core/src/mindustry/entities/def/FlyingComp.java
View File

@@ -12,12 +12,12 @@ import static mindustry.Vars.net;
@Component
abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
transient float x, y;
transient Vec2 vel;
@Import float x, y;
@Import Vec2 vel;
float elevation;
float drownTime;
float splashTimer;
transient float splashTimer;
boolean isGrounded(){
return elevation < 0.001f;

3
core/src/mindustry/entities/def/HealthComp.java
View File

@@ -9,7 +9,8 @@ import mindustry.gen.*;
abstract class HealthComp implements Entityc{
static final float hitDuration = 9f;
float health, maxHealth = 1f, hitTime;
transient float hitTime;
float health, maxHealth = 1f;
boolean dead;
boolean isValid(){

2
core/src/mindustry/entities/def/HitboxComp.java
View File

@@ -7,7 +7,7 @@ import mindustry.gen.*;
@Component
abstract class HitboxComp implements Posc, QuadTreeObject{
transient float x, y;
@Import float x, y;
float hitSize;
float lastX, lastY;

2
core/src/mindustry/entities/def/ItemsComp.java
View File

@@ -8,7 +8,7 @@ import mindustry.type.*;
@Component
abstract class ItemsComp implements Posc{
@ReadOnly ItemStack stack = new ItemStack();
float itemTime;
transient float itemTime;
abstract int itemCapacity();

5
core/src/mindustry/entities/def/LegsComp.java
View File

@@ -7,9 +7,10 @@ import mindustry.gen.*;
@Component
abstract class LegsComp implements Posc, Flyingc, Hitboxc, DrawLayerGroundUnderc, Unitc, Legsc, ElevationMovec{
transient float x, y;
@Import float x, y;
float baseRotation, walkTime;
float baseRotation;
transient float walkTime;
@Override
public void update(){

4
core/src/mindustry/entities/def/MinerComp.java
View File

@@ -18,9 +18,9 @@ import static mindustry.Vars.*;
@Component
abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc{
transient float x, y, rotation;
@Import float x, y, rotation;
float mineTimer;
transient float mineTimer;
@Nullable Tile mineTile;
abstract boolean canMine(Item item);

6
core/src/mindustry/entities/def/PlayerComp.java
View File

@@ -23,8 +23,7 @@ import static mindustry.Vars.*;
@EntityDef({Playerc.class})
@Component
abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc{
@NonNull
@ReadOnly Unitc unit = Nulls.unit;
@NonNull @ReadOnly Unitc unit = Nulls.unit;
@ReadOnly Team team = Team.sharded;
String name = "noname";
@@ -33,7 +32,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc{
Color color = new Color();
float mouseX, mouseY;
@Nullable String lastText;
String lastText = "";
float textFadeTime;
public boolean isBuilder(){
@@ -51,7 +50,6 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc{
public void reset(){
team = state.rules.defaultTeam;
admin = typing = false;
lastText = null;
textFadeTime = 0f;
if(!dead()){
unit.controller(unit.type().createController());

2
core/src/mindustry/entities/def/PuddleComp.java
View File

@@ -25,7 +25,7 @@ abstract class PuddleComp implements Posc, DrawLayerFloorOverc{
private static final Rect rect2 = new Rect();
private static int seeds;
transient float x, y;
@Import float x, y;
float amount, lastRipple, accepting, updateTime;
int generation;

2
core/src/mindustry/entities/def/SyncComp.java
View File

@@ -7,7 +7,7 @@ import mindustry.net.*;
@Component
abstract class SyncComp implements Posc{
transient float x, y;
@Import float x, y;
Interpolator interpolator = new Interpolator();

2
core/src/mindustry/entities/def/TeamComp.java
View File

@@ -9,7 +9,7 @@ import static mindustry.Vars.state;
@Component
abstract class TeamComp implements Posc{
transient float x, y;
@Import float x, y;
Team team = Team.sharded;

10
core/src/mindustry/entities/def/UnitComp.java
View File

@@ -20,10 +20,10 @@ import static mindustry.Vars.*;
@Component
abstract class UnitComp implements Healthc, Velc, Statusc, Teamc, Itemsc, Hitboxc, Rotc, Massc, Unitc, Weaponsc, Drawc, Boundedc,
DrawLayerGroundc, DrawLayerFlyingc, DrawLayerGroundShadowsc, DrawLayerFlyingShadowsc{
transient float x, y, rotation;
@Import float x, y, rotation;
private UnitController controller;
private UnitDef type;
private UnitType type;
@Override
public float clipSize(){
@@ -52,7 +52,7 @@ abstract class UnitComp implements Healthc, Velc, Statusc, Teamc, Itemsc, Hitbox
}
@Override
public void set(UnitDef def, UnitController controller){
public void set(UnitType def, UnitController controller){
type(type);
controller(controller);
}
@@ -75,7 +75,7 @@ abstract class UnitComp implements Healthc, Velc, Statusc, Teamc, Itemsc, Hitbox
}
@Override
public void type(UnitDef type){
public void type(UnitType type){
this.type = type;
maxHealth(type.health);
heal();
@@ -86,7 +86,7 @@ abstract class UnitComp implements Healthc, Velc, Statusc, Teamc, Itemsc, Hitbox
}
@Override
public UnitDef type(){
public UnitType type(){
return type;
}

2
core/src/mindustry/entities/def/VelComp.java
View File

@@ -7,7 +7,7 @@ import mindustry.gen.*;
@Component
abstract class VelComp implements Posc{
transient float x, y;
@Import float x, y;
final Vec2 vel = new Vec2();
float drag = 0f;

2
core/src/mindustry/entities/def/WaterMoveComp.java
View File

@@ -11,7 +11,7 @@ import static mindustry.Vars.collisions;
//just a proof of concept
@Component
abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc{
transient float x, y;
@Import float x, y;
@Replace
@Override

4
core/src/mindustry/entities/def/WeaponsComp.java
View File

@@ -12,7 +12,7 @@ import mindustry.type.*;
@Component
abstract class WeaponsComp implements Teamc, Posc, Rotc{
transient float x, y, rotation;
@Import float x, y, rotation;
/** minimum cursor distance from player, fixes 'cross-eyed' shooting */
static final float minAimDst = 20f;
@@ -22,7 +22,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
/** weapon mount array, never null */
@ReadOnly WeaponMount[] mounts = {};
void setupWeapons(UnitDef def){
void setupWeapons(UnitType def){
mounts = new WeaponMount[def.weapons.size];
for(int i = 0; i < mounts.length; i++){
mounts[i] = new WeaponMount(def.weapons.get(i));

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

@@ -5,7 +5,6 @@ import mindustry.core.GameState.*;
import mindustry.ctype.*;
import mindustry.gen.*;
import mindustry.entities.units.*;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.world.*;
@@ -328,9 +327,9 @@ public class EventType{
//TODO rename
public static class MechChangeEvent{
public final Playerc player;
public final UnitDef mech;
public final UnitType mech;
public MechChangeEvent(Playerc player, UnitDef mech){
public MechChangeEvent(Playerc player, UnitType mech){
this.player = player;
this.mech = mech;
}

4
core/src/mindustry/game/SpawnGroup.java
View File

@@ -19,7 +19,7 @@ public class SpawnGroup implements Serializable{
public static final int never = Integer.MAX_VALUE;
/** The unit type spawned */
public UnitDef type;
public UnitType type;
/** When this spawn should end */
public int end = never;
/** When this spawn should start */
@@ -37,7 +37,7 @@ public class SpawnGroup implements Serializable{
/** Items this unit spawns with. Null to disable. */
public ItemStack items;
public SpawnGroup(UnitDef type){
public SpawnGroup(UnitType type){
this.type = type;
}

2
core/src/mindustry/graphics/MenuRenderer.java
View File

@@ -30,7 +30,7 @@ public class MenuRenderer implements Disposable{
private float time = 0f;
private float flyerRot = 45f;
private int flyers = Mathf.chance(0.2) ? Mathf.random(35) : Mathf.random(15);
private UnitDef flyerType = Structs.select(UnitTypes.wraith, UnitTypes.wraith, UnitTypes.ghoul, UnitTypes.phantom, UnitTypes.phantom, UnitTypes.revenant);
private UnitType flyerType = Structs.select(UnitTypes.wraith, UnitTypes.wraith, UnitTypes.ghoul, UnitTypes.phantom, UnitTypes.phantom, UnitTypes.revenant);
public MenuRenderer(){
Time.mark();

2
core/src/mindustry/io/SaveVersion.java
View File

@@ -224,6 +224,8 @@ public abstract class SaveVersion extends SaveFileReader{
stream.writeInt(Groups.sync.size());
for(Syncc entity : Groups.sync){
if(!entity.serialize()) continue;
writeChunk(stream, true, out -> {
out.writeByte(entity.classId());
entity.write(out);

8
core/src/mindustry/io/TypeIO.java
View File

@@ -155,13 +155,13 @@ public class TypeIO{
return AdminAction.values()[buffer.get()];
}
@WriteClass(UnitDef.class)
public static void writeUnitDef(ByteBuffer buffer, UnitDef effect){
@WriteClass(UnitType.class)
public static void writeUnitDef(ByteBuffer buffer, UnitType effect){
buffer.putShort(effect.id);
}
@ReadClass(UnitDef.class)
public static UnitDef readUnitDef(ByteBuffer buffer){
@ReadClass(UnitType.class)
public static UnitType readUnitDef(ByteBuffer buffer){
return content.getByID(ContentType.unit, buffer.getShort());
}

6
core/src/mindustry/mod/ContentParser.java
View File

@@ -274,14 +274,14 @@ public class ContentParser{
return block;
},
ContentType.unit, (TypeParser<UnitDef>)(mod, name, value) -> {
ContentType.unit, (TypeParser<UnitType>)(mod, name, value) -> {
readBundle(ContentType.unit, name, value);
//TODO fix
UnitDef unit;
UnitType unit;
if(locate(ContentType.unit, name) == null){
Class<Unitc> type = resolve(legacyUnitMap.get(Strings.capitalize(getType(value)), getType(value)), "mindustry.entities.type.base");
unit = new UnitDef(mod + "-" + name);
unit = new UnitType(mod + "-" + name);
}else{
unit = locate(ContentType.unit, name);
}

5
core/src/mindustry/type/UnitDef.java → core/src/mindustry/type/UnitType.java
View File

@@ -21,8 +21,7 @@ import mindustry.world.blocks.*;
import static mindustry.Vars.*;
//TODO change to UnitType or Shell or something
public class UnitDef extends UnlockableContent{
public class UnitType extends UnlockableContent{
static final float shadowTX = -12, shadowTY = -13, shadowColor = Color.toFloatBits(0, 0, 0, 0.22f);
public @NonNull Prov<? extends UnitController> defaultController = AIController::new;
@@ -53,7 +52,7 @@ public class UnitDef extends UnlockableContent{
public Array<Weapon> weapons = new Array<>();
public TextureRegion baseRegion, legRegion, region, cellRegion, occlusionRegion;
public UnitDef(String name){
public UnitType(String name){
super(name);
if(EntityMapping.map(name) != null){

2
core/src/mindustry/ui/ContentDisplay.java
View File

@@ -131,7 +131,7 @@ public class ContentDisplay{
table.row();
}
public static void displayUnit(Table table, UnitDef unit){
public static void displayUnit(Table table, UnitType unit){
table.table(title -> {
title.addImage(unit.icon(Cicon.xlarge)).size(8 * 6);
title.add("[accent]" + unit.localizedName).padLeft(5);

2
core/src/mindustry/world/blocks/RespawnBlock.java
View File

@@ -12,7 +12,7 @@ import static mindustry.Vars.net;
public class RespawnBlock{
public static void drawRespawn(Tile tile, float heat, float progress, float time, Playerc player, UnitDef to){
public static void drawRespawn(Tile tile, float heat, float progress, float time, Playerc player, UnitType to){
progress = Mathf.clamp(progress);
Draw.color(Pal.darkMetal);

2
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -20,7 +20,7 @@ import mindustry.world.modules.*;
import static mindustry.Vars.*;
public class CoreBlock extends StorageBlock{
public UnitDef mech = UnitTypes.starter;
public UnitType mech = UnitTypes.starter;
public CoreBlock(String name){
super(name);

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

@@ -20,7 +20,7 @@ import static mindustry.Vars.*;
//TODO remove
public class MechPad extends Block{
public @NonNull UnitDef mech;
public @NonNull UnitType mech;
public float buildTime = 60 * 5;
public MechPad(String name){

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

@@ -22,7 +22,7 @@ import java.io.*;
import static mindustry.Vars.net;
public class UnitFactory extends Block{
public UnitDef unitType;
public UnitType unitType;
public float produceTime = 1000f;
public float launchVelocity = 0f;
public TextureRegion topRegion;