GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

revert bad change

This commit is contained in:
onebeastchris 2024-04-29 23:41:14 +02:00
parent 5d3630cf23
commit 28d5db622b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/org/geysermc/geyser/inventory/item/BannerPattern.java
View File

@ -45,7 +45,7 @@ public enum BannerPattern {
STRIPE_MIDDLE("ms"), STRIPE_MIDDLE("ms"),
STRIPE_DOWNRIGHT("drs"), STRIPE_DOWNRIGHT("drs"),
STRIPE_DOWNLEFT("dls"), STRIPE_DOWNLEFT("dls"),
STRIPE_SMALL("ss"), SMALL_STRIPES("ss"),
CROSS("cr"), CROSS("cr"),
STRAIGHT_CROSS("sc"), STRAIGHT_CROSS("sc"),
TRIANGLE_BOTTOM("bt"), TRIANGLE_BOTTOM("bt"),
@ -53,15 +53,15 @@ public enum BannerPattern {
TRIANGLES_BOTTOM("bts"), TRIANGLES_BOTTOM("bts"),
TRIANGLES_TOP("tts"), TRIANGLES_TOP("tts"),
DIAGONAL_LEFT("ld"), DIAGONAL_LEFT("ld"),
DIAGONAL_RIGHT("rd"), DIAGONAL_UP_RIGHT("rd"),
DIAGONAL_LEFT_MIRROR("lud"), DIAGONAL_UP_LEFT("lud"),
DIAGONAL_RIGHT_MIRROR("rud"), DIAGONAL_RIGHT("rud"),
CIRCLE_MIDDLE("mc"), CIRCLE("mc"),
RHOMBUS_MIDDLE("mr"), RHOMBUS("mr"),
HALF_VERTICAL("vh"), HALF_VERTICAL("vh"),
HALF_HORIZONTAL("hh"), HALF_HORIZONTAL("hh"),
HALF_VERTICAL_MIRROR("vhr"), HALF_VERTICAL_RIGHT("vhr"),
HALF_HORIZONTAL_MIRROR("hhb"), HALF_HORIZONTAL_BOTTOM("hhb"),
BORDER("bo"), BORDER("bo"),
CURLY_BORDER("cbo"), CURLY_BORDER("cbo"),
GRADIENT("gra"), GRADIENT("gra"),

5
core/src/main/java/org/geysermc/geyser/item/type/BannerItem.java
View File

@ -64,13 +64,13 @@ public class BannerItem extends BlockItem {
static { static {
// Construct what an ominous banner is supposed to look like // Construct what an ominous banner is supposed to look like
OMINOUS_BANNER_PATTERN = List.of( 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_BOTTOM, DyeColor.LIGHT_GRAY),
Pair.of(BannerPattern.STRIPE_CENTER, DyeColor.GRAY), Pair.of(BannerPattern.STRIPE_CENTER, DyeColor.GRAY),
Pair.of(BannerPattern.BORDER, DyeColor.LIGHT_GRAY), Pair.of(BannerPattern.BORDER, DyeColor.LIGHT_GRAY),
Pair.of(BannerPattern.STRIPE_MIDDLE, DyeColor.BLACK), Pair.of(BannerPattern.STRIPE_MIDDLE, DyeColor.BLACK),
Pair.of(BannerPattern.HALF_HORIZONTAL, DyeColor.LIGHT_GRAY), 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) Pair.of(BannerPattern.BORDER, DyeColor.BLACK)
); );
@ -211,6 +211,7 @@ public class BannerItem extends BlockItem {
List<BannerPatternLayer> patternLayers = new ArrayList<>(); List<BannerPatternLayer> patternLayers = new ArrayList<>();
for (Pair<BannerPattern, DyeColor> pair : OMINOUS_BANNER_PATTERN) { for (Pair<BannerPattern, DyeColor> pair : OMINOUS_BANNER_PATTERN) {
patternLayers.add(new BannerPatternLayer(Holder.ofId(pair.left().ordinal()), pair.right().ordinal())); 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); components.put(DataComponentType.BANNER_PATTERNS, patternLayers);