diff --git a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java index 8138fe398f..d2e3e99c17 100644 --- a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java @@ -103,11 +103,11 @@ public class LoadRegionProcessor extends BaseProcessor{ private String parse(String value){ value = '"' + value + '"'; + value = value.replace("@size", "\" + ((mindustry.world.Block)content).size + \""); value = value.replace("@", "\" + content.name + \""); value = value.replace("#1", "\" + INDEX0 + \""); value = value.replace("#2", "\" + INDEX1 + \""); value = value.replace("#", "\" + INDEX0 + \""); - value = value.replace("$size", "\" + ((mindustry.world.Block)content).size + \""); return value; } diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index 56ca0e769c..0e77aa0352 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 4b8dc4827e..d7909175a3 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java index 51df62d6fe..a3fffe06f3 100644 --- a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java +++ b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java @@ -21,7 +21,7 @@ public class PointDefenseTurret extends Block{ public final int timerTarget = timers++; public float retargetTime = 5f; - public @Load("block-$size") TextureRegion baseRegion; + public @Load("block-@size") TextureRegion baseRegion; public Color color = Color.white; public Effect beamEffect = Fx.pointBeam; diff --git a/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java index 5bffb5c032..46dfa695ae 100644 --- a/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java @@ -19,7 +19,7 @@ public class TractorBeamTurret extends Block{ public final int timerTarget = timers++; public float retargetTime = 5f; - public @Load("block-$size") TextureRegion baseRegion; + public @Load("block-@size") TextureRegion baseRegion; public @Load("@-laser") TextureRegion laser; public @Load("@-laser-end") TextureRegion laserEnd; diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index a14b2bc2f9..101e0aa402 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -67,7 +67,7 @@ public abstract class Turret extends Block{ protected Vec2 tr = new Vec2(); protected Vec2 tr2 = new Vec2(); - public @Load("block-$size") TextureRegion baseRegion; + public @Load("block-@size") TextureRegion baseRegion; public @Load("@-heat") TextureRegion heatRegion; public Cons drawer = tile -> Draw.rect(region, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90); diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index fbbb5a7173..a92a8036c3 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -16,9 +16,9 @@ import static mindustry.Vars.tilesize; public class PayloadAcceptor extends Block{ public float payloadSpeed = 0.5f; - public @Load(value = "@-top", fallback = "factory-top-$size") TextureRegion topRegion; - public @Load(value = "@-out", fallback = "factory-out-$size") TextureRegion outRegion; - public @Load(value = "@-in", fallback = "factory-in-$size") TextureRegion inRegion; + public @Load(value = "@-top", fallback = "factory-top-@size") TextureRegion topRegion; + public @Load(value = "@-out", fallback = "factory-out-@size") TextureRegion outRegion; + public @Load(value = "@-in", fallback = "factory-in-@size") TextureRegion inRegion; public PayloadAcceptor(String name){ super(name); diff --git a/gradle.properties b/gradle.properties index 724f6952bb..232aabf151 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=d7733125246ba0ecee206fa6baa7513c8c0bfbf4 +archash=67c4b5cb3c52f5267bbcb4ecfe7134676664c3c2