Skip to content

Commit 0537e2c

Browse files
SkulliansSkullians
committed
Revert "Fixed map decorations"
This reverts commit e3b38d8.
1 parent 451174c commit 0537e2c

File tree

38 files changed

+60
-106
lines changed
  • V1_10/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_11/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_12/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_13/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_13_1/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_14/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_15/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_16/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_16_2/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_16_4/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_17/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_18/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_18_2/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_19/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_19_3/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_19_4/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_20/src/main/java/com/loohp/multichatdiscordsrvaddon/nms
  • V1_20_2/src/main/java/com/loohp/multichatdiscordsrvaddon/nms
  • V1_20_3/src/main/java/com/loohp/multichatdiscordsrvaddon/nms
  • V1_20_5/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_20_6/src/main/java/com/loohp/multichatdiscordsrvaddon/nms
  • V1_21/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_21_1/src/main/java/com/loohp/multichatdiscordsrvaddon/nms
  • V1_21_2/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_21_3/src/main/java/com/loohp/multichatdiscordsrvaddon/nms
  • V1_21_4/src/main/java/com/loohp/multichatdiscordsrvaddon/nms
  • V1_8/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_8_3/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_8_4/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_9/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • V1_9_4/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms
  • abstraction/src/main/java/com/loohp/multichatdiscordsrvaddon/nms
  • common/src/main/java/com/loohp/multichatdiscordsrvaddon

38 files changed

+60
-106
lines changed

‎V1_10/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_10.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
555555
}
556556

557557
@Override
558-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
558+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
559559
return false;
560560
}
561561

‎V1_11/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_11.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
571571
}
572572

573573
@Override
574-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
574+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
575575
return false;
576576
}
577577

‎V1_12/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_12.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
577577
}
578578

579579
@Override
580-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
580+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
581581
return false;
582582
}
583583

‎V1_13/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_13.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
578578
}
579579

580580
@Override
581-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
581+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
582582
return false;
583583
}
584584

‎V1_13_1/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_13_1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
581581
}
582582

583583
@Override
584-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
584+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
585585
return false;
586586
}
587587

‎V1_14/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_14.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
601601
}
602602

603603
@Override
604-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
604+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
605605
return false;
606606
}
607607

‎V1_15/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_15.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
600600
}
601601

602602
@Override
603-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
603+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
604604
return false;
605605
}
606606

‎V1_16/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_16.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
698698
}
699699

700700
@Override
701-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
701+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
702702
return false;
703703
}
704704

‎V1_16_2/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_16_2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
706706
}
707707

708708
@Override
709-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
709+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
710710
return false;
711711
}
712712

‎V1_16_4/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_16_4.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
706706
}
707707

708708
@Override
709-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
709+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
710710
return false;
711711
}
712712

‎V1_17/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_17.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
665665
}
666666

667667
@Override
668-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
668+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
669669
return false;
670670
}
671671

‎V1_18/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_18.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
662662
}
663663

664664
@Override
665-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
665+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
666666
return false;
667667
}
668668

‎V1_18_2/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_18_2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
656656
}
657657

658658
@Override
659-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
659+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
660660
return false;
661661
}
662662

‎V1_19/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_19.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
639639
}
640640

641641
@Override
642-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
642+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
643643
return false;
644644
}
645645

‎V1_19_3/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_19_3.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
639639
}
640640

641641
@Override
642-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
642+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
643643
return false;
644644
}
645645

‎V1_19_4/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_19_4.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
658658
}
659659

660660
@Override
661-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
661+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
662662
return false;
663663
}
664664

‎V1_20/src/main/java/com/loohp/multichatdiscordsrvaddon/nms/V1_20.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
654654
}
655655

656656
@Override
657-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
657+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
658658
return false;
659659
}
660660

‎V1_20_2/src/main/java/com/loohp/multichatdiscordsrvaddon/nms/V1_20_2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
651651
}
652652

653653
@Override
654-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
654+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
655655
return false;
656656
}
657657

‎V1_20_3/src/main/java/com/loohp/multichatdiscordsrvaddon/nms/V1_20_3.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
647647
}
648648

