mirror of
https://github.com/amalthea-mc/ShopChest.git
synced 2024-11-08 11:41:10 +00:00
Add support for 1.16.2
This commit is contained in:
parent
4580319241
commit
d3574f1519
2
pom.xml
2
pom.xml
@ -97,7 +97,7 @@
|
||||
<dependency>
|
||||
<groupId>org.spigotmc</groupId>
|
||||
<artifactId>spigot-api</artifactId>
|
||||
<version>1.16.1-R0.1-SNAPSHOT</version>
|
||||
<version>1.16.2-R0.1-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
@ -1064,6 +1064,7 @@ item.minecraft.phantom_membrane
|
||||
item.minecraft.phantom_spawn_egg
|
||||
item.minecraft.pig_spawn_egg
|
||||
item.minecraft.piglin_banner_pattern.desc
|
||||
item.minecraft.piglin_brute_spawn_egg
|
||||
item.minecraft.piglin_spawn_egg
|
||||
item.minecraft.pillager_spawn_egg
|
||||
item.minecraft.pink_dye
|
||||
|
@ -185,6 +185,7 @@ public class ShopChest extends JavaPlugin {
|
||||
case "v1_14_R1":
|
||||
case "v1_15_R1":
|
||||
case "v1_16_R1":
|
||||
case "v1_16_R2":
|
||||
break;
|
||||
default:
|
||||
debug("Server version not officially supported: " + Utils.getServerVersion() + "!");
|
||||
|
@ -2059,6 +2059,11 @@ public class LanguageUtils {
|
||||
itemNames.add(new ItemName(Material.WEEPING_VINES_PLANT, langConfig.getString("block.minecraft.weeping_vines_plant", "Weeping Vines Plant")));
|
||||
itemNames.add(new ItemName(Material.ZOGLIN_SPAWN_EGG, langConfig.getString("item.minecraft.zoglin_spawn_egg", "Zoglin Spawn Egg")));
|
||||
itemNames.add(new ItemName(Material.ZOMBIFIED_PIGLIN_SPAWN_EGG, langConfig.getString("item.minecraft.zombified_piglin_spawn_egg", "Zombified Piglin Spawn Egg")));
|
||||
|
||||
if (Utils.getMajorVersion() > 16 || Utils.getRevision() >= 2) {
|
||||
// Add 1.16.2 item names
|
||||
itemNames.add(new ItemName(Material.PIGLIN_BRUTE_SPAWN_EGG, langConfig.getString("item.minecraft.piglin_brute_spawn_egg", "Piglin Brute Spawn Egg")));
|
||||
}
|
||||
} else {
|
||||
// Add pre-1.16 item names that don't exist anymore
|
||||
itemNames.add(new ItemName(Material.valueOf("ZOMBIE_PIGMAN_SPAWN_EGG"), langConfig.getString("item.minecraft.zombie_pigman_spawn_egg", "Zombie Pigman Spawn Egg")));
|
||||
|
@ -412,6 +412,8 @@ public class Utils {
|
||||
dataWatcherObjectFieldNames = new String[] {"T", "AIR_TICKS", "aA", "az", "aB", "aC", "ITEM", "b"};
|
||||
} else if ("v1_16_R1".equals(version)) {
|
||||
dataWatcherObjectFieldNames = new String[] {"T", "AIR_TICKS", "ay", "ax", "az", "aA", "ITEM", "b"};
|
||||
} else if ("v1_16_R2".equals(version)) {
|
||||
dataWatcherObjectFieldNames = new String[] {"S", "AIR_TICKS", "ar", "aq", "as", "at", "ITEM", "b"};
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
|
@ -1158,6 +1158,7 @@ item.minecraft.phantom_membrane=Phantomhaut
|
||||
item.minecraft.phantom_spawn_egg=Phantom-Spawn-Ei
|
||||
item.minecraft.pig_spawn_egg=Schweine-Spawn-Ei
|
||||
item.minecraft.piglin_banner_pattern.desc=Schnauze
|
||||
item.minecraft.piglin_brute_spawn_egg=Piglin-Barbaren-Spawn-Ei
|
||||
item.minecraft.piglin_spawn_egg=Piglin-Spawn-Ei
|
||||
item.minecraft.pillager_spawn_egg=Plünderer-Spawn-Ei
|
||||
item.minecraft.pink_dye=Rosa Farbstoff
|
||||
|
@ -1285,6 +1285,7 @@ item.minecraft.ocelot_spawn_egg=Ocelot Spawn Egg
|
||||
item.minecraft.panda_spawn_egg=Panda Spawn Egg
|
||||
item.minecraft.parrot_spawn_egg=Parrot Spawn Egg
|
||||
item.minecraft.pig_spawn_egg=Pig Spawn Egg
|
||||
item.minecraft.piglin_brute_spawn_egg=Piglin Brute Spawn Egg
|
||||
item.minecraft.piglin_spawn_egg=Piglin Spawn Egg
|
||||
item.minecraft.pillager_spawn_egg=Pillager Spawn Egg
|
||||
item.minecraft.phantom_spawn_egg=Phantom Spawn Egg
|
||||
|
Loading…
Reference in New Issue
Block a user