Skip to content

Commit

Permalink
Update pattern type names
Browse files Browse the repository at this point in the history
  • Loading branch information
@jyhsu2000
jyhsu2000 committed Jul 13, 2024
1 parent 60bfdc4 commit 913b070
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 41 deletions.
40 changes: 20 additions & 20 deletions src/main/java/club/kid7/bannermaker/AlphabetBanner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public ItemStack toItemStack() {
break;
case "D":
invertBanner = true;
bannerMeta.addPattern(new Pattern(baseColor, PatternType.RHOMBUS_MIDDLE));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.RHOMBUS));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_TOP));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_LEFT));
Expand Down Expand Up @@ -202,7 +202,7 @@ public ItemStack toItemStack() {
break;
case "R":
invertBanner = true;
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNRIGHT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_LEFT));
Expand All @@ -214,7 +214,7 @@ public ItemStack toItemStack() {
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.TRIANGLE_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.SQUARE_TOP_RIGHT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.SQUARE_BOTTOM_LEFT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.RHOMBUS_MIDDLE));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.RHOMBUS));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNRIGHT));
break;
case "T":
Expand Down Expand Up @@ -243,7 +243,7 @@ public ItemStack toItemStack() {
break;
case "Y":
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNRIGHT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNLEFT));
break;
case "Z":
Expand All @@ -252,7 +252,7 @@ public ItemStack toItemStack() {
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.TRIANGLE_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.SQUARE_TOP_LEFT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.SQUARE_BOTTOM_RIGHT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.RHOMBUS_MIDDLE));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.RHOMBUS));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNLEFT));
break;
case "1":
Expand All @@ -277,10 +277,10 @@ public ItemStack toItemStack() {
break;
case "5":
invertBanner = true;
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL_RIGHT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_BOTTOM));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.DIAGONAL_RIGHT_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.DIAGONAL_UP_RIGHT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNRIGHT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_TOP));
break;
Expand All @@ -299,7 +299,7 @@ public ItemStack toItemStack() {
break;
case "9":
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_LEFT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_MIDDLE));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_TOP));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_RIGHT));
Expand All @@ -313,7 +313,7 @@ public ItemStack toItemStack() {
break;
case "?":
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_RIGHT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_TOP));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_MIDDLE));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.SQUARE_BOTTOM_LEFT));
Expand All @@ -322,7 +322,7 @@ public ItemStack toItemStack() {
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.HALF_HORIZONTAL));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_MIDDLE));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.SQUARE_BOTTOM_LEFT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL_RIGHT));
break;
case ".":
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.SQUARE_BOTTOM_LEFT));
Expand Down Expand Up @@ -410,7 +410,7 @@ public ItemStack toItemStack() {
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_LEFT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_LEFT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_MIDDLE));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL_RIGHT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.CROSS));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.BORDER));
break;
Expand All @@ -428,7 +428,7 @@ public ItemStack toItemStack() {
break;
case "N":
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_LEFT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.DIAGONAL_RIGHT_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.DIAGONAL_UP_RIGHT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNRIGHT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_RIGHT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.BORDER));
Expand Down Expand Up @@ -460,15 +460,15 @@ public ItemStack toItemStack() {
case "R":
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_RIGHT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_TOP));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNRIGHT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_LEFT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.BORDER));
break;
case "S":
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_TOP));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.RHOMBUS_MIDDLE));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.RHOMBUS));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNRIGHT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.BORDER));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.CURLY_BORDER));
Expand Down Expand Up @@ -506,7 +506,7 @@ public ItemStack toItemStack() {
break;
case "Y":
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.CROSS));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL_RIGHT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNLEFT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.BORDER));
break;
Expand All @@ -524,7 +524,7 @@ public ItemStack toItemStack() {
break;
case "2":
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_TOP));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.RHOMBUS_MIDDLE));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.RHOMBUS));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_DOWNLEFT));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_BOTTOM));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.BORDER));
Expand Down Expand Up @@ -555,7 +555,7 @@ public ItemStack toItemStack() {
break;
case "6":
invertBanner = true;
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_RIGHT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.STRIPE_TOP));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_BOTTOM));
Expand Down Expand Up @@ -588,7 +588,7 @@ public ItemStack toItemStack() {
break;
case "?":
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_RIGHT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_HORIZONTAL_BOTTOM));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_TOP));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_MIDDLE));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.SQUARE_BOTTOM_LEFT));
Expand All @@ -598,7 +598,7 @@ public ItemStack toItemStack() {
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.HALF_HORIZONTAL));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.STRIPE_MIDDLE));
bannerMeta.addPattern(new Pattern(dyeColor, PatternType.SQUARE_BOTTOM_LEFT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL_MIRROR));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.HALF_VERTICAL_RIGHT));
bannerMeta.addPattern(new Pattern(baseColor, PatternType.BORDER));
break;
case ".":
Expand Down
42 changes: 21 additions & 21 deletions src/main/java/club/kid7/bannermaker/util/BannerUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static public List<ItemStack> getMaterials(ItemStack banner) {
case SQUARE_BOTTOM_RIGHT:
case SQUARE_TOP_LEFT:
case SQUARE_TOP_RIGHT:
case CIRCLE_MIDDLE:
case CIRCLE:
materialInventory.addItem(DyeColorUtil.toDyeItemStack(dyeColor, 1));
break;
case STRIPE_BOTTOM:
Expand All @@ -114,12 +114,12 @@ static public List<ItemStack> getMaterials(ItemStack banner) {
case TRIANGLES_TOP:
case DIAGONAL_LEFT:
case DIAGONAL_RIGHT:
case DIAGONAL_LEFT_MIRROR:
case DIAGONAL_RIGHT_MIRROR:
case DIAGONAL_UP_LEFT:
case DIAGONAL_UP_RIGHT:
materialInventory.addItem(DyeColorUtil.toDyeItemStack(dyeColor, 3));
break;
case STRIPE_SMALL:
case RHOMBUS_MIDDLE:
case SMALL_STRIPES:
case RHOMBUS:
case GRADIENT:
case GRADIENT_UP:
materialInventory.addItem(DyeColorUtil.toDyeItemStack(dyeColor, 4));
Expand All @@ -130,8 +130,8 @@ static public List<ItemStack> getMaterials(ItemStack banner) {
break;
case HALF_VERTICAL:
case HALF_HORIZONTAL:
case HALF_VERTICAL_MIRROR:
case HALF_HORIZONTAL_MIRROR:
case HALF_VERTICAL_RIGHT:
case HALF_HORIZONTAL_BOTTOM:
materialInventory.addItem(DyeColorUtil.toDyeItemStack(dyeColor, 6));
break;
case BORDER:
Expand Down Expand Up @@ -387,25 +387,25 @@ public static List<PatternType> getPatternTypeList() {
List<PatternType> list = Arrays.asList(
PatternType.BORDER,
PatternType.BRICKS,
PatternType.CIRCLE_MIDDLE,
PatternType.CIRCLE,
PatternType.CREEPER,
PatternType.CROSS,
PatternType.CURLY_BORDER,
PatternType.DIAGONAL_LEFT,
PatternType.DIAGONAL_LEFT_MIRROR,
PatternType.DIAGONAL_UP_LEFT,
PatternType.DIAGONAL_RIGHT,
PatternType.DIAGONAL_RIGHT_MIRROR,
PatternType.DIAGONAL_UP_RIGHT,
PatternType.FLOWER,
PatternType.GLOBE,
PatternType.GRADIENT,
PatternType.GRADIENT_UP,
PatternType.HALF_HORIZONTAL,
PatternType.HALF_HORIZONTAL_MIRROR,
PatternType.HALF_HORIZONTAL_BOTTOM,
PatternType.HALF_VERTICAL,
PatternType.HALF_VERTICAL_MIRROR,
PatternType.HALF_VERTICAL_RIGHT,
PatternType.MOJANG,
PatternType.PIGLIN,
PatternType.RHOMBUS_MIDDLE,
PatternType.RHOMBUS,
PatternType.SKULL,
PatternType.SQUARE_BOTTOM_LEFT,
PatternType.SQUARE_BOTTOM_RIGHT,
Expand All @@ -419,7 +419,7 @@ public static List<PatternType> getPatternTypeList() {
PatternType.STRIPE_LEFT,
PatternType.STRIPE_MIDDLE,
PatternType.STRIPE_RIGHT,
PatternType.STRIPE_SMALL,
PatternType.SMALL_STRIPES,
PatternType.STRIPE_TOP,
PatternType.TRIANGLE_BOTTOM,
PatternType.TRIANGLE_TOP,
Expand Down Expand Up @@ -514,7 +514,7 @@ static public HashMap<Integer, ItemStack> getPatternRecipe(final ItemStack banne
bannerPosition = 1;
dyePosition = Arrays.asList(2, 4, 6);
break;
case STRIPE_SMALL:
case SMALL_STRIPES:
dyePosition = Arrays.asList(0, 2, 3, 5);
break;
case CROSS:
Expand Down Expand Up @@ -545,17 +545,17 @@ static public HashMap<Integer, ItemStack> getPatternRecipe(final ItemStack banne
case DIAGONAL_RIGHT:
dyePosition = Arrays.asList(5, 7, 8);
break;
case DIAGONAL_LEFT_MIRROR:
case DIAGONAL_UP_LEFT:
dyePosition = Arrays.asList(3, 6, 7);
break;
case DIAGONAL_RIGHT_MIRROR:
case DIAGONAL_UP_RIGHT:
dyePosition = Arrays.asList(1, 2, 5);
break;
case CIRCLE_MIDDLE:
case CIRCLE:
bannerPosition = 1;
dyePosition = Collections.singletonList(4);
break;
case RHOMBUS_MIDDLE:
case RHOMBUS:
dyePosition = Arrays.asList(1, 3, 5, 7);
break;
case HALF_VERTICAL:
Expand All @@ -566,11 +566,11 @@ static public HashMap<Integer, ItemStack> getPatternRecipe(final ItemStack banne
bannerPosition = 7;
dyePosition = Arrays.asList(0, 1, 2, 3, 4, 5);
break;
case HALF_VERTICAL_MIRROR:
case HALF_VERTICAL_RIGHT:
bannerPosition = 3;
dyePosition = Arrays.asList(1, 2, 4, 5, 7, 8);
break;
case HALF_HORIZONTAL_MIRROR:
case HALF_HORIZONTAL_BOTTOM:
bannerPosition = 1;
dyePosition = Arrays.asList(3, 4, 5, 6, 7, 8);
break;
Expand Down

0 comments on commit 913b070

Please sign in to comment.