Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Further fixes

This commit is contained in:
fullwall 2021-06-13 13:40:24 +08:00
parent ffa3c8f0ab
commit bd19c9e3e4
32 changed files with 74 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java
View File

@ -167,6 +167,7 @@ public class CatController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);
}

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java
View File

@ -175,6 +175,7 @@ public class ChickenController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java
View File

@ -183,6 +183,7 @@ public class CowController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);
}

4
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java
View File

@ -249,7 +249,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
}
public float getPathfindingMalus(BlockPathTypes pathtype) {
return this.bz.containsKey(pathtype) ? this.bz.get(pathtype).floatValue() : pathtype.getMalus();
return this.bz.containsKey(pathtype) ? this.bz.get(pathtype) : pathtype.getMalus();
}
@Override
@ -418,7 +418,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
}
public void setPathfindingMalus(BlockPathTypes pathtype, float f) {
this.bz.put(pathtype, Float.valueOf(f));
this.bz.put(pathtype, f);
}
public void setShouldJump() {

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java
View File

@ -161,6 +161,7 @@ public class FoxController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);
}

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java
View File

@ -161,6 +161,7 @@ public class GoatController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);
}

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java
View File

@ -206,6 +206,7 @@ public class HorseController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java
View File

@ -205,6 +205,7 @@ public class HorseDonkeyController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java
View File

@ -205,6 +205,7 @@ public class HorseMuleController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java
View File

@ -205,6 +205,7 @@ public class HorseSkeletonController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java
View File

@ -205,6 +205,7 @@ public class HorseZombieController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java
View File

@ -177,6 +177,7 @@ public class LlamaController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

6
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MobEntityController.java
View File

@ -39,11 +39,7 @@ public abstract class MobEntityController extends AbstractEntityController {
if (beneath.isSolid()) {
entity.setOnGround(true);
}
try {
NMSImpl.UUID_FIELD.invoke(entity, npc.getUniqueId());
} catch (Throwable e) {
e.printStackTrace();
}
entity.setUUID(npc.getUniqueId());
return entity.getBukkitEntity();
}

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java
View File

@ -171,6 +171,7 @@ public class MushroomCowController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java
View File

@ -167,6 +167,7 @@ public class OcelotController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java
View File

@ -161,6 +161,7 @@ public class PandaController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);
}

7
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java
View File

@ -194,6 +194,7 @@ public class PhantomController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);
@ -224,12 +225,12 @@ public class PhantomController extends MobEntityController {
@Override
public void tick() {
// avoid suicide
boolean resetDifficulty = this.level.getDifficulty() == Difficulty.PEACEFUL;
if (npc != null && resetDifficulty) {
boolean resetDifficulty = npc != null && this.level.getDifficulty() == Difficulty.PEACEFUL;
if (resetDifficulty) {
((WorldData) this.level.getLevelData()).setDifficulty(Difficulty.NORMAL);
}
super.tick();
if (npc != null && resetDifficulty) {
if (resetDifficulty) {
((WorldData) this.level.getLevelData()).setDifficulty(Difficulty.PEACEFUL);
}
}

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java
View File

@ -169,6 +169,7 @@ public class PigController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java
View File

@ -161,6 +161,7 @@ public class PillagerController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);
}

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java
View File

@ -135,6 +135,7 @@ public class PolarBearController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java
View File

@ -172,6 +172,7 @@ public class RabbitController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java
View File

@ -161,6 +161,7 @@ public class RavagerController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);
}

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java
View File

@ -162,6 +162,7 @@ public class SheepController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

3
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java
View File

@ -103,7 +103,7 @@ public class TraderLlamaController extends MobEntityController {
if (npc.useMinecraftAI()) {
super.customServerAiStep();
}
NMSImpl.setDespawnDelay(this, 10);
setDespawnDelay(10);
NMS.setStepHeight(getBukkitEntity(), 1);
npc.update();
}
@ -178,6 +178,7 @@ public class TraderLlamaController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java
View File

