Skip to content

Commit 3533c50

Browse files
nossr50nossr50
committed
Spring-cleaning round 1: remove deprecated Player.updateInventory
1 parent 2a8be52 commit 3533c50

File tree

12 files changed

+42
-156
lines changed

12 files changed

+42
-156
lines changed

‎src/main/java/com/gmail/nossr50/listeners/InventoryListener.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.gmail.nossr50.datatypes.skills.SubSkillType;
77
import com.gmail.nossr50.events.fake.FakeBrewEvent;
88
import com.gmail.nossr50.mcMMO;
9-
import com.gmail.nossr50.runnables.player.PlayerUpdateInventoryTask;
109
import com.gmail.nossr50.skills.alchemy.Alchemy;
1110
import com.gmail.nossr50.skills.alchemy.AlchemyPotionBrewer;
1211
import com.gmail.nossr50.util.ContainerMetadataUtils;
@@ -270,7 +269,6 @@ public void onInventoryClickEventNormal(InventoryClickEvent event) {
270269
}
271270

272271
event.setCancelled(true);
273-
AlchemyPotionBrewer.scheduleUpdate(inventory);
274272
AlchemyPotionBrewer.scheduleCheck(stand);
275273
return;
276274
default:
@@ -294,7 +292,6 @@ public void onInventoryClickEventNormal(InventoryClickEvent event) {
294292
event.setCurrentItem(cursor.clone());
295293
event.setCursor(null);
296294

297-
AlchemyPotionBrewer.scheduleUpdate(inventory);
298295
AlchemyPotionBrewer.scheduleCheck(stand);
299296
} else if (click == ClickType.RIGHT) {
300297
event.setCancelled(true);
@@ -308,7 +305,6 @@ public void onInventoryClickEventNormal(InventoryClickEvent event) {
308305
event.setCurrentItem(one);
309306
event.setCursor(rest);
310307

311-
AlchemyPotionBrewer.scheduleUpdate(inventory);
312308
AlchemyPotionBrewer.scheduleCheck(stand);
313309
}
314310
}
@@ -371,7 +367,6 @@ public void onInventoryDragEvent(InventoryDragEvent event) {
371367
}
372368

373369
event.setCancelled(true);
374-
AlchemyPotionBrewer.scheduleUpdate(inventory);
375370
}
376371
}
377372

@@ -511,9 +506,6 @@ public void onCraftItem(CraftItemEvent event) {
511506
return;
512507
}
513508
}
514-
515-
mcMMO.p.getFoliaLib().getScheduler()
516-
.runAtEntity(whoClicked, new PlayerUpdateInventoryTask((Player) whoClicked));
517509
}
518510

519511
}

‎src/main/java/com/gmail/nossr50/listeners/PlayerListener.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,6 @@ public void onPlayerInteractLowest(PlayerInteractEvent event) {
737737
// Make sure the player knows what he's doing when trying to repair an enchanted item
738738
if (repairManager.checkConfirmation(true)) {
739739
repairManager.handleRepair(heldItem);
740-
player.updateInventory();
741740
}
742741
}
743742
/* SALVAGE CHECKS */
@@ -756,7 +755,6 @@ else if (type == Salvage.anvilMaterial
756755
if (salvageManager.checkConfirmation(true)) {
757756
SkillUtils.removeAbilityBoostsFromInventory(player);
758757
salvageManager.handleSalvage(clickedBlock.getLocation(), heldItem);
759-
player.updateInventory();
760758
}
761759
}
762760

