From 2b04ebb14d8f4de81dc35f0f72a7a80fb1022313 Mon Sep 17 00:00:00 2001 From: LeoDog896 Date: Wed, 30 Sep 2020 09:46:33 -0400 Subject: [PATCH] Enum follows camelCase rules --- core/src/mindustry/world/blocks/Autotiler.java | 8 ++++---- .../src/mindustry/world/blocks/distribution/Conveyor.java | 2 +- core/src/mindustry/world/blocks/liquid/Conduit.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/world/blocks/Autotiler.java b/core/src/mindustry/world/blocks/Autotiler.java index fd90c7fdce..f717638b3d 100644 --- a/core/src/mindustry/world/blocks/Autotiler.java +++ b/core/src/mindustry/world/blocks/Autotiler.java @@ -26,9 +26,9 @@ public interface Autotiler{ * The mode to slice a texture at. */ enum SliceMode{ - NO_SLICE, - BOTTOM, - TOP + noSlice, + bottom, + top } /** @@ -39,7 +39,7 @@ public interface Autotiler{ * @return The sliced texture */ default TextureRegion sliced(TextureRegion input, SliceMode mode){ - return mode == SliceMode.NO_SLICE ? input : mode == SliceMode.BOTTOM ? botHalf(input) : topHalf(input); + return mode == SliceMode.noSlice ? input : mode == SliceMode.bottom ? botHalf(input) : topHalf(input); } /** diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 13ddc86414..351ab3b773 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -124,7 +124,7 @@ public class Conveyor extends Block implements Autotiler{ int dir = rotation - i; float rot = i == 0 ? rotation * 90 : (dir)*90; - Draw.rect(sliced(regions[0][frame], i != 0 ? SliceMode.BOTTOM : SliceMode.TOP), x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, rot); + Draw.rect(sliced(regions[0][frame], i != 0 ? SliceMode.bottom : SliceMode.top), x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, rot); } } diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index fdb3a277a1..1d9c5aa4bf 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -88,14 +88,14 @@ public class Conduit extends LiquidBlock implements Autotiler{ if((blending & (1 << i)) != 0){ int dir = r - i; float rot = i == 0 ? rotation : (dir)*90; - drawAt(x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, 0, rot, i != 0 ? SliceMode.BOTTOM : SliceMode.TOP); + drawAt(x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, 0, rot, i != 0 ? SliceMode.bottom : SliceMode.top); } } Draw.z(Layer.block); Draw.scl(xscl, yscl); - drawAt(x, y, blendbits, rotation, SliceMode.NO_SLICE); + drawAt(x, y, blendbits, rotation, SliceMode.noSlice); Draw.reset(); }