diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index bf3a575433..3d969fb344 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -375,10 +375,9 @@ public class Bullets implements ContentList{ }}; //this is just a copy of the damage lightning bullet that doesn't damage air units - damageLightningGround = new BulletType(0.0001f, 0f){{ - collidesAir = false; - }}; + damageLightningGround = new BulletType(0.0001f, 0f){}; JsonIO.copy(damageLightning, damageLightningGround); + damageLightningGround.collidesAir = false; healBullet = new HealBulletType(5.2f, 13){{ healPercent = 3f; diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index d2086f5d56..97d54ece50 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -138,12 +138,13 @@ public class Fx{ stroke(3f * e.fout()); color(e.color, Color.white, e.fin()); - beginLine(); - lines.each(Lines::linePoint); - linePoint(e.x, e.y); - endLine(); + for(int i = 0; i < lines.size - 1; i++){ + Vec2 cur = lines.get(i); + Vec2 next = lines.get(i + 1); + + Lines.line(cur.x, cur.y, next.x, next.y, false); + } - int i = 0; for(Vec2 p : lines){ Fill.circle(p.x, p.y, Lines.getStroke() / 2f); } diff --git a/core/src/mindustry/world/blocks/Autotiler.java b/core/src/mindustry/world/blocks/Autotiler.java index 35b58706e1..4e8748db2a 100644 --- a/core/src/mindustry/world/blocks/Autotiler.java +++ b/core/src/mindustry/world/blocks/Autotiler.java @@ -26,7 +26,7 @@ public interface Autotiler{ * The mode to slice a texture at. */ enum SliceMode{ - noSlice, + none, bottom, top } @@ -39,7 +39,7 @@ public interface Autotiler{ * @return The sliced texture */ default TextureRegion sliced(TextureRegion input, SliceMode mode){ - return mode == SliceMode.noSlice ? input : mode == SliceMode.bottom ? botHalf(input) : topHalf(input); + return mode == SliceMode.none ? input : mode == SliceMode.bottom ? botHalf(input) : topHalf(input); } /** diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index 8b961f1961..8824d44d34 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -95,7 +95,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ Draw.z(Layer.block); Draw.scl(xscl, yscl); - drawAt(x, y, blendbits, rotation, SliceMode.noSlice); + drawAt(x, y, blendbits, rotation, SliceMode.none); Draw.reset(); } diff --git a/settings.gradle b/settings.gradle index a8dfd17399..52b0980311 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,7 @@ +if(JavaVersion.current().ordinal() < JavaVersion.VERSION_14.ordinal()){ + throw new GradleException("!!! YOU MUST USE JAVA 14 OR ABOVE TO COMPILE AND RUN MINDUSTRY !!! Read the README. Your version: ${System.properties["java.version"]}") +} + include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests' def use = { ... names ->