@@ -926,7 +924,6 @@ public void onPlayerInteractMonitor(PlayerInteractEvent event) {
926924
// Bukkit.getPluginManager().callEvent(fakeSwing);
927925
player.getInventory().getItemInMainHand()
928926
.setAmount(heldItem.getAmount() - 1);
929-
player.updateInventory();
930927
if (herbalismManager.processGreenThumbBlocks(blockState)
931928
&& EventUtils.simulateBlockBreak(block, player)) {
932929
blockState.update(true);

‎src/main/java/com/gmail/nossr50/party/ShareHandler.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,8 @@ public static XPGainReason getSharedXpGainReason(XPGainReason xpGainReason) {
172172
}
173173

174174
private static void awardDrop(Player winningPlayer, ItemStack drop) {
175-
if (winningPlayer.getInventory().addItem(drop).size() != 0) {
175+
if (!winningPlayer.getInventory().addItem(drop).isEmpty()) {
176176
winningPlayer.getWorld().dropItem(winningPlayer.getLocation(), drop);
177177
}
178-
179-
winningPlayer.updateInventory();
180178
}
181179
}

‎src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,13 @@ private void updateBrewingTime() {
159159
private void finish() {
160160
if (mmoPlayer == null) {
161161
// Still need to finish brewing if the player is null
162-
AlchemyPotionBrewer.finishBrewing(brewingStand, null, false);
162+
AlchemyPotionBrewer.finishBrewing(brewingStand, null);
163163
} else {
164164
final McMMOPlayerBrewEvent event = new McMMOPlayerBrewEvent(mmoPlayer, brewingStand);
165165
mcMMO.p.getServer().getPluginManager().callEvent(event);
166166

167167
if (!event.isCancelled()) {
168-
AlchemyPotionBrewer.finishBrewing(brewingStand, mmoPlayer, false);
168+
AlchemyPotionBrewer.finishBrewing(brewingStand, mmoPlayer);
169169
}
170170
}
171171

@@ -175,7 +175,7 @@ private void finish() {
175175
public void finishImmediately() {
176176
this.cancel();
177177

178-
AlchemyPotionBrewer.finishBrewing(brewingStand, mmoPlayer, true);
178+
AlchemyPotionBrewer.finishBrewing(brewingStand, mmoPlayer);
179179
Alchemy.brewingStandMap.remove(brewingStand.getLocation());
180180
}
181181

‎src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.gmail.nossr50.datatypes.skills.alchemy.PotionStage;
77
import com.gmail.nossr50.events.fake.FakeBrewEvent;
88
import com.gmail.nossr50.mcMMO;
9-
import com.gmail.nossr50.runnables.player.PlayerUpdateInventoryTask;
109
import com.gmail.nossr50.runnables.skills.AlchemyBrewCheckTask;
1110
import com.gmail.nossr50.util.Permissions;
1211
import com.gmail.nossr50.util.player.UserManager;
@@ -18,11 +17,9 @@
1817
import org.bukkit.Material;
1918
import org.bukkit.block.BlockState;
2019
import org.bukkit.block.BrewingStand;
21-
import org.bukkit.entity.HumanEntity;
2220
import org.bukkit.entity.Player;
2321
import org.bukkit.event.inventory.ClickType;
2422
import org.bukkit.inventory.BrewerInventory;
25-
import org.bukkit.inventory.Inventory;
2623
import org.bukkit.inventory.InventoryView;
2724
import org.bukkit.inventory.ItemStack;
2825
import org.jetbrains.annotations.NotNull;
@@ -164,8 +161,7 @@ private static List<ItemStack> getValidIngredients(@Nullable McMMOPlayer mmoPlay
164161
? 1 : mmoPlayer.getAlchemyManager().getTier());
165162
}
166163

167-
public static void finishBrewing(BlockState brewingStand, @Nullable McMMOPlayer mmoPlayer,
168-
boolean forced) {
164+
public static void finishBrewing(BlockState brewingStand, @Nullable McMMOPlayer mmoPlayer) {
169165
// Check if the brewing stand block state is an actual brewing stand
170166
if (!(brewingStand instanceof BrewingStand)) {
171167
return;
@@ -257,11 +253,6 @@ public static void finishBrewing(BlockState brewingStand, @Nullable McMMOPlayer
257253
}
258254
}
259255
}
260-
261-
// If the brewing was not forced by external conditions, schedule a new update
262-
if (!forced) {
263-
scheduleUpdate(inventory);
264-
}
265256
}
266257

267258
public static boolean transferItems(InventoryView view, int fromSlot, ClickType click) {
@@ -356,13 +347,4 @@ public static void scheduleCheck(@NotNull BrewingStand brewingStand) {
356347
mcMMO.p.getFoliaLib().getScheduler().runAtLocation(
357348
brewingStand.getLocation(), new AlchemyBrewCheckTask(brewingStand));
358349
}
359-
360-
public static void scheduleUpdate(Inventory inventory) {
361-
for (HumanEntity humanEntity : inventory.getViewers()) {
362-
if (humanEntity instanceof Player) {
363-
mcMMO.p.getFoliaLib().getScheduler().runAtEntity(humanEntity,
364-
new PlayerUpdateInventoryTask((Player) humanEntity));
365-
}
366-
}
367-
}
368350
}

‎src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,6 @@ public void shakeCheck(@NotNull LivingEntity target) {
596596
drop.getAmount() - 1) : null);
597597
drop.setAmount(1);
598598
}
599-
600-
targetPlayer.updateInventory();
601599
}
602600
break;
603601

‎src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import static com.gmail.nossr50.util.ItemUtils.removeItemIncludingOffHand;
55
import static com.gmail.nossr50.util.Misc.TICK_CONVERSION_FACTOR;
66
import static com.gmail.nossr50.util.Misc.getBlockCenter;
7+
import static com.gmail.nossr50.util.Permissions.isSubSkillEnabled;
8+
import static com.gmail.nossr50.util.skills.RankUtils.hasUnlockedSubskill;
79
import static com.gmail.nossr50.util.text.ConfigStringUtils.getMaterialConfigString;
810
import static java.util.Objects.requireNonNull;
911

@@ -30,7 +32,6 @@
3032
import com.gmail.nossr50.util.EventUtils;
3133
import com.gmail.nossr50.util.ItemUtils;
3234
import com.gmail.nossr50.util.MetadataConstants;
33-
import com.gmail.nossr50.util.Misc;
3435
import com.gmail.nossr50.util.Permissions;
3536
import com.gmail.nossr50.util.player.NotificationManager;
3637
import com.gmail.nossr50.util.random.ProbabilityUtil;
@@ -62,25 +63,31 @@
6263
public class HerbalismManager extends SkillManager {
6364
private final static HashMap<String, Integer> plantBreakLimits;
6465

65-
private static final String CACTUS_STR = "cactus";
66+
private static final String CACTUS_ID = "cactus";
6667
private static final String CACTUS_FLOWER_STR = "cactus_flower";
68+
private static final String BAMBOO_ID = "bamboo";
69+
private static final String SUGAR_CANE_ID = "sugar_cane";
70+
private static final String KELP_ID = "kelp";
71+
private static final String KELP_PLANT_ID = "kelp_plant";
72+
private static final String CHORUS_PLANT_ID = "chorus_plant";
73+
private static final String SWEET_BERRY_BUSH_ID = "sweet_berry_bush";
6774

6875
static {
6976
plantBreakLimits = new HashMap<>();
70-
plantBreakLimits.put(CACTUS_STR, 3);
71-
plantBreakLimits.put("bamboo", 20);
72-
plantBreakLimits.put("sugar_cane", 3);
73-
plantBreakLimits.put("kelp", 26);
74-
plantBreakLimits.put("kelp_plant", 26);
75-
plantBreakLimits.put("chorus_plant", 22);
77+
plantBreakLimits.put(CACTUS_ID, 3);
78+
plantBreakLimits.put(BAMBOO_ID, 20);
79+
plantBreakLimits.put(SUGAR_CANE_ID, 3);
80+
plantBreakLimits.put(KELP_ID, 26);
81+
plantBreakLimits.put(KELP_PLANT_ID, 26);
82+
plantBreakLimits.put(CHORUS_PLANT_ID, 22);
7683
}
7784

7885
public HerbalismManager(McMMOPlayer mmoPlayer) {
7986
super(mmoPlayer, PrimarySkillType.HERBALISM);
8087
}
8188

8289
public boolean canGreenThumbBlock(BlockState blockState) {
83-
if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_GREEN_THUMB)) {
90+
if (!hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_GREEN_THUMB)) {
8491
return false;
8592
}
8693

@@ -98,7 +105,7 @@ public boolean canUseShroomThumb(BlockState blockState) {
98105
return false;
99106
}
100107

101-
if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_SHROOM_THUMB)) {
108+
if (!hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_SHROOM_THUMB)) {
102109
return false;
103110
}
104111

