amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-22 02:12:25 +00:00
Code Issues Projects Releases Wiki Activity

Add support for 1.16.2

Browse Source
This commit is contained in:
Eric 2020-08-22 17:59:05 +02:00
parent 4580319241
commit d3574f1519
7 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -97,7 +97,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version> <version>1.16.2-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

1
script/entries.txt
View File

@ -1064,6 +1064,7 @@ item.minecraft.phantom_membrane
item.minecraft.phantom_spawn_egg item.minecraft.phantom_spawn_egg
item.minecraft.pig_spawn_egg item.minecraft.pig_spawn_egg
item.minecraft.piglin_banner_pattern.desc item.minecraft.piglin_banner_pattern.desc
item.minecraft.piglin_brute_spawn_egg
item.minecraft.piglin_spawn_egg item.minecraft.piglin_spawn_egg
item.minecraft.pillager_spawn_egg item.minecraft.pillager_spawn_egg
item.minecraft.pink_dye item.minecraft.pink_dye

1
src/main/java/de/epiceric/shopchest/ShopChest.java
View File

@ -185,6 +185,7 @@ public class ShopChest extends JavaPlugin {
case "v1_14_R1": case "v1_14_R1":
case "v1_15_R1": case "v1_15_R1":
case "v1_16_R1": case "v1_16_R1":
case "v1_16_R2":
break; break;
default: default:
debug("Server version not officially supported: " + Utils.getServerVersion() + "!"); debug("Server version not officially supported: " + Utils.getServerVersion() + "!");

5
src/main/java/de/epiceric/shopchest/language/LanguageUtils.java
View File

@ -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.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.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"))); 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 { } else {
// Add pre-1.16 item names that don't exist anymore // 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"))); itemNames.add(new ItemName(Material.valueOf("ZOMBIE_PIGMAN_SPAWN_EGG"), langConfig.getString("item.minecraft.zombie_pigman_spawn_egg", "Zombie Pigman Spawn Egg")));

2
src/main/java/de/epiceric/shopchest/utils/Utils.java
View File

@ -412,6 +412,8 @@ public class Utils {
dataWatcherObjectFieldNames = new String[] {"T", "AIR_TICKS", "aA", "az", "aB", "aC", "ITEM", "b"}; dataWatcherObjectFieldNames = new String[] {"T", "AIR_TICKS", "aA", "az", "aB", "aC", "ITEM", "b"};
} else if ("v1_16_R1".equals(version)) { } else if ("v1_16_R1".equals(version)) {
dataWatcherObjectFieldNames = new String[] {"T", "AIR_TICKS", "ay", "ax", "az", "aA", "ITEM", "b"}; 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 { } else {
return null; return null;
} }

1
src/main/resources/lang/de_DE.lang
View File

@ -1158,6 +1158,7 @@ item.minecraft.phantom_membrane=Phantomhaut
item.minecraft.phantom_spawn_egg=Phantom-Spawn-Ei item.minecraft.phantom_spawn_egg=Phantom-Spawn-Ei
item.minecraft.pig_spawn_egg=Schweine-Spawn-Ei item.minecraft.pig_spawn_egg=Schweine-Spawn-Ei
item.minecraft.piglin_banner_pattern.desc=Schnauze 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.piglin_spawn_egg=Piglin-Spawn-Ei
item.minecraft.pillager_spawn_egg=Plünderer-Spawn-Ei item.minecraft.pillager_spawn_egg=Plünderer-Spawn-Ei
item.minecraft.pink_dye=Rosa Farbstoff item.minecraft.pink_dye=Rosa Farbstoff

1
src/main/resources/lang/en_US.lang
View File

@ -1285,6 +1285,7 @@ item.minecraft.ocelot_spawn_egg=Ocelot Spawn Egg
item.minecraft.panda_spawn_egg=Panda Spawn Egg item.minecraft.panda_spawn_egg=Panda Spawn Egg
item.minecraft.parrot_spawn_egg=Parrot Spawn Egg item.minecraft.parrot_spawn_egg=Parrot Spawn Egg
item.minecraft.pig_spawn_egg=Pig 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.piglin_spawn_egg=Piglin Spawn Egg
item.minecraft.pillager_spawn_egg=Pillager Spawn Egg item.minecraft.pillager_spawn_egg=Pillager Spawn Egg
item.minecraft.phantom_spawn_egg=Phantom Spawn Egg item.minecraft.phantom_spawn_egg=Phantom Spawn Egg