Cleanup
This commit is contained in:
@@ -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
|
//this is just a copy of the damage lightning bullet that doesn't damage air units
|
||||||
damageLightningGround = new BulletType(0.0001f, 0f){{
|
damageLightningGround = new BulletType(0.0001f, 0f){};
|
||||||
collidesAir = false;
|
|
||||||
}};
|
|
||||||
JsonIO.copy(damageLightning, damageLightningGround);
|
JsonIO.copy(damageLightning, damageLightningGround);
|
||||||
|
damageLightningGround.collidesAir = false;
|
||||||
|
|
||||||
healBullet = new HealBulletType(5.2f, 13){{
|
healBullet = new HealBulletType(5.2f, 13){{
|
||||||
healPercent = 3f;
|
healPercent = 3f;
|
||||||
|
|||||||
@@ -138,12 +138,13 @@ public class Fx{
|
|||||||
stroke(3f * e.fout());
|
stroke(3f * e.fout());
|
||||||
color(e.color, Color.white, e.fin());
|
color(e.color, Color.white, e.fin());
|
||||||
|
|
||||||
beginLine();
|
for(int i = 0; i < lines.size - 1; i++){
|
||||||
lines.each(Lines::linePoint);
|
Vec2 cur = lines.get(i);
|
||||||
linePoint(e.x, e.y);
|
Vec2 next = lines.get(i + 1);
|
||||||
endLine();
|
|
||||||
|
Lines.line(cur.x, cur.y, next.x, next.y, false);
|
||||||
|
}
|
||||||
|
|
||||||
int i = 0;
|
|
||||||
for(Vec2 p : lines){
|
for(Vec2 p : lines){
|
||||||
Fill.circle(p.x, p.y, Lines.getStroke() / 2f);
|
Fill.circle(p.x, p.y, Lines.getStroke() / 2f);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public interface Autotiler{
|
|||||||
* The mode to slice a texture at.
|
* The mode to slice a texture at.
|
||||||
*/
|
*/
|
||||||
enum SliceMode{
|
enum SliceMode{
|
||||||
noSlice,
|
none,
|
||||||
bottom,
|
bottom,
|
||||||
top
|
top
|
||||||
}
|
}
|
||||||
@@ -39,7 +39,7 @@ public interface Autotiler{
|
|||||||
* @return The sliced texture
|
* @return The sliced texture
|
||||||
*/
|
*/
|
||||||
default TextureRegion sliced(TextureRegion input, SliceMode mode){
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
|
|||||||
Draw.z(Layer.block);
|
Draw.z(Layer.block);
|
||||||
|
|
||||||
Draw.scl(xscl, yscl);
|
Draw.scl(xscl, yscl);
|
||||||
drawAt(x, y, blendbits, rotation, SliceMode.noSlice);
|
drawAt(x, y, blendbits, rotation, SliceMode.none);
|
||||||
Draw.reset();
|
Draw.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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'
|
include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests'
|
||||||
|
|
||||||
def use = { ... names ->
|
def use = { ... names ->
|
||||||
|
|||||||
Reference in New Issue
Block a user