diff --git a/pom.xml b/pom.xml
index fdfdc9a..144a3bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
org.spigotmc
spigot-api
- 1.21.3-R0.1-SNAPSHOT
+ 1.21.4-R0.1-SNAPSHOT
provided
diff --git a/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/FixedAliasProvider.java b/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/FixedAliasProvider.java
index cf8f0fd..637cfa9 100644
--- a/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/FixedAliasProvider.java
+++ b/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/FixedAliasProvider.java
@@ -92,6 +92,9 @@ private static void add(EntityType entity, String... aliases) {
add(Material.IRON_BARS, "ironbarsb", "ironbarsblock", "ironfence", "metalbars", "metalbarsb", "metalbarsblock", "metalfence", "jailbars", "jailbarsb", "jailbarsblock", "jailfence", "mbars", "mbarsb", "mbarsblock", "mfence", "jbars", "jbarsb", "jbarsblock", "ibars", "ibarsb", "ibarsblock", "ifence");
add(Material.ICE, "frozenwater", "waterfrozen", "freezewater", "waterfreeze");
add(Material.HAY_BLOCK, "hay", "haybale", "baleofhay", "hayofbale");
+ add(Material.RESIN_BRICK, "resbrick", "rbrick");
+ add(Material.RESIN_BRICKS, "resbricks", "rbricks");
+ add(Material.CHISELED_RESIN_BRICKS, "chiseledresbricks", "chiseledrbricks", "circleresbricks", "circlerbricks", "ciresbricks", "cirbrick");
// == Plants (not crops) ==
add(Material.TALL_GRASS, "longgrass", "wildgrass", "grasslong", "grasstall", "grasswild", "lgrass", "tgrass", "wgrass");
add(Material.DEAD_BUSH, "bush", "deadshrub", "dshrub", "dbush", "deadsapling");
@@ -118,6 +121,13 @@ private static void add(EntityType entity, String... aliases) {
add(Material.DECORATED_POT, "decorpot", "dflowerpot");
add(Material.BAMBOO_BLOCK, "bamblock", "bbblock");
add(Material.HANGING_ROOTS, "hangroot", "hangroots", "hangingroot", "hroots", "caveroot", "caveroots");
+ add(Material.PALE_HANGING_MOSS, "phangmoss", "phangmos", "phangm", "phang", "phmoss", "phmos", "phm");
+ add(Material.OPEN_EYEBLOSSOM, "oeyeblossom", "openblossom", "openbloss", "oeyeflower", "oeyebloss");
+ add(Material.CLOSED_EYEBLOSSOM, "ceyeblossom", "closeblossom", "closebloss", "ceyeflower", "ceyebloss");
+ add(Material.PALE_MOSS_BLOCK, "pmossblock", "pmblock");
+ add(Material.PALE_MOSS_CARPET, "pmosscarpet", "palemossfloor", "pmossfloor");
+ // == Minerals ==
+ add(Material.RESIN_CLUMP, "resclump", "rclump");
// == Tools and Combat ==
add(Material.SHIELD, "handshield", "woodshield", "woodenshield");
add(Material.TOTEM_OF_UNDYING, "totem");
diff --git a/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/MineralAliasProvider.java b/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/MineralAliasProvider.java
index 457b433..f0dbf7b 100644
--- a/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/MineralAliasProvider.java
+++ b/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/MineralAliasProvider.java
@@ -11,7 +11,10 @@
public class MineralAliasProvider extends CompoundAliasProvider {
private final Set skippedPatterns = ImmutableSet.of(
- "[A-Z_]*COPPER[A-Z_]*"
+ "[A-Z_]*COPPER[A-Z_]*",
+ "RESIN_BRICK",
+ "RESIN_BRICKS",
+ "CHISELED_RESIN_BRICKS"
);
@Override
@@ -121,6 +124,7 @@ private enum Mineral implements MultipleCompoundModifier {
MUD_BRICK(null, "mudbrick", "mudbr"),
MUD("^MUD(?!DY)", "mud"),
TUFF_BRICKS(null, "tuffbricks", "tuffbr"),
+ RESIN_BRICK(null, "resbrick", "resbr", "resinbr"),
TUFF("^TUFF(?!_BRICK)", "tuff", "tuf")
;
diff --git a/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/MobAliasProvider.java b/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/MobAliasProvider.java
index 3475793..12625ce 100644
--- a/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/MobAliasProvider.java
+++ b/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/MobAliasProvider.java
@@ -130,14 +130,15 @@ private enum MobType implements CompoundModifier {
ZOGLIN("rottypig", "zombiepig", "zpig", "zombiep"),
AXOLOTL("walkingfish"),
GOAT("thegoat"),
- ALLAY("allay"),
- FROG("frog"),
- TADPOLE("tadpole"),
- WARDEN("warden"),
- CAMEL("camel"),
- SNIFFER("sniffer"),
- BOGGED("bogged"),
- BREEZE("breeze"),
+ ALLAY,
+ FROG,
+ TADPOLE,
+ WARDEN,
+ CAMEL,
+ SNIFFER,
+ BOGGED,
+ BREEZE,
+ CREAKING("creak"),
PLAYER("steve"),
;
diff --git a/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/WoodAliasProvider.java b/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/WoodAliasProvider.java
index accc577..28a5d6f 100644
--- a/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/WoodAliasProvider.java
+++ b/src/main/java/io/github/essentialsx/itemdbgenerator/providers/alias/WoodAliasProvider.java
@@ -27,6 +27,7 @@ private enum WoodSpecies implements CompoundModifier {
AZALEA("az", "aza"),
BIRCH("b", "light", "l", "white", "w"),
DARK_OAK("darkoak", "do", "doak"),
+ PALE_OAK("paleoak", "pale", "po", "poak"),
JUNGLE("j", "forest", "f"),
OAK("o"),
SPRUCE("pine", "p", "dark", "d", "s"),
diff --git a/src/main/resources/experimental_materials.json b/src/main/resources/experimental_materials.json
index 14724e2..0637a08 100644
--- a/src/main/resources/experimental_materials.json
+++ b/src/main/resources/experimental_materials.json
@@ -1 +1 @@
-["POTTED_PALE_OAK_SAPLING","PALE_OAK_WALL_SIGN","PALE_HANGING_MOSS","PALE_OAK_HANGING_SIGN","PALE_MOSS_BLOCK","PALE_OAK_SAPLING","STRIPPED_PALE_OAK_WOOD","PALE_OAK_LEAVES","PALE_MOSS_CARPET","PALE_OAK_WOOD","CREAKING_SPAWN_EGG","PALE_OAK_CHEST_BOAT","PALE_OAK_WALL_HANGING_SIGN","PALE_OAK_LOG","PALE_OAK_SIGN","PALE_OAK_FENCE","PALE_OAK_BOAT","STRIPPED_PALE_OAK_LOG","PALE_OAK_PRESSURE_PLATE","PALE_OAK_TRAPDOOR","PALE_OAK_DOOR","PALE_OAK_PLANKS","CREAKING_HEART","PALE_OAK_STAIRS","PALE_OAK_SLAB","PALE_OAK_BUTTON","PALE_OAK_FENCE_GATE"]
\ No newline at end of file
+[]
\ No newline at end of file