2021-08-25 05:49:11 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
|
|
Date: Tue, 24 Aug 2021 16:48:35 -0500
|
|
|
|
Subject: [PATCH] Shift right click to use exp for mending
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
2022-04-27 17:01:41 +08:00
|
|
|
index f9f7afa0bf2989aaef2f0e8456fe3c93a226b6d0..00dee850e9ae93ed4e8209c67da2da6aac8ae22a 100644
|
2021-08-25 05:49:11 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
2022-04-27 17:01:41 +08:00
|
|
|
@@ -547,6 +547,7 @@ public class ServerPlayerGameMode {
|
2021-08-25 05:49:11 +08:00
|
|
|
public InteractionHand interactHand;
|
|
|
|
public ItemStack interactItemStack;
|
|
|
|
public InteractionResult useItemOn(ServerPlayer player, Level world, ItemStack stack, InteractionHand hand, BlockHitResult hitResult) {
|
|
|
|
+ if (shiftClickMended(stack)) return InteractionResult.SUCCESS; // Purpur
|
|
|
|
BlockPos blockposition = hitResult.getBlockPos();
|
|
|
|
BlockState iblockdata = world.getBlockState(blockposition);
|
|
|
|
InteractionResult enuminteractionresult = InteractionResult.PASS;
|
2022-04-27 17:01:41 +08:00
|
|
|
@@ -640,4 +641,18 @@ public class ServerPlayerGameMode {
|
2021-08-25 05:49:11 +08:00
|
|
|
public void setLevel(ServerLevel world) {
|
|
|
|
this.level = world;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Purpur start
|
|
|
|
+ public boolean shiftClickMended(ItemStack itemstack) {
|
|
|
|
+ if (this.player.level.purpurConfig.shiftRightClickRepairsMendingPoints > 0 && this.player.isShiftKeyDown()) {
|
|
|
|
+ int points = Math.min(this.player.totalExperience, this.player.level.purpurConfig.shiftRightClickRepairsMendingPoints);
|
|
|
|
+ if (points > 0 && itemstack.isDamaged() && net.minecraft.world.item.enchantment.EnchantmentHelper.getItemEnchantmentLevel(net.minecraft.world.item.enchantment.Enchantments.MENDING, itemstack) > 0) {
|
|
|
|
+ this.player.giveExperiencePoints(-points);
|
|
|
|
+ this.player.level.addFreshEntity(new net.minecraft.world.entity.ExperienceOrb(this.player.level, this.player.getX(), this.player.getY(), this.player.getZ(), points, org.bukkit.entity.ExperienceOrb.SpawnReason.UNKNOWN, this.player, this.player));
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ // Purpur end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2022-04-27 17:01:41 +08:00
|
|
|
index 80a8bd732d7840a441aae23a558c1aed68b2dce7..a0965856851a4a3337c55d9796952737bb63b26d 100644
|
2021-08-25 05:49:11 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
2022-03-15 08:07:36 +08:00
|
|
|
@@ -1979,6 +1979,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
2021-08-25 05:49:11 +08:00
|
|
|
|
|
|
|
boolean cancelled;
|
|
|
|
if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {
|
|
|
|
+ if (this.player.gameMode.shiftClickMended(itemstack)) return; // Purpur
|
|
|
|
org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemstack, enumhand);
|
|
|
|
cancelled = event.useItemInHand() == Event.Result.DENY;
|
|
|
|
} else {
|
2021-11-29 21:30:53 +08:00
|
|
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
2022-03-15 08:07:36 +08:00
|
|
|
index 5240abedf1d90471250fac0dad32252ba22f7855..30b988908f249cd370caafaaaca7ff032ec23ed5 100644
|
2021-11-29 21:30:53 +08:00
|
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
2022-01-18 11:38:01 +08:00
|
|
|
@@ -404,6 +404,7 @@ public class PurpurWorldConfig {
|
2021-08-25 05:49:11 +08:00
|
|
|
public boolean playerArmorSwappingCreativeMakesCopy = true;
|
|
|
|
public boolean playerRidableInWater = false;
|
|
|
|
public boolean playerRemoveBindingWithWeakness = false;
|
|
|
|
+ public int shiftRightClickRepairsMendingPoints = 0;
|
|
|
|
private void playerSettings() {
|
|
|
|
if (PurpurConfig.version < 19) {
|
|
|
|
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
|
2022-01-18 11:38:01 +08:00
|
|
|
@@ -431,6 +432,7 @@ public class PurpurWorldConfig {
|
2021-08-25 05:49:11 +08:00
|
|
|
playerArmorSwappingCreativeMakesCopy = getBoolean("gameplay-mechanics.player.armor-click-equip.creative-makes-copy", playerArmorSwappingCreativeMakesCopy);
|
|
|
|
playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);
|
|
|
|
playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
|
|
|
|
+ shiftRightClickRepairsMendingPoints = getInt("gameplay-mechanics.player.shift-right-click-repairs-mending-points", shiftRightClickRepairsMendingPoints);
|
|
|
|
}
|
|
|
|
|
|
|
|
public int snowballDamage = -1;
|