649649
@Override
650-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
650+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
651651
return false;
652652
}
653653

‎V1_20_5/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_20_5.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
import net.minecraft.world.level.block.Block;
9090
import net.minecraft.world.level.block.entity.DecoratedPotPatterns;
9191
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
92-
import net.minecraft.world.level.saveddata.maps.MapDecorationType;
9392
import org.bukkit.Bukkit;
9493
import org.bukkit.DyeColor;
9594
import org.bukkit.Location;
@@ -110,7 +109,6 @@
110109
import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftItemStack;
111110
import org.bukkit.craftbukkit.v1_20_R4.inventory.trim.CraftTrimMaterial;
112111
import org.bukkit.craftbukkit.v1_20_R4.inventory.trim.CraftTrimPattern;
113-
import org.bukkit.craftbukkit.v1_20_R4.map.CraftMapCursor;
114112
import org.bukkit.craftbukkit.v1_20_R4.potion.CraftPotionEffectType;
115113
import org.bukkit.craftbukkit.v1_20_R4.potion.CraftPotionUtil;
116114
import org.bukkit.craftbukkit.v1_20_R4.util.CraftChatMessage;
@@ -167,9 +165,8 @@ public V1_20_5() {
167165
@SuppressWarnings("PatternValidation")
168166
@Override
169167
public Key getMapCursorTypeKey(MapCursor mapCursor) {
170-
MapDecorationType nmsType = CraftMapCursor.CraftType.bukkitToMinecraft(mapCursor.getType());
171-
MinecraftKey key = nmsType.b();
172-
return Key.key(key.b(), key.a());
168+
NamespacedKey key = mapCursor.getType().getKey();
169+
return Key.key(key.getNamespace(), key.getKey());
173170
}
174171

175172
@Override
@@ -680,7 +677,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
680677
}
681678

682679
@Override
683-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
680+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
684681
return false;
685682
}
686683

‎V1_20_6/src/main/java/com/loohp/multichatdiscordsrvaddon/nms/V1_20_6.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
import net.minecraft.world.level.block.Block;
9090
import net.minecraft.world.level.block.entity.DecoratedPotPatterns;
9191
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
92-
import net.minecraft.world.level.saveddata.maps.MapDecorationType;
9392
import org.bukkit.Bukkit;
9493
import org.bukkit.DyeColor;
9594
import org.bukkit.Location;
@@ -110,7 +109,6 @@
110109
import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftItemStack;
111110
import org.bukkit.craftbukkit.v1_20_R4.inventory.trim.CraftTrimMaterial;
112111
import org.bukkit.craftbukkit.v1_20_R4.inventory.trim.CraftTrimPattern;
113-
import org.bukkit.craftbukkit.v1_20_R4.map.CraftMapCursor;
114112
import org.bukkit.craftbukkit.v1_20_R4.potion.CraftPotionEffectType;
115113
import org.bukkit.craftbukkit.v1_20_R4.potion.CraftPotionUtil;
116114
import org.bukkit.craftbukkit.v1_20_R4.util.CraftChatMessage;
@@ -180,9 +178,8 @@ public Map<ICMaterial, TintColorProvider.SpawnEggTintData> getSpawnEggColorMap()
180178
@SuppressWarnings("PatternValidation")
181179
@Override
182180
public Key getMapCursorTypeKey(MapCursor mapCursor) {
183-
MapDecorationType nmsType = CraftMapCursor.CraftType.bukkitToMinecraft(mapCursor.getType());
184-
MinecraftKey key = nmsType.b();
185-
return Key.key(key.b(), key.a());
181+
NamespacedKey key = mapCursor.getType().getKey();
182+
return Key.key(key.getNamespace(), key.getKey());
186183
}
187184

188185
@SuppressWarnings("PatternValidation")
@@ -680,7 +677,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
680677
}
681678

682679
@Override
683-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
680+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
684681
return false;
685682
}
686683

