From 28d5db622bbe60f583d7727de147949173b3d093 Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Mon, 29 Apr 2024 23:41:14 +0200
Subject: [PATCH] revert bad change

---
 .../geyser/inventory/item/BannerPattern.java     | 16 ++++++++--------
 .../geysermc/geyser/item/type/BannerItem.java    |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/inventory/item/BannerPattern.java b/core/src/main/java/org/geysermc/geyser/inventory/item/BannerPattern.java
index ae225073a..442690d7d 100644
--- a/core/src/main/java/org/geysermc/geyser/inventory/item/BannerPattern.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/item/BannerPattern.java
@@ -45,7 +45,7 @@ public enum BannerPattern {
     STRIPE_MIDDLE("ms"),
     STRIPE_DOWNRIGHT("drs"),
     STRIPE_DOWNLEFT("dls"),
-    STRIPE_SMALL("ss"),
+    SMALL_STRIPES("ss"),
     CROSS("cr"),
     STRAIGHT_CROSS("sc"),
     TRIANGLE_BOTTOM("bt"),
@@ -53,15 +53,15 @@ public enum BannerPattern {
     TRIANGLES_BOTTOM("bts"),
     TRIANGLES_TOP("tts"),
     DIAGONAL_LEFT("ld"),
-    DIAGONAL_RIGHT("rd"),
-    DIAGONAL_LEFT_MIRROR("lud"),
-    DIAGONAL_RIGHT_MIRROR("rud"),
-    CIRCLE_MIDDLE("mc"),
-    RHOMBUS_MIDDLE("mr"),
+    DIAGONAL_UP_RIGHT("rd"),
+    DIAGONAL_UP_LEFT("lud"),
+    DIAGONAL_RIGHT("rud"),
+    CIRCLE("mc"),
+    RHOMBUS("mr"),
     HALF_VERTICAL("vh"),
     HALF_HORIZONTAL("hh"),
-    HALF_VERTICAL_MIRROR("vhr"),
-    HALF_HORIZONTAL_MIRROR("hhb"),
+    HALF_VERTICAL_RIGHT("vhr"),
+    HALF_HORIZONTAL_BOTTOM("hhb"),
     BORDER("bo"),
     CURLY_BORDER("cbo"),
     GRADIENT("gra"),
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/BannerItem.java b/core/src/main/java/org/geysermc/geyser/item/type/BannerItem.java
index 255e320a6..2f2d09669 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/BannerItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/BannerItem.java
@@ -64,13 +64,13 @@ public class BannerItem extends BlockItem {
     static {
         // Construct what an ominous banner is supposed to look like
         OMINOUS_BANNER_PATTERN = List.of(
-                Pair.of(BannerPattern.RHOMBUS_MIDDLE, DyeColor.CYAN),
+                Pair.of(BannerPattern.RHOMBUS, DyeColor.CYAN),
                 Pair.of(BannerPattern.STRIPE_BOTTOM, DyeColor.LIGHT_GRAY),
                 Pair.of(BannerPattern.STRIPE_CENTER, DyeColor.GRAY),
                 Pair.of(BannerPattern.BORDER, DyeColor.LIGHT_GRAY),
                 Pair.of(BannerPattern.STRIPE_MIDDLE, DyeColor.BLACK),
                 Pair.of(BannerPattern.HALF_HORIZONTAL, DyeColor.LIGHT_GRAY),
-                Pair.of(BannerPattern.CIRCLE_MIDDLE, DyeColor.LIGHT_GRAY),
+                Pair.of(BannerPattern.CIRCLE, DyeColor.LIGHT_GRAY),
                 Pair.of(BannerPattern.BORDER, DyeColor.BLACK)
         );
 
@@ -211,6 +211,7 @@ public class BannerItem extends BlockItem {
             List<BannerPatternLayer> patternLayers = new ArrayList<>();
             for (Pair<BannerPattern, DyeColor> pair : OMINOUS_BANNER_PATTERN) {
                 patternLayers.add(new BannerPatternLayer(Holder.ofId(pair.left().ordinal()), pair.right().ordinal()));
+                System.out.println("adding: " + pair.left().getJavaIdentifier() + " " + pair.right().name());
             }
 
             components.put(DataComponentType.BANNER_PATTERNS, patternLayers);