@@ -110,12 +117,12 @@ public boolean canUseShroomThumb(BlockState blockState) {
110117
|| itemType == Material.RED_MUSHROOM)
111118
&& inventory.contains(Material.BROWN_MUSHROOM, 1)
112119
&& inventory.contains(Material.RED_MUSHROOM, 1)
113-
&& Permissions.isSubSkillEnabled(player, SubSkillType.HERBALISM_SHROOM_THUMB);
120+
&& isSubSkillEnabled(player, SubSkillType.HERBALISM_SHROOM_THUMB);
114121
}
115122

116123
public void processBerryBushHarvesting(@NotNull BlockState blockState) {
117124
/* Check if the player is harvesting a berry bush */
118-
if (blockState.getType().toString().equalsIgnoreCase("sweet_berry_bush")) {
125+
if (blockState.getType().toString().equalsIgnoreCase(SWEET_BERRY_BUSH_ID)) {
119126
if (mmoPlayer.isDebugMode()) {
120127
mmoPlayer.getPlayer().sendMessage("Processing sweet berry bush rewards");
121128
}
@@ -167,7 +174,7 @@ public CheckBushAge(@NotNull Block block, @NotNull McMMOPlayer mmoPlayer, int xp
167174
public void run() {
168175
BlockState blockState = block.getState();
169176

170-
if (blockState.getType().toString().equalsIgnoreCase("sweet_berry_bush")) {
177+
if (blockState.getType().toString().equalsIgnoreCase(SWEET_BERRY_BUSH_ID)) {
171178
if (blockState.getBlockData() instanceof Ageable ageable) {
172179

173180
if (ageable.getAge() <= 1) {
@@ -180,16 +187,16 @@ public void run() {
180187

181188

182189
public boolean canUseHylianLuck() {
183-
if (!RankUtils.hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_HYLIAN_LUCK)) {
190+
if (!hasUnlockedSubskill(getPlayer(), SubSkillType.HERBALISM_HYLIAN_LUCK)) {
184191
return false;
185192
}
186193

187-
return Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.HERBALISM_HYLIAN_LUCK);
194+
return isSubSkillEnabled(getPlayer(), SubSkillType.HERBALISM_HYLIAN_LUCK);
188195
}
189196

190197
public boolean canActivateAbility() {
191-
return mmoPlayer.getToolPreparationMode(ToolType.HOE) && Permissions.greenTerra(
192-
getPlayer());
198+
return mmoPlayer.getToolPreparationMode(ToolType.HOE)
199+
&& Permissions.greenTerra(getPlayer());
193200
}
194201

195202
public boolean isGreenTerraActive() {
@@ -379,8 +386,8 @@ private void processHerbalismOnBlocksBroken(BlockBreakEvent blockBreakEvent,
379386
public void checkDoubleDropsOnBrokenPlants(Player player, Collection<Block> brokenPlants) {
380387

381388
//Only proceed if skill unlocked and permission enabled
382-
if (!RankUtils.hasUnlockedSubskill(player, SubSkillType.HERBALISM_DOUBLE_DROPS)
383-
|| !Permissions.isSubSkillEnabled(player, SubSkillType.HERBALISM_DOUBLE_DROPS)) {
389+
if (!hasUnlockedSubskill(player, SubSkillType.HERBALISM_DOUBLE_DROPS)
390+
|| !isSubSkillEnabled(player, SubSkillType.HERBALISM_DOUBLE_DROPS)) {
384391
return;
385392
}
386393

@@ -470,7 +477,7 @@ public void awardXPForPlantBlocks(HashSet<Block> brokenPlants) {
470477
/*
471478
* Unnatural Blocks
472479
*/
473-
//If its a Crop we need to reward XP when its fully grown
480+
//If it's a Crop we need to reward XP when its fully grown
474481
if (isAgeableAndFullyMature(plantData) && !isBizarreAgeable(plantData)) {
475482
xpToReward += ExperienceConfig.getInstance()
476483
.getXp(PrimarySkillType.HERBALISM, brokenBlockNewState.getType());
@@ -660,7 +667,7 @@ private void addCactusBlocks(Block currentBlock, Set<Block> traversed) {
660667
}
661668

662669
private boolean isCactus(Material material) {
663-
return material.getKey().getKey().equalsIgnoreCase(CACTUS_STR)
670+
return material.getKey().getKey().equalsIgnoreCase(CACTUS_ID)
664671
|| material.getKey().getKey().equalsIgnoreCase(CACTUS_FLOWER_STR);
665672
}
666673

@@ -799,7 +806,6 @@ public boolean processShroomThumb(BlockState blockState) {
799806

800807
playerInventory.removeItem(new ItemStack(Material.BROWN_MUSHROOM));
801808
playerInventory.removeItem(new ItemStack(Material.RED_MUSHROOM));
802-
getPlayer().updateInventory();
803809

804810
if (!ProbabilityUtil.isSkillRNGSuccessful(SubSkillType.HERBALISM_SHROOM_THUMB, mmoPlayer)) {
805811
NotificationManager.sendPlayerInformation(getPlayer(),

‎src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@ private void processCallOfTheWild() {
425425
int itemAmountAfterPayingCost =
426426
itemInMainHand.getAmount() - tamingSummon.getItemAmountRequired();
427427
itemInMainHand.setAmount(itemAmountAfterPayingCost);
428-
player.updateInventory();
429428
}
430429

431430
} else {

0 commit comments

Comments
 (0)