‎V1_21/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_21.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
import net.minecraft.world.level.block.Block;
9090
import net.minecraft.world.level.block.entity.DecoratedPotPatterns;
9191
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
92-
import net.minecraft.world.level.saveddata.maps.MapDecorationType;
9392
import org.bukkit.Bukkit;
9493
import org.bukkit.DyeColor;
9594
import org.bukkit.Location;
@@ -111,7 +110,6 @@
111110
import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack;
112111
import org.bukkit.craftbukkit.v1_21_R1.inventory.trim.CraftTrimMaterial;
113112
import org.bukkit.craftbukkit.v1_21_R1.inventory.trim.CraftTrimPattern;
114-
import org.bukkit.craftbukkit.v1_21_R1.map.CraftMapCursor;
115113
import org.bukkit.craftbukkit.v1_21_R1.potion.CraftPotionEffectType;
116114
import org.bukkit.craftbukkit.v1_21_R1.potion.CraftPotionUtil;
117115
import org.bukkit.craftbukkit.v1_21_R1.util.CraftChatMessage;
@@ -181,9 +179,8 @@ public Map<ICMaterial, TintColorProvider.SpawnEggTintData> getSpawnEggColorMap()
181179
@SuppressWarnings("PatternValidation")
182180
@Override
183181
public Key getMapCursorTypeKey(MapCursor mapCursor) {
184-
MapDecorationType nmsType = CraftMapCursor.CraftType.bukkitToMinecraft(mapCursor.getType());
185-
MinecraftKey key = nmsType.b();
186-
return Key.key(key.b(), key.a());
182+
NamespacedKey key = mapCursor.getType().getKey();
183+
return Key.key(key.getNamespace(), key.getKey());
187184
}
188185

189186
@SuppressWarnings("PatternValidation")
@@ -693,7 +690,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
693690
}
694691

695692
@Override
696-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
693+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
697694
return false;
698695
}
699696

‎V1_21_1/src/main/java/com/loohp/multichatdiscordsrvaddon/nms/V1_21_1.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
import net.minecraft.world.level.block.Block;
9090
import net.minecraft.world.level.block.entity.DecoratedPotPatterns;
9191
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
92-
import net.minecraft.world.level.saveddata.maps.MapDecorationType;
9392
import org.bukkit.Bukkit;
9493
import org.bukkit.DyeColor;
9594
import org.bukkit.Location;
@@ -111,7 +110,6 @@
111110
import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack;
112111
import org.bukkit.craftbukkit.v1_21_R1.inventory.trim.CraftTrimMaterial;
113112
import org.bukkit.craftbukkit.v1_21_R1.inventory.trim.CraftTrimPattern;
114-
import org.bukkit.craftbukkit.v1_21_R1.map.CraftMapCursor;
115113
import org.bukkit.craftbukkit.v1_21_R1.potion.CraftPotionEffectType;
116114
import org.bukkit.craftbukkit.v1_21_R1.potion.CraftPotionUtil;
117115
import org.bukkit.craftbukkit.v1_21_R1.util.CraftChatMessage;
@@ -181,9 +179,8 @@ public Map<ICMaterial, TintColorProvider.SpawnEggTintData> getSpawnEggColorMap()
181179
@SuppressWarnings("PatternValidation")
182180
@Override
183181
public Key getMapCursorTypeKey(MapCursor mapCursor) {
184-
MapDecorationType nmsType = CraftMapCursor.CraftType.bukkitToMinecraft(mapCursor.getType());
185-
MinecraftKey key = nmsType.b();
186-
return Key.key(key.b(), key.a());
182+
NamespacedKey key = mapCursor.getType().getKey();
183+
return Key.key(key.getNamespace(), key.getKey());
187184
}
188185

189186
@SuppressWarnings("PatternValidation")
@@ -696,7 +693,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
696693
}
697694

698695
@Override
699-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
696+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
700697
return false;
701698
}
702699

