Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21.11-pre1-R0.1-SNAPSHOT</version>
<version>26.2-rc-2.build.7-alpha</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -38,17 +38,17 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.6</version>
<version>9.9.1</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.6</version>
<version>9.9.1</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.6</version>
<version>9.9.1</version>
</dependency>
</dependencies>

Expand All @@ -58,6 +58,23 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.5.0</version>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.9.1</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.9.1</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.9.1</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>generate-experimental-json</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ public class MineralAliasProvider extends CompoundAliasProvider {
"[A-Z_]*COPPER[A-Z_]*",
"RESIN_BRICK",
"RESIN_BRICKS",
"CHISELED_RESIN_BRICKS"
"CHISELED_RESIN_BRICKS",
"[A-Z_]*SULFUR_CUBE[A-Z_]*"
);

@Override
Expand Down Expand Up @@ -75,6 +76,8 @@ private enum Mineral implements MultipleCompoundModifier {
CHISELED_STONE(null, "{CHISELED}st", "{CHISELED}stone"),
CHISELED_TUFF_BRICKS(null, "{CHISELED}tuffbricks", "{CHISELED}tuffbr"),
CHISELED_TUFF(null, "{CHISELED}tuff", "{CHISELED}tuf"),
CHISELED_SULFUR(null, "{CHISELED}sulfur", "{CHISELED}sulf"),
CHISELED_CINNABAR(null, "{CHISELED}cinnabar", "{CHISELED}cinn", "{CHISELED}cinnab", "{CHISELED}cbar"),
CRACKED_NETHER_BRICK(null, "{CRACKED}nbr", "{CRACKED}nbrick", "{CRACKED}nethbr", "{CRACKED}nethbrick", "{CRACKED}netherbr", "{CRACKED}netherbrick"),
CRACKED_POLISHED_BLACKSTONE(null, "{CRACKED}{POLISHED}blstone", "{CRACKED}{POLISHED}blst", "{CRACKED}{POLISHED}blackstone", "{POLISHED}{CRACKED}blstone", "{POLISHED}{CRACKED}blst", "{POLISHED}{CRACKED}blackstone"),
CRACKED_DEEPSLATE_BRICKS(null, "{CRACKED}deepslatebricks", "{CRACKED}dslatebricks", "{CRACKED}slatebricks", "{CRACKED}deepslatebr", "{CRACKED}dslatebr", "{CRACKED}slatebr"),
Expand All @@ -100,6 +103,8 @@ private enum Mineral implements MultipleCompoundModifier {
POLISHED_DEEPSLATE(null, "{POLISHED}deepslate", "{POLISHED}dslate", "{POLISHED}slate"),
PACKED_MUD(null, "{PACKED}mud"),
POLISHED_TUFF(null, "{POLISHED}tuff", "{POLISHED}tuf"),
POLISHED_SULFUR(null, "{POLISHED}sulfur", "{POLISHED}sulf"),
POLISHED_CINNABAR(null, "{POLISHED}cinnabar", "{POLISHED}cinn", "{POLISHED}cinnab", "{POLISHED}cbar"),
DRIPSTONE(null, "dripstone", "drip"),
COBBLESTONE(null, "cobble", "cstone", "cs", "cst"),
ANDESITE(null, "astone", "andstone", "and"),
Expand All @@ -125,7 +130,13 @@ private enum Mineral implements MultipleCompoundModifier {
MUD("^MUD(?!DY)", "mud"),
TUFF_BRICKS(null, "tuffbricks", "tuffbr"),
RESIN_BRICK(null, "resbrick", "resbr", "resinbr"),
TUFF("^TUFF(?!_BRICK)", "tuff", "tuf")
TUFF("^TUFF(?!_BRICK)", "tuff", "tuf"),
SULFUR_BRICK(null, "sulfurbricks", "sulfurbr", "sulfbricks", "sulfbr"),
CINNABAR_BRICK(null, "cinnabarbricks", "cinnabarbr", "cinnbricks", "cinnbr", "cinnabbricks", "cinnabbr", "cbarbricks", "cbarbr"),
SULFUR_SPIKE(null, "sulfurspike", "sulfspike", "spike"),
POTENT_SULFUR(null, "potentsulfur", "potentsulf"),
SULFUR(null, "sulfur", "sulf"),
CINNABAR(null, "cinnabar", "cinn", "cinnab", "cbar"),
;

private final Pattern regex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ private enum MobType implements CompoundModifier {
NAUTILUS("nautilus", "naut"),
ZOMBIE_NAUTILUS("zombienautilus", "zombnautilus", "znautilus", "znaut", "zombnaut"),
PARCHED("parched", "parch"),
SULFUR_CUBE("sulfurcube", "sulfur", "sulfurc"),
PLAYER("steve"),
;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ private enum Track implements CompoundModifier {
CREATOR_MUSIC_BOX("MUSIC_DISC_CREATOR_MUSIC_BOX", "creatormusicbox", "creatormusicb", "creatormbox", "creatormb"),
PRECIPICE("MUSIC_DISC_PRECIPICE", "precipice"),
TEARS("MUSIC_DISC_TEARS", "tears", "ghast"),
LAVA_CHICKEN("MUSIC_DISC_LAVA_CHICKEN", "lavachicken", "lava", "chicken", "lchicken", "lchick")
LAVA_CHICKEN("MUSIC_DISC_LAVA_CHICKEN", "lavachicken", "lava", "chicken", "lchicken", "lchick"),
BOUNCE("MUSIC_DISC_BOUNCE", "bounce", "bouncy"),
;

private final Pattern regex;
Expand Down