@ -198,6 +198,7 @@ public class VillagerController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java
View File

@ -162,6 +162,7 @@ public class VindicatorController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java
View File

@ -196,6 +196,7 @@ public class WanderingTraderController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java
View File

@ -163,6 +163,7 @@ public class WolfController extends MobEntityController {
calledNMSHeight = true;
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
calledNMSHeight = false;
return;
}
super.onSyncedDataUpdated(datawatcherobject);

3
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java
View File

@ -19,6 +19,7 @@ import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.Entity;
@ -46,7 +47,7 @@ public class FishingHookController extends MobEntityController {
}
public EntityFishingHookNPC(EntityType<? extends FishingHook> types, Level level, NPC npc) {
super(new ServerPlayer(level.getServer().getServer(), (ServerLevel) level,
super(new ServerPlayer(MinecraftServer.getServer(), (ServerLevel) level,
new GameProfile(UUID.randomUUID(), "dummyfishhook")) {
}, level, 0, 0);
this.npc = (CitizensNPC) npc;

112
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
View File

@ -213,7 +213,6 @@ import net.minecraft.CrashReport;
import net.minecraft.CrashReportCategory;
import net.minecraft.ReportedException;
import net.minecraft.core.BlockPos;
import net.minecraft.core.DefaultedRegistry;
import net.minecraft.core.Registry;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.Packet;
@ -256,7 +255,6 @@ import net.minecraft.world.entity.animal.PolarBear;
import net.minecraft.world.entity.animal.Pufferfish;
import net.minecraft.world.entity.animal.Rabbit;
import net.minecraft.world.entity.animal.horse.AbstractHorse;
import net.minecraft.world.entity.animal.horse.TraderLlama;
import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
import net.minecraft.world.entity.boss.wither.WitherBoss;
import net.minecraft.world.entity.monster.EnderMan;
@ -266,6 +264,7 @@ import net.minecraft.world.entity.vehicle.AbstractMinecart;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.pathfinder.BlockPathTypes;
@ -527,18 +526,10 @@ public class NMSImpl implements NMSBridge {
public String getSound(String flag) throws CommandException {
try {
Sound sound = Sound.valueOf(flag.toUpperCase());
if (CRAFTSOUND_GETSOUND != null) {
String ret = (String) CRAFTSOUND_GETSOUND.invoke(sound);
if (ret == null)
throw new CommandException(Messages.INVALID_SOUND);
return ret;
} else {
SoundEvent effect = CraftSound.getSoundEffect(sound);
if (effect == null)
throw new CommandException(Messages.INVALID_SOUND);
ResourceLocation key = (ResourceLocation) SOUNDEFFECT_LOCATION.invoke(effect);
return key.getPath();
}
SoundEvent effect = CraftSound.getSoundEffect(sound);
if (effect == null)
throw new CommandException(Messages.INVALID_SOUND);
return effect.getLocation().getPath();
} catch (Throwable e) {
throw new CommandException(Messages.INVALID_SOUND);
}
@ -1031,26 +1022,13 @@ public class NMSImpl implements NMSBridge {
@Override
public void removeHookIfNecessary(NPCRegistry npcRegistry, FishHook entity) {
if (FISHING_HOOK_HOOKED == null)
return;
FishingHook hook = (FishingHook) NMSImpl.getHandle(entity);
Entity hooked = null;
try {
hooked = (Entity) FISHING_HOOK_HOOKED.invoke(hook);
} catch (Throwable e) {
e.printStackTrace();
}
Entity hooked = hook.getHookedIn();
if (hooked == null)
return;
NPC npc = npcRegistry.getNPC(hooked.getBukkitEntity());
if (npc == null)
return;
if (npc.isProtected()) {
try {
FISHING_HOOK_HOOKED_SETTER.invoke(hook, null);
} catch (Throwable e) {
e.printStackTrace();
}
if (npc != null && npc.isProtected()) {
hook.hookedIn = null;
hook.setRemoved(RemovalReason.KILLED);
}
}
@ -1153,9 +1131,9 @@ public class NMSImpl implements NMSBridge {
@Override
public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry) {
if (ENDERMAN_ANGRY == null)
if (ENDERMAN_CREEPY == null)
return;
getHandle(enderman).getEntityData().set(ENDERMAN_ANGRY, angry);
getHandle(enderman).getEntityData().set(ENDERMAN_CREEPY, angry);
}
@Override
@ -1373,14 +1351,14 @@ public class NMSImpl implements NMSBridge {
}
return;
}
if (NAVIGATION_S == null)
if (NAVIGATION_PATHFINDER == null)
return;
PathNavigation navigation = ((Mob) en).getNavigation();
AttributeInstance inst = en.getAttribute(Attributes.FOLLOW_RANGE);
inst.setBaseValue(pathfindingRange);
int mc = Mth.floor(en.getAttributeBaseValue(Attributes.FOLLOW_RANGE) * 16.0D);
try {
NAVIGATION_S.invoke(navigation, NAVIGATION_A.invoke(navigation, mc));
NAVIGATION_PATHFINDER.invoke(navigation, NAVIGATION_CREATE_PATHFINDER.invoke(navigation, mc));
} catch (Throwable e) {
e.printStackTrace();
}
@ -1475,12 +1453,12 @@ public class NMSImpl implements NMSBridge {
}
public static void clearGoals(NPC npc, GoalSelector... goalSelectors) {
if (GOAL_SET_FIELD == null || goalSelectors == null)
if (goalSelectors == null)
return;
int i = 0;
for (GoalSelector selector : goalSelectors) {
try {
Collection<?> list = (Collection<?>) GOAL_SET_FIELD.invoke(selector);
Collection<?> list = selector.getAvailableGoals();
if (!list.isEmpty()) {
npc.data().set("selector" + i, Lists.newArrayList(list));
}
@ -1654,14 +1632,7 @@ public class NMSImpl implements NMSBridge {
}
public static EntityDataAccessor<Integer> getRabbitTypeField() {
if (RABBIT_DATAWATCHER_FIELD == null)
return null;
try {
return (EntityDataAccessor<Integer>) RABBIT_DATAWATCHER_FIELD.invoke();
} catch (Throwable e) {
e.printStackTrace();
}
return null;
return RABBIT_TYPE_DATAWATCHER;
}
public static EntityDimensions getSize(Entity entity) {
@ -1716,15 +1687,15 @@ public class NMSImpl implements NMSBridge {
}
public static void restoreGoals(NPC npc, GoalSelector... goalSelectors) {
if (GOAL_SET_FIELD == null || goalSelectors == null)
if (goalSelectors == null)
return;
int i = 0;
for (GoalSelector selector : goalSelectors) {
try {
Collection<Object> list = (Collection<Object>) GOAL_SET_FIELD.invoke(selector);
Collection list = selector.getAvailableGoals();
list.clear();
Collection<Object> old = npc.data().get("selector" + i);
Collection old = npc.data().get("selector" + i);
if (old != null) {
list.addAll(old);
}
@ -1789,16 +1760,6 @@ public class NMSImpl implements NMSBridge {
}
}
public static void setDespawnDelay(TraderLlama llama, int ticks) {
if (TRADER_DESPAWN_DELAY == null)
return;
try {
TRADER_DESPAWN_DELAY.invoke(llama, ticks);
} catch (Throwable e) {
e.printStackTrace();
}
}
public static void setLife(FishingHook entity, int life) {
try {
FISHING_HOOK_LIFE.invoke(entity, life);
@ -1902,59 +1863,56 @@ public class NMSImpl implements NMSBridge {
private static final Map<Class<?>, net.minecraft.world.entity.EntityType<?>> CITIZENS_ENTITY_TYPES = Maps
.newHashMap();
private static final MethodHandle CRAFT_BOSSBAR_HANDLE_FIELD = NMS.getSetter(CraftBossBar.class, "handle");
private static MethodHandle CRAFTSOUND_GETSOUND = NMS.getMethodHandle(CraftSound.class, "getSound", false,
Sound.class);
private static final float DEFAULT_SPEED = 1F;
private static EntityDataAccessor<Boolean> ENDERMAN_ANGRY = null;
private static final MethodHandle ENTITY_FISH_NUM_IN_SCHOOL = NMS.getSetter(AbstractSchoolingFish.class, "c",
false);
private static EntityDataAccessor<Boolean> ENDERMAN_CREEPY = null;
private static final MethodHandle ENTITY_FISH_NUM_IN_SCHOOL = NMS.getSetter(AbstractSchoolingFish.class, "c");
private static final MethodHandle ENTITY_GET_SOUND_FALL = NMS.getMethodHandle(LivingEntity.class, "getSoundFall",
true, int.class);
private static CustomEntityRegistry ENTITY_REGISTRY;
private static MethodHandle ENTITY_REGISTRY_SETTER;
private static final MethodHandle FISHING_HOOK_HOOKED = NMS.getGetter(FishingHook.class, "av");
private static final MethodHandle FISHING_HOOK_HOOKED_SETTER = NMS.getSetter(FishingHook.class, "av");
private static final MethodHandle FISHING_HOOK_LIFE = NMS.getSetter(FishingHook.class, "ap");
private static final Location FROM_LOCATION = new Location(null, 0, 0, 0);
private static final MethodHandle GOAL_SET_FIELD = NMS.getGetter(GoalSelector.class, "d");
private static final MethodHandle HEAD_HEIGHT = NMS.getSetter(Entity.class, "aX");
private static final MethodHandle HEAD_HEIGHT_METHOD = NMS.getFirstMethodHandle(Entity.class, true, Pose.class,
EntityDimensions.class);
private static final MethodHandle JUMP_FIELD = NMS.getGetter(LivingEntity.class, "bn");
private static final MethodHandle MAKE_REQUEST = NMS.getMethodHandle(YggdrasilAuthenticationService.class,
"makeRequest", true, URL.class, Object.class, Class.class);
private static final MethodHandle NAVIGATION_A = NMS.getMethodHandle(PathNavigation.class, "a", true, int.class);
private static final MethodHandle NAVIGATION_S = NMS.getFinalSetter(PathNavigation.class, "t");
private static final MethodHandle NAVIGATION_WORLD_FIELD = NMS.getSetter(PathNavigation.class, "b");
private static final MethodHandle NAVIGATION_CREATE_PATHFINDER = NMS.getMethodHandle(PathNavigation.class, "a",
true, int.class);
private static final MethodHandle NAVIGATION_PATHFINDER = NMS.getFinalSetter(PathNavigation.class, "t");
private static final MethodHandle NAVIGATION_WORLD_FIELD = NMS.getFirstSetter(PathNavigation.class, Level.class);
public static final Location PACKET_CACHE_LOCATION = new Location(null, 0, 0, 0);
private static final MethodHandle PLAYER_CHUNK_MAP_VIEW_DISTANCE_GETTER = NMS.getGetter(ChunkMap.class, "J");
private static final MethodHandle PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER = NMS.getSetter(ChunkMap.class, "J");
private static final MethodHandle PUFFERFISH_C = NMS.getSetter(Pufferfish.class, "bS");
private static final MethodHandle PUFFERFISH_D = NMS.getSetter(Pufferfish.class, "bT");
private static final MethodHandle RABBIT_DATAWATCHER_FIELD = NMS.getGetter(Rabbit.class, "ch");
private static EntityDataAccessor<Integer> RABBIT_TYPE_DATAWATCHER = null;
private static final Random RANDOM = Util.getFastRandom();
private static final MethodHandle SIZE_FIELD_GETTER = NMS.getGetter(Entity.class, "aW");
private static final MethodHandle SIZE_FIELD_SETTER = NMS.getSetter(Entity.class, "aW");
private static final MethodHandle SIZE_FIELD_GETTER = NMS.getFirstGetter(Entity.class, EntityDimensions.class);
private static final MethodHandle SIZE_FIELD_SETTER = NMS.getFirstSetter(Entity.class, EntityDimensions.class);
private static Field SKULL_PROFILE_FIELD;
private static MethodHandle SOUNDEFFECT_LOCATION = NMS.getGetter(SoundEvent.class, "b");
private static MethodHandle TEAM_FIELD;
private static final MethodHandle TRADER_DESPAWN_DELAY = NMS.getSetter(TraderLlama.class, "ci");
public static final MethodHandle UUID_FIELD = NMS.getSetter(net.minecraft.world.entity.Entity.class, "aj");
static {
try {
ENTITY_REGISTRY = new CustomEntityRegistry((DefaultedRegistry<net.minecraft.world.entity.EntityType<?>>) NMS
.getGetter(Registry.class, "Y").invoke());
ENTITY_REGISTRY = new CustomEntityRegistry(Registry.ENTITY_TYPE);
ENTITY_REGISTRY_SETTER = NMS.getFinalSetter(Registry.class, "Y");
ENTITY_REGISTRY_SETTER.invoke(ENTITY_REGISTRY);
} catch (Throwable e) {
Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
}
try {
ENDERMAN_ANGRY = (EntityDataAccessor<Boolean>) NMS.getField(EnderMan.class, "bU").get(null);
ENDERMAN_CREEPY = (EntityDataAccessor<Boolean>) NMS.getField(EnderMan.class, "bU").get(null);
} catch (IllegalArgumentException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
}
try {
RABBIT_TYPE_DATAWATCHER = (EntityDataAccessor<Integer>) NMS
.getFirstGetter(Rabbit.class, EntityDataAccessor.class).invoke();
} catch (Throwable e) {
e.printStackTrace();
}
}
}

12
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerNavigation.java
View File

@ -220,11 +220,7 @@ public class PlayerNavigation extends PathNavigation {
@Override
protected Path createPath(Set<BlockPos> var0, int var1, boolean var2, int var3, float var4) {
if (var0.isEmpty())
return null;
if (this.mob.getY() < this.level.getMinBuildHeight())
return null;
if (!canUpdatePath())
if (var0.isEmpty() || (this.mob.getY() < this.level.getMinBuildHeight()) || !canUpdatePath())
return null;
if (this.path != null && !this.path.isDone() && var0.contains(this.targetPos))
return this.path;
@ -341,11 +337,7 @@ public class PlayerNavigation extends PathNavigation {
}
protected boolean hasValidPathType(BlockPathTypes var0) {
if (var0 == BlockPathTypes.WATER)
return false;
if (var0 == BlockPathTypes.LAVA)
return false;
if (var0 == BlockPathTypes.OPEN)
if ((var0 == BlockPathTypes.WATER) || (var0 == BlockPathTypes.LAVA) || (var0 == BlockPathTypes.OPEN))
return false;
return true;
}

7
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerNodeEvaluator.java
View File

@ -371,8 +371,7 @@ public class PlayerNodeEvaluator extends PlayerNodeEvaluatorBase {
}
private boolean hasCollisions(AABB var0) {
return this.m.computeIfAbsent(var0, var1 -> Boolean.valueOf(!this.level.noCollision(this.mob, var0)))
.booleanValue();
return this.m.computeIfAbsent(var0, var1 -> !this.level.noCollision(this.mob, var0));
}
private boolean hasPositiveMalus(BlockPos var0) {
@ -385,9 +384,7 @@ public class PlayerNodeEvaluator extends PlayerNodeEvaluatorBase {
}
protected boolean isDiagonalValid(Node var0, Node var1, Node var2, Node var3) {
if (var3 == null || var2 == null || var1 == null)
return false;
if (var3.closed)
if (var3 == null || var2 == null || var1 == null || var3.closed)
return false;
if (var2.y > var0.y || var1.y > var0.y)
return false;