diff --git a/src/main/java/com/minelittlepony/pony/ITriggerPixelMapped.java b/src/main/java/com/minelittlepony/pony/ITriggerPixelMapped.java index 8249dce9..b15811a6 100644 --- a/src/main/java/com/minelittlepony/pony/ITriggerPixelMapped.java +++ b/src/main/java/com/minelittlepony/pony/ITriggerPixelMapped.java @@ -22,8 +22,11 @@ public interface ITriggerPixelMapped & ITriggerPixelMapped> @SuppressWarnings("unchecked") static & ITriggerPixelMapped> T getByTriggerPixel(T type, int pixelValue) { for (T i : (T[])type.getClass().getEnumConstants()) { - if (i.getTriggerPixel() == pixelValue) return i; + if (i.getTriggerPixel() == pixelValue) { + return i; + } } + return type; } } diff --git a/src/main/java/com/minelittlepony/pony/meta/Race.java b/src/main/java/com/minelittlepony/pony/meta/Race.java index f8ee6271..63db0ddf 100644 --- a/src/main/java/com/minelittlepony/pony/meta/Race.java +++ b/src/main/java/com/minelittlepony/pony/meta/Race.java @@ -8,18 +8,18 @@ import javax.annotation.Nonnull; public enum Race implements ITriggerPixelMapped { - HUMAN(0, false, false), - EARTH(0xf9b131, false, false), - PEGASUS(0x88caf0, true, false), - UNICORN(0xd19fe4, false, true), - ALICORN(0xfef9fc, true, true), - CHANGELING(0x282b29, true, true), - ZEBRA(0xd0cccf, false, false), - REFORMED_CHANGELING(0xcaed5a, CHANGELING), - GRIFFIN(0xae9145, PEGASUS), - HIPPOGRIFF(0xd6ddac, PEGASUS), - BATPONY(0xeeeeee, true, false), - SEAPONY(0x3655dd, false, true); + HUMAN (0x000000, false, false), + EARTH (0x31b1f9, false, false), + PEGASUS (0xf0ca88, true, false), + UNICORN (0xe49fd1, false, true), + ALICORN (0xfcf9fe, true, true), + CHANGELING (0x292b28, true, true), + ZEBRA (0xcfccd0, false, false), + CHANGEDLING (0x5aedca, CHANGELING), + GRIFFIN (0x4591ae, PEGASUS), + HIPPOGRIFF (0xacddd6, PEGASUS), + BATPONY (0xeeeeee, true, false), + SEAPONY (0xdd5536, false, true); private boolean wings; private boolean horn; diff --git a/src/main/java/com/minelittlepony/pony/meta/Size.java b/src/main/java/com/minelittlepony/pony/meta/Size.java index 6cad230f..66fb732e 100644 --- a/src/main/java/com/minelittlepony/pony/meta/Size.java +++ b/src/main/java/com/minelittlepony/pony/meta/Size.java @@ -5,12 +5,12 @@ import com.minelittlepony.pony.ITriggerPixelMapped; import com.minelittlepony.settings.PonySettings; public enum Size implements ITriggerPixelMapped { - TALL(0x534b76, 0.45f, 1.1F), - BULKY(0xce3254, 0.5f, 1), - LANKY(0x3254ce, 0.45F, 0.85F), - NORMAL(0, 0.4f, 0.8F), - YEARLING(0x53beff, 0.4F, 0.6F), - FOAL(0xffbe53, 0.25f, 0.6F); + TALL (0x764b53, 0.45f, 1.1F), + BULKY (0x5432ce, 0.5f, 1), + LANKY (0xce5432, 0.45F, 0.85F), + NORMAL (0x000000, 0.4f, 0.8F), + YEARLING(0xffbe53, 0.4F, 0.6F), + FOAL (0x53beff, 0.25f, 0.6F); private int triggerValue; diff --git a/src/main/java/com/minelittlepony/pony/meta/TailLength.java b/src/main/java/com/minelittlepony/pony/meta/TailLength.java index 49cbce2b..7f28247d 100644 --- a/src/main/java/com/minelittlepony/pony/meta/TailLength.java +++ b/src/main/java/com/minelittlepony/pony/meta/TailLength.java @@ -4,11 +4,11 @@ import com.minelittlepony.pony.ITriggerPixelMapped; public enum TailLength implements ITriggerPixelMapped { - STUB(0x425844), - QUARTER(0xd19fe4), - HALF(0x534b76), - THREE_QUARTERS(0x8a6b7f), - FULL(0); + STUB (0x445842), + QUARTER (0xe49fd1), + HALF (0x764b53), + THREE_QUARTERS (0x7f6b8a), + FULL (0x000000); private int triggerValue; diff --git a/src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java b/src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java index 027714b4..78f85f4e 100644 --- a/src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java +++ b/src/main/java/com/minelittlepony/pony/meta/TriggerPixels.java @@ -77,12 +77,12 @@ public enum TriggerPixels { } enum Channel { - RAW(-1, 0), - ALL (0xffffff, 0), - ALPHA(0xff, 24), - RED (0xff, 16), - GREEN(0xff, 8), - BLUE (0xff, 0); + RAW (0xFFFFFFFF, 0), + ALL (0x00FFFFFF, 0), + ALPHA(0x000000FF, 24), + RED (0x000000FF, 0), + GREEN(0x000000FF, 8), + BLUE (0x000000FF, 16); private int mask; private int offset; @@ -93,7 +93,8 @@ public enum TriggerPixels { } public int readValue(int x, int y, NativeImage image) { + /*getPixelABGR*/ return (image.getPixelRGBA(x, y) >> offset) & mask; } } -} \ No newline at end of file +} diff --git a/src/main/java/com/minelittlepony/pony/meta/Wearable.java b/src/main/java/com/minelittlepony/pony/meta/Wearable.java index b6cbaffe..6868ba82 100644 --- a/src/main/java/com/minelittlepony/pony/meta/Wearable.java +++ b/src/main/java/com/minelittlepony/pony/meta/Wearable.java @@ -6,12 +6,12 @@ import java.util.ArrayList; import java.util.List; public enum Wearable implements ITriggerPixelMapped { - NONE(0), - MUFFIN(50), - HAT(100), - ANTLERS(150), - SADDLE_BAGS(200), - STETSON(250); + NONE (0x00), + MUFFIN (0x32), + HAT (0x64), + ANTLERS (0x96), + SADDLE_BAGS (0xC8), + STETSON (0xFA); private int triggerValue;