From b89073d4c1509e04fe3d1a4b29211ba255c863fa Mon Sep 17 00:00:00 2001 From: fullwall Date: Fri, 22 Jul 2022 00:43:40 +0800 Subject: [PATCH] Attempt to fix title updating --- .../net/citizensnpcs/trait/ShopTrait.java | 176 +++++++++++++----- .../nms/v1_19_R1/entity/AllayController.java | 3 - .../v1_19_R1/entity/AxolotlController.java | 1 - .../nms/v1_19_R1/entity/BatController.java | 1 - .../nms/v1_19_R1/entity/BeeController.java | 3 - .../nms/v1_19_R1/entity/BlazeController.java | 3 - .../nms/v1_19_R1/entity/CatController.java | 3 - .../v1_19_R1/entity/CaveSpiderController.java | 3 - .../v1_19_R1/entity/ChickenController.java | 3 - .../nms/v1_19_R1/entity/CodController.java | 1 - .../nms/v1_19_R1/entity/CowController.java | 3 - .../v1_19_R1/entity/CreeperController.java | 3 - .../v1_19_R1/entity/DolphinController.java | 1 - .../v1_19_R1/entity/DrownedController.java | 3 - .../entity/EnderDragonController.java | 3 - .../v1_19_R1/entity/EndermanController.java | 3 - .../v1_19_R1/entity/EndermiteController.java | 3 - .../nms/v1_19_R1/entity/EvokerController.java | 3 - .../nms/v1_19_R1/entity/FoxController.java | 3 - .../nms/v1_19_R1/entity/FrogController.java | 1 - .../nms/v1_19_R1/entity/GhastController.java | 5 +- .../nms/v1_19_R1/entity/GiantController.java | 3 - .../v1_19_R1/entity/GlowSquidController.java | 3 - .../nms/v1_19_R1/entity/GoatController.java | 3 - .../v1_19_R1/entity/GuardianController.java | 3 - .../entity/GuardianElderController.java | 3 - .../nms/v1_19_R1/entity/HorseController.java | 1 - .../entity/HorseDonkeyController.java | 1 - .../v1_19_R1/entity/HorseMuleController.java | 1 - .../entity/HorseSkeletonController.java | 1 - .../entity/HorseZombieController.java | 1 - .../v1_19_R1/entity/IllusionerController.java | 3 - .../v1_19_R1/entity/IronGolemController.java | 3 - .../nms/v1_19_R1/entity/LlamaController.java | 1 - .../v1_19_R1/entity/MagmaCubeController.java | 1 - .../v1_19_R1/entity/MobEntityController.java | 4 + .../entity/MushroomCowController.java | 3 - .../nms/v1_19_R1/entity/OcelotController.java | 3 - .../nms/v1_19_R1/entity/PandaController.java | 3 - .../nms/v1_19_R1/entity/ParrotController.java | 3 - .../v1_19_R1/entity/PhantomController.java | 1 - .../nms/v1_19_R1/entity/PigController.java | 3 - .../v1_19_R1/entity/PigZombieController.java | 3 - .../entity/PiglinBruteController.java | 3 - .../nms/v1_19_R1/entity/PiglinController.java | 3 - .../v1_19_R1/entity/PillagerController.java | 3 - .../v1_19_R1/entity/PolarBearController.java | 3 - .../v1_19_R1/entity/PufferFishController.java | 1 - .../nms/v1_19_R1/entity/RabbitController.java | 3 - .../v1_19_R1/entity/RavagerController.java | 3 - .../nms/v1_19_R1/entity/SalmonController.java | 1 - .../nms/v1_19_R1/entity/SheepController.java | 3 - .../v1_19_R1/entity/ShulkerController.java | 3 - .../v1_19_R1/entity/SilverfishController.java | 3 - .../v1_19_R1/entity/SkeletonController.java | 3 - .../entity/SkeletonStrayController.java | 3 - .../entity/SkeletonWitherController.java | 3 - .../nms/v1_19_R1/entity/SlimeController.java | 1 - .../v1_19_R1/entity/SnowmanController.java | 3 - .../nms/v1_19_R1/entity/SpiderController.java | 3 - .../nms/v1_19_R1/entity/SquidController.java | 3 - .../v1_19_R1/entity/StriderController.java | 3 - .../v1_19_R1/entity/TadpoleController.java | 1 - .../entity/TraderLlamaController.java | 1 - .../entity/TropicalFishController.java | 1 - .../nms/v1_19_R1/entity/TurtleController.java | 1 - .../nms/v1_19_R1/entity/VexController.java | 1 - .../v1_19_R1/entity/VillagerController.java | 1 - .../v1_19_R1/entity/VindicatorController.java | 3 - .../entity/WanderingTraderController.java | 3 - .../nms/v1_19_R1/entity/WardenController.java | 3 - .../nms/v1_19_R1/entity/WitchController.java | 3 - .../nms/v1_19_R1/entity/WitherController.java | 3 - .../nms/v1_19_R1/entity/WolfController.java | 3 - .../nms/v1_19_R1/entity/ZoglinController.java | 3 - .../nms/v1_19_R1/entity/ZombieController.java | 3 - .../v1_19_R1/entity/ZombieHuskController.java | 3 - .../entity/ZombieVillagerController.java | 3 - .../nms/v1_19_R1/util/NMSImpl.java | 19 +- 79 files changed, 152 insertions(+), 233 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java b/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java index 35e09dece..51c5fb162 100644 --- a/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java @@ -4,11 +4,13 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryType; +import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -17,6 +19,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.gui.CitizensInventoryClickEvent; import net.citizensnpcs.api.gui.ClickHandler; import net.citizensnpcs.api.gui.InputMenus; @@ -69,10 +72,15 @@ public class ShopTrait extends Trait { public void display(Player sender) { if (viewPermission != null && !sender.hasPermission(viewPermission)) return; + if (pages.size() == 0) { + sender.sendMessage(ChatColor.RED + "Empty shop"); + return; + } + InventoryMenu.createSelfRegistered(new NPCShopViewer(this)).present(sender); } public void displayEditor(Player sender) { - InventoryMenu.createSelfRegistered(new NPCShopEditor(this)).present(sender); + InventoryMenu.createSelfRegistered(new NPCShopSettings(this)).present(sender); } public String getName() { @@ -174,7 +182,7 @@ public class ShopTrait extends Trait { edit.setItemStack(new ItemStack(Material.BOOK), "Edit page"); edit.addClickHandler(evt -> { evt.setCancelled(true); - ctx.getMenu().transition(new NPCShopPageEditor(shop.getOrCreatePage(page))); + ctx.getMenu().transition(new NPCShopPageSettings(shop.getOrCreatePage(page))); }); } @@ -190,44 +198,6 @@ public class ShopTrait extends Trait { } } - @Menu(title = "NPC Shop Editor", type = InventoryType.HOPPER, dimensions = { 0, 5 }) - public static class NPCShopEditor extends InventoryMenuPage { - private MenuContext ctx; - private final NPCShop shop; - - public NPCShopEditor(NPCShop shop) { - this.shop = shop; - } - - @Override - public void initialise(MenuContext ctx) { - this.ctx = ctx; - } - - @MenuSlot(slot = { 0, 4 }, material = Material.FEATHER, amount = 1, lore = "Edit shop items") - public void onEditItems(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { - event.setCancelled(true); - ctx.getMenu().transition(new NPCShopContentsEditor(shop)); - } - - @MenuSlot(slot = { 0, 2 }, material = Material.OAK_SIGN, amount = 1, lore = "Edit shop permission") - public void onPermissionChange(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { - event.setCancelled(true); - ctx.getMenu().transition(InputMenus.stringSetter(shop::getRequiredPermission, shop::setPermission)); - } - - @MenuSlot(slot = { 0, 0 }, material = Material.BOOK, amount = 1, lore = "Edit shop type") - public void onShopTypeChange(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { - event.setCancelled(true); - ctx.getMenu().transition(InputMenus. picker("Edit shop type", chosen -> { - shop.type = chosen.getValue(); - }, Choice. of(ShopType.BUY, Material.DIAMOND, "Players buy items", shop.type == ShopType.BUY), - Choice.of(ShopType.SELL, Material.EMERALD, "Players sell items", shop.type == ShopType.SELL), - Choice.of(ShopType.COMMAND, Material.ENDER_EYE, "Clicks trigger commands only", - shop.type == ShopType.COMMAND))); - } - } - public static class NPCShopItem implements Cloneable { @Persist private List cost; @@ -244,6 +214,9 @@ public class ShopTrait extends Trait { throw new Error(e); } } + + public void onClick(NPCShop shop, CitizensInventoryClickEvent event) { + } } @Menu(title = "NPC Shop Item Editor", type = InventoryType.CHEST, dimensions = { 5, 9 }) @@ -319,14 +292,14 @@ public class ShopTrait extends Trait { } } - @MenuSlot(slot = { 4, 4 }, material = Material.TNT, amount = 1, lore = "Remove") + @MenuSlot(slot = { 4, 4 }, material = Material.TNT, amount = 1, title = "Remove") public void onRemove(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { original = null; event.setCancelled(true); ctx.getMenu().transitionBack(); } - @MenuSlot(slot = { 4, 5 }, material = Material.EMERALD_BLOCK, amount = 1, lore = "Save") + @MenuSlot(slot = { 4, 5 }, material = Material.EMERALD_BLOCK, amount = 1, title = "Save") public void onSave(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { original = modified; event.setCancelled(true); @@ -360,11 +333,11 @@ public class ShopTrait extends Trait { } @Menu(title = "NPC Shop Page Editor", type = InventoryType.CHEST, dimensions = { 5, 9 }) - public static class NPCShopPageEditor extends InventoryMenuPage { + public static class NPCShopPageSettings extends InventoryMenuPage { private MenuContext ctx; private final NPCShopPage page; - public NPCShopPageEditor(NPCShopPage page) { + public NPCShopPageSettings(NPCShopPage page) { this.page = page; } @@ -390,6 +363,121 @@ public class ShopTrait extends Trait { } } + @Menu(title = "NPC Shop Editor", type = InventoryType.CHEST, dimensions = { 1, 9 }) + public static class NPCShopSettings extends InventoryMenuPage { + private MenuContext ctx; + private final NPCShop shop; + + public NPCShopSettings(NPCShop shop) { + this.shop = shop; + } + + @Override + public void initialise(MenuContext ctx) { + this.ctx = ctx; + } + + @MenuSlot(slot = { 0, 4 }, material = Material.FEATHER, amount = 1, title = "Edit shop items") + public void onEditItems(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { + event.setCancelled(true); + ctx.getMenu().transition(new NPCShopContentsEditor(shop)); + } + + @MenuSlot(slot = { 0, 8 }, material = Material.CHEST, amount = 1, title = "Open shop") + public void onOpenShop(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { + event.setCancelled(true); + ctx.getMenu().transition(new NPCShopViewer(shop)); + } + + @MenuSlot(slot = { 0, 2 }, material = Material.OAK_SIGN, amount = 1, title = "Edit shop permission") + public void onPermissionChange(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { + event.setCancelled(true); + ctx.getMenu().transition(InputMenus.stringSetter(shop::getRequiredPermission, shop::setPermission)); + } + + @MenuSlot(slot = { 0, 6 }, material = Material.NAME_TAG, amount = 1, title = "Edit shop title") + public void onSetTitle(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { + event.setCancelled(true); + ctx.getMenu().transition(InputMenus.stringSetter(() -> shop.title, newTitle -> { + shop.title = newTitle.isEmpty() ? null : newTitle; + })); + } + + @MenuSlot(slot = { 0, 0 }, material = Material.BOOK, amount = 1, title = "Edit shop type") + public void onShopTypeChange(InventoryMenuSlot slot, CitizensInventoryClickEvent event) { + event.setCancelled(true); + ctx.getMenu().transition(InputMenus. picker("Edit shop type", chosen -> { + shop.type = chosen.getValue(); + }, Choice. of(ShopType.BUY, Material.DIAMOND, "Players buy items", shop.type == ShopType.BUY), + Choice.of(ShopType.SELL, Material.EMERALD, "Players sell items", shop.type == ShopType.SELL), + Choice.of(ShopType.COMMAND, Material.ENDER_EYE, "Clicks trigger commands only", + shop.type == ShopType.COMMAND))); + } + } + + @Menu(title = "Shop", type = InventoryType.CHEST, dimensions = { 5, 9 }) + public static class NPCShopViewer extends InventoryMenuPage { + private MenuContext ctx; + private int currentPage = 0; + private final NPCShop shop; + + public NPCShopViewer(NPCShop shop) { + this.shop = shop; + } + + public void changePage(int newPage) { + this.currentPage = newPage; + NPCShopPage page = shop.pages.get(currentPage); + if (page.title != null && !page.title.isEmpty()) { + Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), () -> { + ctx.setTitle(page.title); + }, 1); + } + for (int i = 0; i < ctx.getInventory().getSize(); i++) { + ctx.getSlot(i).clear(); + NPCShopItem item = page.getItem(i); + if (item == null) + continue; + + ctx.getSlot(i).setItemStack(item.display); + ctx.getSlot(i).addClickHandler(evt -> { + evt.setCancelled(true); + item.onClick(shop, evt); + }); + } + InventoryMenuSlot prev = ctx.getSlot(4 * 9 + 3); + InventoryMenuSlot next = ctx.getSlot(4 * 9 + 5); + prev.clear(); + if (currentPage > 0) { + prev.setItemStack(new ItemStack(Material.FEATHER, 1), "Previous page (" + (currentPage) + ")"); + prev.addClickHandler(evt -> { + evt.setCancelled(true); + changePage(currentPage - 1); + }); + } + + next.clear(); + if (currentPage + 1 < shop.pages.size()) { + next.setItemStack(new ItemStack(Material.FEATHER, 1), "Next page (" + (currentPage + 1) + ")"); + next.addClickHandler(evt -> { + evt.setCancelled(true); + changePage(currentPage + 1); + }); + } + } + + @Override + public Inventory createInventory(String title) { + return Bukkit.createInventory(null, 45, shop.title == null || shop.title.isEmpty() ? "Shop" : shop.title); + } + + @Override + public void initialise(MenuContext ctx) { + this.ctx = ctx; + changePage(currentPage); + } + } + public enum ShopType { BUY, COMMAND, diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java index 489f966e0..1bc08558d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java @@ -63,9 +63,6 @@ public class AllayController extends MobEntityController { public EntityAllayNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java index 6fb8c7eb6..da1db647a 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AxolotlController.java @@ -66,7 +66,6 @@ public class AxolotlController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); this.getAttribute(Attributes.MOVEMENT_SPEED) diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java index b0114eccb..b9540f043 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BatController.java @@ -52,7 +52,6 @@ public class BatController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); setFlying(false); } } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java index 3182e651d..73456e963 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BeeController.java @@ -51,9 +51,6 @@ public class BeeController extends MobEntityController { public EntityBeeNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java index 268d9bd39..3618b7232 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/BlazeController.java @@ -51,9 +51,6 @@ public class BlazeController extends MobEntityController { public EntityBlazeNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java index cba533b47..30b6ce7dc 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CatController.java @@ -56,9 +56,6 @@ public class CatController extends MobEntityController { public EntityCatNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java index 02a0b930a..7f0fddf42 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CaveSpiderController.java @@ -54,9 +54,6 @@ public class CaveSpiderController extends MobEntityController { public EntityCaveSpiderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java index 6912ae406..a7a2aaca1 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ChickenController.java @@ -56,9 +56,6 @@ public class ChickenController extends MobEntityController { public EntityChickenNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java index d7f0a14e8..8b6d50b5c 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CodController.java @@ -63,7 +63,6 @@ public class CodController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java index a775a7a4d..80422f89d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CowController.java @@ -61,9 +61,6 @@ public class CowController extends MobEntityController { public EntityCowNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java index d47420031..8e007e533 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/CreeperController.java @@ -56,9 +56,6 @@ public class CreeperController extends MobEntityController { public EntityCreeperNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java index 2ebbc6897..fb4110b1a 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DolphinController.java @@ -58,7 +58,6 @@ public class DolphinController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); this.getAttribute(Attributes.MOVEMENT_SPEED) diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java index 5de63a333..9c4f61f22 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/DrownedController.java @@ -54,9 +54,6 @@ public class DrownedController extends MobEntityController { public EntityDrownedNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java index 0b989a3d3..5a312a97d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EnderDragonController.java @@ -52,9 +52,6 @@ public class EnderDragonController extends MobEntityController { public EntityEnderDragonNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java index bcb50ee83..286c51625 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermanController.java @@ -57,9 +57,6 @@ public class EndermanController extends MobEntityController { public EntityEndermanNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java index 98f2b3e83..daffbd02f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EndermiteController.java @@ -54,9 +54,6 @@ public class EndermiteController extends MobEntityController { public EntityEndermiteNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java index 03a976d8f..5ce9a349c 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EvokerController.java @@ -48,9 +48,6 @@ public class EvokerController extends MobEntityController { public EntityEvokerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java index b252f8595..cb5ad4978 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FoxController.java @@ -50,9 +50,6 @@ public class FoxController extends MobEntityController { public EntityFoxNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java index 0aea7bd0e..08b5d0d25 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/FrogController.java @@ -51,7 +51,6 @@ public class FrogController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); croakAnimationState.start(1); } } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java index 6ea0d9d80..fb5e09524 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GhastController.java @@ -45,9 +45,6 @@ public class GhastController extends MobEntityController { public EntityGhastNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override @@ -69,7 +66,7 @@ public class GhastController extends MobEntityController { public void customServerAiStep() { if (npc != null) { npc.update(); - NMSImpl.updateMinecraftAIState(npc, this); + NMSImpl.updateMinecraftAIState(npc, this); } super.customServerAiStep(); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java index b02399932..348812c43 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GiantController.java @@ -48,9 +48,6 @@ public class GiantController extends MobEntityController { public EntityGiantNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java index 1428c7496..2d2737ded 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GlowSquidController.java @@ -48,9 +48,6 @@ public class GlowSquidController extends MobEntityController { public EntityGlowSquidNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java index 82ff0f35b..0ab548595 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GoatController.java @@ -50,9 +50,6 @@ public class GoatController extends MobEntityController { public EntityGoatNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java index ba13f5534..2e0cebc30 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianController.java @@ -48,9 +48,6 @@ public class GuardianController extends MobEntityController { public EntityGuardianNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java index ecc5d06f8..3fac3c37f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/GuardianElderController.java @@ -48,9 +48,6 @@ public class GuardianElderController extends MobEntityController { public EntityGuardianElderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java index edc353d33..03bca22bf 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseController.java @@ -64,7 +64,6 @@ public class HorseController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); org.bukkit.entity.Horse horse = (org.bukkit.entity.Horse) getBukkitEntity(); horse.setDomestication(horse.getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java index da818a159..23af60f99 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseDonkeyController.java @@ -64,7 +64,6 @@ public class HorseDonkeyController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.Donkey) getBukkitEntity()) .setDomestication(((org.bukkit.entity.Donkey) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java index bd0d13597..55bb4e176 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseMuleController.java @@ -64,7 +64,6 @@ public class HorseMuleController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.Mule) getBukkitEntity()) .setDomestication(((org.bukkit.entity.Mule) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java index 83c75d4c4..b8e2b729a 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseSkeletonController.java @@ -64,7 +64,6 @@ public class HorseSkeletonController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.SkeletonHorse) getBukkitEntity()) .setDomestication(((org.bukkit.entity.SkeletonHorse) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java index 5a0b5a1ff..3788c7dd4 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/HorseZombieController.java @@ -64,7 +64,6 @@ public class HorseZombieController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.ZombieHorse) getBukkitEntity()) .setDomestication(((org.bukkit.entity.ZombieHorse) getBukkitEntity()).getMaxDomestication()); baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue(); diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java index fc21a7315..cefc71fa0 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IllusionerController.java @@ -48,9 +48,6 @@ public class IllusionerController extends MobEntityController { public EntityIllusionerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java index 63b7ac06f..06714ea24 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/IronGolemController.java @@ -48,9 +48,6 @@ public class IronGolemController extends MobEntityController { public EntityIronGolemNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java index 0adafc645..93c2665bd 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/LlamaController.java @@ -60,7 +60,6 @@ public class LlamaController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.Llama) getBukkitEntity()) .setDomestication(((org.bukkit.entity.Llama) getBukkitEntity()).getMaxDomestication()); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java index c9be5c231..09bf04652 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MagmaCubeController.java @@ -54,7 +54,6 @@ public class MagmaCubeController extends MobEntityController { this.npc = (CitizensNPC) npc; if (npc != null) { setSize(3, true); - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new PlayerMoveControl(this); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MobEntityController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MobEntityController.java index 883c6afef..294abeacf 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MobEntityController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MobEntityController.java @@ -15,6 +15,7 @@ import net.citizensnpcs.nms.v1_19_R1.util.NMSImpl; import net.citizensnpcs.npc.AbstractEntityController; import net.citizensnpcs.util.Util; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.Mob; import net.minecraft.world.level.Level; public abstract class MobEntityController extends AbstractEntityController { @@ -30,6 +31,9 @@ public abstract class MobEntityController extends AbstractEntityController { EntityType type = NMSImpl.getEntityType(clazz); net.minecraft.world.entity.Entity entity = createEntityFromClass(type, ((CraftWorld) at.getWorld()).getHandle(), npc); + if (entity instanceof Mob) { + NMSImpl.clearGoals(npc, ((Mob) entity).goalSelector, ((Mob) entity).targetSelector); + } entity.absMoveTo(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch()); // entity.onGround isn't updated right away - we approximate here so diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java index 2cf9c7653..96d9fd222 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/MushroomCowController.java @@ -53,9 +53,6 @@ public class MushroomCowController extends MobEntityController { public EntityMushroomCowNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java index 852833409..d45b82423 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/OcelotController.java @@ -51,9 +51,6 @@ public class OcelotController extends MobEntityController { public EntityOcelotNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java index 81a8a0f8d..01a87b6f4 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PandaController.java @@ -50,9 +50,6 @@ public class PandaController extends MobEntityController { public EntityPandaNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java index e8cd5cd92..06ae10c71 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ParrotController.java @@ -48,9 +48,6 @@ public class ParrotController extends MobEntityController { public EntityParrotNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java index 1a8663044..a7d68e25e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PhantomController.java @@ -58,7 +58,6 @@ public class PhantomController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); setNoAi(true); this.oldMoveController = this.moveControl; this.oldLookController = this.lookControl; diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java index 76cdab633..6d30f1bb5 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigController.java @@ -51,9 +51,6 @@ public class PigController extends MobEntityController { public EntityPigNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java index 3c4c6bfb1..80ca77fd2 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PigZombieController.java @@ -49,9 +49,6 @@ public class PigZombieController extends MobEntityController { public EntityPigZombieNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java index f5bc44852..2bda4d139 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinBruteController.java @@ -48,9 +48,6 @@ public class PiglinBruteController extends MobEntityController { public EntityPiglinBruteNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java index f6331ff36..ecf63d339 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PiglinController.java @@ -48,9 +48,6 @@ public class PiglinController extends MobEntityController { public EntityPiglinNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java index 61dd32657..5109f7116 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PillagerController.java @@ -50,9 +50,6 @@ public class PillagerController extends MobEntityController { public EntityPillagerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java index 85981ef07..0cb6dff8b 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PolarBearController.java @@ -47,9 +47,6 @@ public class PolarBearController extends MobEntityController { public EntityPolarBearNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java index 62a883bed..d396cc854 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/PufferFishController.java @@ -60,7 +60,6 @@ public class PufferFishController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java index a851ae5d4..9a69cd6d0 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RabbitController.java @@ -52,9 +52,6 @@ public class RabbitController extends MobEntityController { public EntityRabbitNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java index f8b85b9f2..a37e5d616 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/RavagerController.java @@ -50,9 +50,6 @@ public class RavagerController extends MobEntityController { public EntityRavagerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java index 99c308e6b..c426a0784 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SalmonController.java @@ -57,7 +57,6 @@ public class SalmonController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java index 165ace90c..dab37a22b 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SheepController.java @@ -50,9 +50,6 @@ public class SheepController extends MobEntityController { public EntitySheepNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java index e0555e61d..106a1931b 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ShulkerController.java @@ -49,9 +49,6 @@ public class ShulkerController extends MobEntityController { public EntityShulkerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java index bc686722b..e1777ac0e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SilverfishController.java @@ -48,9 +48,6 @@ public class SilverfishController extends MobEntityController { public EntitySilverfishNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java index 9186d6482..b67de0324 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonController.java @@ -48,9 +48,6 @@ public class SkeletonController extends MobEntityController { public EntitySkeletonNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java index 48a1af8f9..e0db3f084 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonStrayController.java @@ -48,9 +48,6 @@ public class SkeletonStrayController extends MobEntityController { public EntityStrayNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java index e10e55e23..c10df18cb 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SkeletonWitherController.java @@ -48,9 +48,6 @@ public class SkeletonWitherController extends MobEntityController { public EntitySkeletonWitherNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java index d5f6ef255..357414682 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SlimeController.java @@ -54,7 +54,6 @@ public class SlimeController extends MobEntityController { this.npc = (CitizensNPC) npc; if (npc != null) { setSize(3, true); - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new PlayerMoveControl(this); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java index 7e52ddd4a..c3048225a 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SnowmanController.java @@ -49,9 +49,6 @@ public class SnowmanController extends MobEntityController { public EntitySnowmanNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java index 9793704bf..e13a2573d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SpiderController.java @@ -48,9 +48,6 @@ public class SpiderController extends MobEntityController { public EntitySpiderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java index b622bd2d5..a80e0a7fc 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/SquidController.java @@ -48,9 +48,6 @@ public class SquidController extends MobEntityController { public EntitySquidNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java index 7474b0ee5..96315deef 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/StriderController.java @@ -48,9 +48,6 @@ public class StriderController extends MobEntityController { public EntityStriderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java index 8e23d29b1..c38341b0f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TadpoleController.java @@ -58,7 +58,6 @@ public class TadpoleController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java index 745878f52..c93b6f48d 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TraderLlamaController.java @@ -60,7 +60,6 @@ public class TraderLlamaController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); ((org.bukkit.entity.TraderLlama) getBukkitEntity()) .setDomestication(((org.bukkit.entity.TraderLlama) getBukkitEntity()).getMaxDomestication()); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java index da00e8070..2bdd9f5d0 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TropicalFishController.java @@ -57,7 +57,6 @@ public class TropicalFishController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.moveControl = new MoveControl(this); } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java index e8d6e3427..66ab4cc6a 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/TurtleController.java @@ -55,7 +55,6 @@ public class TurtleController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); this.oldMoveController = this.moveControl; this.oldJumpController = this.jumpControl; this.moveControl = new MoveControl(this); diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java index ce0046dc1..29f9a7ce1 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VexController.java @@ -46,7 +46,6 @@ public class VexController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); setNoGravity(true); } } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java index fd88c3071..6717ca8ab 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VillagerController.java @@ -58,7 +58,6 @@ public class VillagerController extends MobEntityController { super(types, level); this.npc = (CitizensNPC) npc; if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.3); } } diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java index d277aa9a1..36921a721 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/VindicatorController.java @@ -50,9 +50,6 @@ public class VindicatorController extends MobEntityController { public EntityVindicatorNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java index 690ff3c6f..2263e446e 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WanderingTraderController.java @@ -57,9 +57,6 @@ public class WanderingTraderController extends MobEntityController { public EntityWanderingTraderNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java index 8bb7fc89f..486dd1c45 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WardenController.java @@ -48,9 +48,6 @@ public class WardenController extends MobEntityController { public EntityWardenNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java index 672512b4b..d07dc1e8f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitchController.java @@ -48,9 +48,6 @@ public class WitchController extends MobEntityController { public EntityWitchNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java index 4ada37f98..9dcd6e8f7 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WitherController.java @@ -45,9 +45,6 @@ public class WitherController extends MobEntityController { public EntityWitherNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java index e6b032c80..84e35aa27 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/WolfController.java @@ -52,9 +52,6 @@ public class WolfController extends MobEntityController { public EntityWolfNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java index b2dd89d37..436ac5bb7 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZoglinController.java @@ -48,9 +48,6 @@ public class ZoglinController extends MobEntityController { public EntityZoglinNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java index 952625b56..5459e710f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieController.java @@ -48,9 +48,6 @@ public class ZombieController extends MobEntityController { public EntityZombieNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java index f178ab016..ff873e42f 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieHuskController.java @@ -48,9 +48,6 @@ public class ZombieHuskController extends MobEntityController { public EntityZombieHuskNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java index bdd94964e..7ae5ea436 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/ZombieVillagerController.java @@ -48,9 +48,6 @@ public class ZombieVillagerController extends MobEntityController { public EntityZombieVillagerNPC(EntityType types, Level level, NPC npc) { super(types, level); this.npc = (CitizensNPC) npc; - if (npc != null) { - NMSImpl.clearGoals(npc, goalSelector, targetSelector); - } } @Override diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java index 5be814c24..9a6f8689c 100644 --- a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java +++ b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/util/NMSImpl.java @@ -292,7 +292,6 @@ import net.minecraft.world.entity.projectile.FishingHook; import net.minecraft.world.entity.vehicle.AbstractMinecart; import net.minecraft.world.inventory.AnvilMenu; import net.minecraft.world.inventory.ContainerLevelAccess; -import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -1493,7 +1492,20 @@ public class NMSImpl implements NMSBridge { menuType = MenuType.CARTOGRAPHY_TABLE; break; case CHEST: - menuType = MenuType.GENERIC_9x5; + int sz = view.getTopInventory().getSize(); + if (sz > 45) { + menuType = MenuType.GENERIC_9x6; + } else if (sz > 36) { + menuType = MenuType.GENERIC_9x5; + } else if (sz > 27) { + menuType = MenuType.GENERIC_9x4; + } else if (sz > 18) { + menuType = MenuType.GENERIC_9x3; + } else if (sz > 9) { + menuType = MenuType.GENERIC_9x2; + } else { + menuType = MenuType.GENERIC_9x1; + } break; case COMPOSTER: break; @@ -1545,8 +1557,7 @@ public class NMSImpl implements NMSBridge { menuType = MenuType.CRAFTING; break; } - InventoryMenu active = handle.inventoryMenu; - handle.connection.send(new ClientboundOpenScreenPacket(active.containerId, menuType, + handle.connection.send(new ClientboundOpenScreenPacket(handle.inventoryMenu.containerId, menuType, MutableComponent.create(new LiteralContents(newTitle)))); player.updateInventory(); }