diff --git a/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java index e71355df2..d7a89dbfe 100644 --- a/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java +++ b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java @@ -90,7 +90,7 @@ public class SchemaBuilder { public JSONObject construct() { JSONObject schema = new JSONObject(); schema.put("$schema", "http://json-schema.org/draft-07/schema#"); - schema.put("$id", "http://volmit.com/iris-schema/" + root.getSimpleName().toLowerCase() + ".json"); + schema.put("$id", "https://volmit.com/iris-schema/" + root.getSimpleName().toLowerCase() + ".json"); JSONObject props = buildProperties(root); diff --git a/src/main/java/com/volmit/iris/util/format/C.java b/src/main/java/com/volmit/iris/util/format/C.java index a96653c25..8876bc922 100644 --- a/src/main/java/com/volmit/iris/util/format/C.java +++ b/src/main/java/com/volmit/iris/util/format/C.java @@ -721,7 +721,6 @@ public enum C { case GREEN -> (byte) 10; case LIGHT_PURPLE -> (byte) 13; case RED -> (byte) 12; - case WHITE -> (byte) 15; case YELLOW -> (byte) 14; default -> (byte) 15; }; @@ -730,7 +729,6 @@ public enum C { public byte getItemMeta() { return switch(this) { case AQUA, DARK_AQUA -> (byte) 9; - case BLACK -> (byte) 15; case BLUE -> (byte) 3; case BOLD, UNDERLINE, RESET, STRIKETHROUGH, MAGIC, ITALIC -> (byte) -1; case DARK_BLUE -> (byte) 11; diff --git a/src/main/java/com/volmit/iris/util/math/MathHelper.java b/src/main/java/com/volmit/iris/util/math/MathHelper.java index d7a78b46b..807786d03 100644 --- a/src/main/java/com/volmit/iris/util/math/MathHelper.java +++ b/src/main/java/com/volmit/iris/util/math/MathHelper.java @@ -116,7 +116,7 @@ public class MathHelper { if(var0 < var1) { return var1; } else { - return var0 > var2 ? var2 : var0; + return Math.min(var0, var2); } } @@ -124,7 +124,7 @@ public class MathHelper { if(var0 < var2) { return var2; } else { - return var0 > var4 ? var4 : var0; + return Math.min(var0, var4); } } @@ -132,7 +132,7 @@ public class MathHelper { if(var0 < var1) { return var1; } else { - return var0 > var2 ? var2 : var0; + return Math.min(var0, var2); } } @@ -140,7 +140,7 @@ public class MathHelper { if(var0 < var2) { return var2; } else { - return var0 > var4 ? var4 : var0; + return Math.min(var0, var4); } } @@ -169,7 +169,7 @@ public class MathHelper { var2 = -var2; } - return var0 > var2 ? var0 : var2; + return Math.max(var0, var2); } public static int a(int var0, int var1) {