fix in npc type registry.

This commit is contained in:
D3v1s0m 2023-07-03 12:21:15 +05:30
parent 999f4013c6
commit 11d94d15c0
No known key found for this signature in database
GPG Key ID: 3B6EC35367B8D82E

@ -53,10 +53,6 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
.setHologramOffset(-0.175) .setHologramOffset(-0.175)
.addProperties("blaze_on_fire")); .addProperties("blaze_on_fire"));
register(builder(p, "cat", EntityTypes.CAT)
.setHologramOffset(-1.275)
.addProperties("cat_variant", "cat_lying", "cat_collar_color"));
register(builder(p, "cave_spider", EntityTypes.CAVE_SPIDER) register(builder(p, "cave_spider", EntityTypes.CAVE_SPIDER)
.setHologramOffset(-1.475)); .setHologramOffset(-1.475));
@ -70,12 +66,6 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
.setHologramOffset(-0.275) .setHologramOffset(-0.275)
.addProperties("creeper_state", "creeper_charged")); .addProperties("creeper_state", "creeper_charged"));
register(builder(p, "donkey", EntityTypes.DONKEY)
.setHologramOffset(-0.475));
register(builder(p, "elder_guardian", EntityTypes.ELDER_GUARDIAN)
.setHologramOffset(0.0225));
register(builder(p, "ender_dragon", EntityTypes.ENDER_DRAGON) register(builder(p, "ender_dragon", EntityTypes.ENDER_DRAGON)
.setHologramOffset(6.0245)); .setHologramOffset(6.0245));
@ -107,9 +97,6 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
register(builder(p, "mooshroom", EntityTypes.MOOSHROOM) register(builder(p, "mooshroom", EntityTypes.MOOSHROOM)
.setHologramOffset(-0.575)); .setHologramOffset(-0.575));
register(builder(p, "mule", EntityTypes.MULE)
.setHologramOffset(-0.375));
register(builder(p, "ocelot", EntityTypes.OCELOT) register(builder(p, "ocelot", EntityTypes.OCELOT)
.setHologramOffset(-1.275)); .setHologramOffset(-1.275));
@ -154,10 +141,6 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
register(builder(p, "wither", EntityTypes.WITHER) register(builder(p, "wither", EntityTypes.WITHER)
.setHologramOffset(1.525)); .setHologramOffset(1.525));
register(builder(p, "wither_skeleton", EntityTypes.WITHER_SKELETON)
.setHologramOffset(0.425)
.addEquipmentProperties());
register(builder(p, "wolf", EntityTypes.WOLF) register(builder(p, "wolf", EntityTypes.WOLF)
.setHologramOffset(-1.125)); .setHologramOffset(-1.125));
@ -168,8 +151,8 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
register(builder(p, "zombie_horse", EntityTypes.ZOMBIE_HORSE) register(builder(p, "zombie_horse", EntityTypes.ZOMBIE_HORSE)
.setHologramOffset(-0.375)); .setHologramOffset(-0.375));
register(builder(p, "zombie_villager", EntityTypes.ZOMBIE_VILLAGER) register(builder(p, "zombified_piglin", EntityTypes.ZOMBIFIED_PIGLIN)
.setHologramOffset(-1.0) .setHologramOffset(-0.025)
.addEquipmentProperties()); .addEquipmentProperties());
if (!version.isNewerThanOrEquals(ServerVersion.V_1_9)) return; if (!version.isNewerThanOrEquals(ServerVersion.V_1_9)) return;
@ -179,6 +162,17 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
if (!version.isNewerThanOrEquals(ServerVersion.V_1_10)) return; if (!version.isNewerThanOrEquals(ServerVersion.V_1_10)) return;
register(builder(p, "polar_bear", EntityTypes.POLAR_BEAR)
.setHologramOffset(-0.575));
if (!version.isNewerThanOrEquals(ServerVersion.V_1_11)) return;
register(builder(p, "donkey", EntityTypes.DONKEY)
.setHologramOffset(-0.475));
register(builder(p, "elder_guardian", EntityTypes.ELDER_GUARDIAN)
.setHologramOffset(0.0225));
register(builder(p, "husk", EntityTypes.HUSK) register(builder(p, "husk", EntityTypes.HUSK)
.setHologramOffset(-0.025) .setHologramOffset(-0.025)
.addEquipmentProperties()); .addEquipmentProperties());
@ -190,8 +184,6 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
.setHologramOffset(0.015) .setHologramOffset(0.015)
.addEquipmentProperties()); .addEquipmentProperties());
if (!version.isNewerThanOrEquals(ServerVersion.V_1_11)) return;
register(builder(p, "evoker", EntityTypes.EVOKER) register(builder(p, "evoker", EntityTypes.EVOKER)
.setHologramOffset(-0.025) .setHologramOffset(-0.025)
.addProperties("evoker_spell")); .addProperties("evoker_spell"));
@ -206,6 +198,14 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
register(builder(p, "vindicator", EntityTypes.VINDICATOR) register(builder(p, "vindicator", EntityTypes.VINDICATOR)
.setHologramOffset(-0.025)); .setHologramOffset(-0.025));
register(builder(p, "wither_skeleton", EntityTypes.WITHER_SKELETON)
.setHologramOffset(0.425)
.addEquipmentProperties());
register(builder(p, "zombie_villager", EntityTypes.ZOMBIE_VILLAGER)
.setHologramOffset(-1.0)
.addEquipmentProperties());
if (!version.isNewerThanOrEquals(ServerVersion.V_1_12)) return; if (!version.isNewerThanOrEquals(ServerVersion.V_1_12)) return;
register(builder(p, "illusioner", EntityTypes.ILLUSIONER) register(builder(p, "illusioner", EntityTypes.ILLUSIONER)
@ -244,6 +244,10 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
if (!version.isNewerThanOrEquals(ServerVersion.V_1_14)) return; if (!version.isNewerThanOrEquals(ServerVersion.V_1_14)) return;
register(builder(p, "cat", EntityTypes.CAT)
.setHologramOffset(-1.275)
.addProperties("cat_variant", "cat_lying", "cat_collar_color"));
register(builder(p, "fox", EntityTypes.FOX) register(builder(p, "fox", EntityTypes.FOX)
.setHologramOffset(-1.275) .setHologramOffset(-1.275)
.addProperties("hand", "fox_variant", "fox_sitting", "fox_crouching", "fox_sleeping", "fox_faceplanted")); .addProperties("hand", "fox_variant", "fox_sitting", "fox_crouching", "fox_sleeping", "fox_faceplanted"));
@ -290,10 +294,6 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
register(builder(p, "zoglin", EntityTypes.ZOGLIN) register(builder(p, "zoglin", EntityTypes.ZOGLIN)
.setHologramOffset(-0.575)); .setHologramOffset(-0.575));
register(builder(p, "zombified_piglin", EntityTypes.ZOMBIFIED_PIGLIN)
.setHologramOffset(-0.025)
.addEquipmentProperties());
if (!version.isNewerThanOrEquals(ServerVersion.V_1_17)) return; if (!version.isNewerThanOrEquals(ServerVersion.V_1_17)) return;
register(builder(p, "axolotl", EntityTypes.AXOLOTL) register(builder(p, "axolotl", EntityTypes.AXOLOTL)