‎V1_21_2/src/main/java/com/loohp/interactivechatdiscordsrvaddon/nms/V1_21_2.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
import net.minecraft.world.level.block.Block;
9191
import net.minecraft.world.level.block.entity.DecoratedPotPatterns;
9292
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
93-
import net.minecraft.world.level.saveddata.maps.MapDecorationType;
9493
import org.bukkit.Bukkit;
9594
import org.bukkit.DyeColor;
9695
import org.bukkit.Location;
@@ -112,7 +111,6 @@
112111
import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack;
113112
import org.bukkit.craftbukkit.v1_21_R2.inventory.trim.CraftTrimMaterial;
114113
import org.bukkit.craftbukkit.v1_21_R2.inventory.trim.CraftTrimPattern;
115-
import org.bukkit.craftbukkit.v1_21_R2.map.CraftMapCursor;
116114
import org.bukkit.craftbukkit.v1_21_R2.potion.CraftPotionEffectType;
117115
import org.bukkit.craftbukkit.v1_21_R2.potion.CraftPotionUtil;
118116
import org.bukkit.craftbukkit.v1_21_R2.util.CraftChatMessage;
@@ -182,9 +180,8 @@ public Map<ICMaterial, TintColorProvider.SpawnEggTintData> getSpawnEggColorMap()
182180
@SuppressWarnings("PatternValidation")
183181
@Override
184182
public Key getMapCursorTypeKey(MapCursor mapCursor) {
185-
MapDecorationType nmsType = CraftMapCursor.CraftType.bukkitToMinecraft(mapCursor.getType());
186-
MinecraftKey key = nmsType.b();
187-
return Key.key(key.b(), key.a());
183+
NamespacedKey key = mapCursor.getType().getKey();
184+
return Key.key(key.getNamespace(), key.getKey());
188185
}
189186

190187
@SuppressWarnings("PatternValidation")
@@ -698,7 +695,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
698695
}
699696

700697
@Override
701-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
698+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
702699
return false;
703700
}
704701

‎V1_21_3/src/main/java/com/loohp/multichatdiscordsrvaddon/nms/V1_21_3.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
import net.minecraft.world.level.block.Block;
9191
import net.minecraft.world.level.block.entity.DecoratedPotPatterns;
9292
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
93-
import net.minecraft.world.level.saveddata.maps.MapDecorationType;
9493
import org.bukkit.Bukkit;
9594
import org.bukkit.DyeColor;
9695
import org.bukkit.Location;
@@ -112,7 +111,6 @@
112111
import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack;
113112
import org.bukkit.craftbukkit.v1_21_R2.inventory.trim.CraftTrimMaterial;
114113
import org.bukkit.craftbukkit.v1_21_R2.inventory.trim.CraftTrimPattern;
115-
import org.bukkit.craftbukkit.v1_21_R2.map.CraftMapCursor;
116114
import org.bukkit.craftbukkit.v1_21_R2.potion.CraftPotionEffectType;
117115
import org.bukkit.craftbukkit.v1_21_R2.potion.CraftPotionUtil;
118116
import org.bukkit.craftbukkit.v1_21_R2.util.CraftChatMessage;
@@ -182,9 +180,8 @@ public Map<ICMaterial, TintColorProvider.SpawnEggTintData> getSpawnEggColorMap()
182180
@SuppressWarnings("PatternValidation")
183181
@Override
184182
public Key getMapCursorTypeKey(MapCursor mapCursor) {
185-
MapDecorationType nmsType = CraftMapCursor.CraftType.bukkitToMinecraft(mapCursor.getType());
186-
MinecraftKey key = nmsType.b();
187-
return Key.key(key.b(), key.a());
183+
NamespacedKey key = mapCursor.getType().getKey();
184+
return Key.key(key.getNamespace(), key.getKey());
188185
}
189186

190187
@SuppressWarnings("PatternValidation")
@@ -698,7 +695,7 @@ public CustomModelData getCustomModelData(ItemStack itemStack) {
698695
}
699696

700697
@Override
701-
public boolean hasDataComponent(ItemStack itemStack, Key componentName, boolean ignoreDefault) {
698+
public boolean hasDataComponent(ItemStack itemStack, String componentName, boolean ignoreDefault) {
702699
return false;
703700
}
704701

0 commit comments

Comments
 (0)