feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

use modern api for banner codec

Browse Source
This commit is contained in:
Brokkonaut
2024-09-19 23:04:30 +02:00
parent 0d04823ae1
commit 73c221e8d0
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecBanner.java
View File

@@ -1,9 +1,12 @@
package de.diddiz.LogBlock.blockstate; package de.diddiz.LogBlock.blockstate;
import java.util.List; import java.util.List;
import java.util.Locale;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.Registry;
import org.bukkit.block.Banner; import org.bukkit.block.Banner;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.block.banner.Pattern; import org.bukkit.block.banner.Pattern;
@@ -30,10 +33,13 @@ public class BlockStateCodecBanner implements BlockStateCodec {
YamlConfiguration conf = new YamlConfiguration(); YamlConfiguration conf = new YamlConfiguration();
ConfigurationSection patternsSection = conf.createSection("patterns"); ConfigurationSection patternsSection = conf.createSection("patterns");
for (Pattern pattern : patterns) { for (Pattern pattern : patterns) {
ConfigurationSection section = patternsSection.createSection(Integer.toString(nr)); NamespacedKey key = pattern.getPattern().getKey();
section.set("color", pattern.getColor().name()); if (key != null) {
section.set("pattern", pattern.getPattern().name()); ConfigurationSection section = patternsSection.createSection(Integer.toString(nr));
nr++; section.set("color", pattern.getColor().name());
section.set("pattern", key.toString());
nr++;
}
} }
return conf; return conf;
} }
@@ -55,8 +61,13 @@ public class BlockStateCodecBanner implements BlockStateCodec {
ConfigurationSection section = patternsSection.getConfigurationSection(key); ConfigurationSection section = patternsSection.getConfigurationSection(key);
if (section != null) { if (section != null) {
DyeColor color = DyeColor.valueOf(section.getString("color")); DyeColor color = DyeColor.valueOf(section.getString("color"));
PatternType type = PatternType.valueOf(section.getString("pattern")); NamespacedKey patternKey = NamespacedKey.fromString(section.getString("pattern").toLowerCase(Locale.ROOT));
banner.addPattern(new Pattern(color, type)); if (patternKey != null) {
PatternType type = Registry.BANNER_PATTERN.get(patternKey);
if (type != null) {
banner.addPattern(new Pattern(color, type));
}
}
} }
} }
} }