Fix wrong success being used

NucleoidMC · Nov 10, 2024 · 264e991 · 264e991
1 parent c48f23f
commit 264e991
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 19 deletions.
diff --git a/src/main/java/xyz/nucleoid/extras/lobby/PlayerLobbyState.java b/src/main/java/xyz/nucleoid/extras/lobby/PlayerLobbyState.java
@@ -85,23 +85,19 @@ private ActionResult collectTater(Block block, ItemStack stack, ServerPlayerEnti
         if (!NEItems.canUseTaters(player) || !(block instanceof TinyPotatoBlock tater)) return ActionResult.PASS;
 
         boolean alreadyAdded = this.collectedTaters.contains(tater);
-        Text message;
 
-        if (alreadyAdded) {
-            message = Text.translatable("text.nucleoid_extras.tater_box.already_added", block.getName()).formatted(Formatting.RED);
-        } else {
+        if (!alreadyAdded) {
             this.collectedTaters.add(tater);
 
             // Update the tooltip of tater boxes in player's inventory
             PolymerUtils.reloadInventory(player);
 
-            message = Text.translatable("text.nucleoid_extras.tater_box.added", block.getName());
+            player.sendMessage(Text.translatable("text.nucleoid_extras.tater_box.added", block.getName()), true);
         }
 
-        player.sendMessage(message, true);
         triggerCollectCriterion(player, tater, this.collectedTaters.size());
 
-        return alreadyAdded ? ActionResult.FAIL : ActionResult.SUCCESS;
+        return alreadyAdded ? ActionResult.PASS : ActionResult.SUCCESS_SERVER;
     }
 
     private static void triggerCollectCriterion(ServerPlayerEntity player, TinyPotatoBlock tater, int count) {

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/block/ContributorStatueBlock.java b/src/main/java/xyz/nucleoid/extras/lobby/block/ContributorStatueBlock.java
@@ -55,7 +55,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
 
             if (blockEntity.isPresent()) {
                 blockEntity.get().openEditScreen((ServerPlayerEntity) player);
-                return ActionResult.SUCCESS;
+                return ActionResult.SUCCESS_SERVER;
             }
         }
 

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/block/tater/BellTaterBlock.java b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/BellTaterBlock.java
@@ -57,7 +57,7 @@ public void onProjectileHit(World world, BlockState state, BlockHitResult hit, P
 	@Override
 	public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
 		super.onUse(state, world, pos, player, hit);
-		return this.ring(world, hit, player) ? ActionResult.SUCCESS : ActionResult.PASS;
+		return this.ring(world, hit, player) ? ActionResult.SUCCESS_SERVER : ActionResult.PASS;
 	}
 
 	public boolean ring(World world, BlockHitResult hitResult, @Nullable PlayerEntity player) {

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/block/tater/BotanicalPotatoBlock.java b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/BotanicalPotatoBlock.java
@@ -72,7 +72,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
             model.jumpTime = 20;
         }
 
-        return ActionResult.SUCCESS;
+        return ActionResult.SUCCESS_SERVER;
     }
 
     private class Model extends ElementHolder {

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/block/tater/DiceTaterBlock.java b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/DiceTaterBlock.java
@@ -57,7 +57,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
             world.playSound(null, pos, SoundEvents.UI_CARTOGRAPHY_TABLE_TAKE_RESULT, SoundCategory.BLOCKS, 1, pitch);
         }
 
-        return ActionResult.SUCCESS;
+        return ActionResult.SUCCESS_SERVER;
     }
 
     @Override

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterBlock.java b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/LuckyTaterBlock.java
@@ -90,7 +90,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
             }
         }
 
-        return ActionResult.SUCCESS;
+        return ActionResult.SUCCESS_SERVER;
     }
 
     private Block getDrop(ServerWorld world) {

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/block/tater/TinyPotatoBlock.java b/src/main/java/xyz/nucleoid/extras/lobby/block/tater/TinyPotatoBlock.java
@@ -107,6 +107,6 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
             this.spawnBlockParticles(serverWorld, pos, particleEffect);
         }
 
-        return ActionResult.SUCCESS;
+        return ActionResult.SUCCESS_SERVER;
     }
 }
diff --git a/src/main/java/xyz/nucleoid/extras/lobby/item/GamePortalOpenerItem.java b/src/main/java/xyz/nucleoid/extras/lobby/item/GamePortalOpenerItem.java
@@ -34,7 +34,7 @@ public ActionResult use(World world, PlayerEntity user, Hand hand) {
             portal.requestJoin((ServerPlayerEntity) user, false);
         }
 
-        return ActionResult.SUCCESS;
+        return ActionResult.SUCCESS_SERVER;
     }
 
     @Override

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/item/LaunchFeatherItem.java b/src/main/java/xyz/nucleoid/extras/lobby/item/LaunchFeatherItem.java
@@ -26,7 +26,7 @@ public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity
         LauncherComponent launcher = stack.get(NEDataComponentTypes.LAUNCHER);
 
         if (!user.getWorld().isClient() && LaunchPadBlock.tryLaunch(entity, user, SoundEvents.ENTITY_ENDER_DRAGON_FLAP, SoundCategory.PLAYERS, launcher)) {
-            return ActionResult.SUCCESS;
+            return ActionResult.SUCCESS_SERVER;
         }
 
         return ActionResult.PASS;

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/item/QuickArmorStandItem.java b/src/main/java/xyz/nucleoid/extras/lobby/item/QuickArmorStandItem.java
@@ -70,7 +70,7 @@ public ActionResult useOnBlock(ItemUsageContext context) {
                 }
 
                 itemStack.decrement(1);
-                return ActionResult.SUCCESS;
+                return ActionResult.SUCCESS_SERVER;
             } else {
                 return ActionResult.FAIL;
             }

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/item/RuleBookItem.java b/src/main/java/xyz/nucleoid/extras/lobby/item/RuleBookItem.java
@@ -50,7 +50,7 @@ public ActionResult use(World world, PlayerEntity user, Hand hand) {
             serverPlayer.networkHandler.sendPacket(new OpenWrittenBookS2CPacket(hand));
         }
         user.incrementStat(Stats.USED.getOrCreateStat(this));
-        return ActionResult.SUCCESS;
+        return ActionResult.SUCCESS_SERVER;
     }
 
     @Override

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/item/tater/TaterBoxItem.java b/src/main/java/xyz/nucleoid/extras/lobby/item/tater/TaterBoxItem.java
@@ -70,7 +70,7 @@ public ActionResult use(World world, PlayerEntity user, Hand hand) {
             this.openTaterBox(world, (ServerPlayerEntity) user, stack, hand);
         }
 
-        return ActionResult.SUCCESS;
+        return ActionResult.SUCCESS_SERVER;
     }
 
     @Override

diff --git a/src/main/java/xyz/nucleoid/extras/lobby/item/tater/TaterGuidebookItem.java b/src/main/java/xyz/nucleoid/extras/lobby/item/tater/TaterGuidebookItem.java
@@ -60,7 +60,7 @@ public ActionResult use(World world, PlayerEntity user, Hand hand) {
                     showGuidebook(player, taterPositionMap.positions(), stack);
                 }
 
-                return ActionResult.SUCCESS;
+                return ActionResult.SUCCESS_SERVER;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            return ActionResult.SUCCESS;
+            return ActionResult.SUCCESS_SERVER;
         }
         private Block getDrop(ServerWorld world) {
@@ Expand Down @@