Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

upstream #1

Closed
bridge wants to merge 65 commits from feat/upstream into 2.X
pull from: feat/upstream
merge into: Netherite-Public:2.X
Conversation 0 Commits 65 Files changed 60 +7 -3
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ad8138f983 - Show all commits

2
plugin/build.gradle
View file

@ -8,7 +8,7 @@ runServer {
javaLauncher = javaToolchains.launcherFor { javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(21) languageVersion = JavaLanguageVersion.of(21)
} }
minecraftVersion "1.21.3" minecraftVersion "1.21.4"
} }
processResources { processResources {

6
plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
View file

@ -493,7 +493,9 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) llamaIndex = 20; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) llamaIndex = 20;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) llamaIndex = 19; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) llamaIndex = 19;
else llamaIndex = 17; else llamaIndex = 17;
register(new EncodedIntegerProperty<DyeColor>("carpet_color", DyeColor.class, llamaIndex++, obj -> obj == null ? -1 : obj.ordinal()));
// Removed in 1.20
if (!ver.isNewerThanOrEquals(ServerVersion.V_1_20)) register(new EncodedIntegerProperty<DyeColor>("carpet_color", DyeColor.class, llamaIndex++, obj -> obj == null ? -1 : obj.ordinal()));
register(new EncodedIntegerProperty<>("llama_variant", LlamaVariant.CREAMY, llamaIndex, Enum::ordinal)); register(new EncodedIntegerProperty<>("llama_variant", LlamaVariant.CREAMY, llamaIndex, Enum::ordinal));
if (!ver.isNewerThanOrEquals(ServerVersion.V_1_12)) return; if (!ver.isNewerThanOrEquals(ServerVersion.V_1_12)) return;
@ -655,6 +657,8 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
if (!ver.isNewerThanOrEquals(ServerVersion.V_1_20)) return; if (!ver.isNewerThanOrEquals(ServerVersion.V_1_20)) return;
register(new EquipmentProperty(packetFactory, "body", EquipmentSlot.BODY));
// Camel // Camel
int camelIndex = 18; int camelIndex = 18;
register(new BooleanProperty("bashing", camelIndex++, false, legacyBooleans)); register(new BooleanProperty("bashing", camelIndex++, false, legacyBooleans));

2
plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
View file

@ -221,7 +221,7 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
register(builder(p, "llama", EntityTypes.LLAMA) register(builder(p, "llama", EntityTypes.LLAMA)
.setHologramOffset(-0.105) .setHologramOffset(-0.105)
.addProperties("carpet_color", "llama_variant")); .addProperties("carpet_color", "llama_variant", "body"));
register(builder(p, "vex", EntityTypes.VEX) register(builder(p, "vex", EntityTypes.VEX)
.setHologramOffset(-1.175) .setHologramOffset(-1.175)