mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
93 lines
5.1 KiB
Diff
93 lines
5.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Encode42 <me@encode42.dev>
|
|
Date: Wed, 29 Sep 2021 13:37:57 -0400
|
|
Subject: [PATCH] Config for grindstones
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
|
|
index 0bdf874ddb951daf8d469575a44144504472d12d..855ff86696d27f7029ec8bd2558207078a62525b 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
|
|
@@ -130,7 +130,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
|
|
Enchantment enchantment = (Enchantment) entry.getKey();
|
|
Integer integer = (Integer) entry.getValue();
|
|
|
|
- if (!enchantment.isCurse()) {
|
|
+ if (!org.purpurmc.purpur.PurpurConfig.grindstoneIgnoredEnchants.contains(enchantment)) { // Purpur
|
|
j += enchantment.getMinCost(integer);
|
|
}
|
|
}
|
|
@@ -230,7 +230,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
|
|
Entry<Enchantment, Integer> entry = (Entry) iterator.next();
|
|
Enchantment enchantment = (Enchantment) entry.getKey();
|
|
|
|
- if (!enchantment.isCurse() || EnchantmentHelper.getItemEnchantmentLevel(enchantment, itemstack2) == 0) {
|
|
+ if (!org.purpurmc.purpur.PurpurConfig.grindstoneIgnoredEnchants.contains(enchantment) || EnchantmentHelper.getItemEnchantmentLevel(enchantment, itemstack2) == 0) { // Purpur
|
|
itemstack2.enchant(enchantment, (Integer) entry.getValue());
|
|
}
|
|
}
|
|
@@ -251,7 +251,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
|
|
|
|
itemstack1.setCount(amount);
|
|
Map<Enchantment, Integer> map = (Map) EnchantmentHelper.getEnchantments(item).entrySet().stream().filter((entry) -> {
|
|
- return ((Enchantment) entry.getKey()).isCurse();
|
|
+ return org.purpurmc.purpur.PurpurConfig.grindstoneIgnoredEnchants.contains((Enchantment) entry.getKey()); // Purpur
|
|
}).collect(Collectors.toMap(Entry::getKey, Entry::getValue));
|
|
|
|
EnchantmentHelper.setEnchantments(map, itemstack1);
|
|
@@ -267,6 +267,20 @@ public class GrindstoneMenu extends AbstractContainerMenu {
|
|
itemstack1.setRepairCost(AnvilMenu.calculateIncreasedRepairCost(itemstack1.getBaseRepairCost()));
|
|
}
|
|
|
|
+ // Purpur start
|
|
+ if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveAttributes && itemstack1.getTag() != null) {
|
|
+ for (String key : itemstack1.getTag().getAllKeys()) {
|
|
+ if (!key.equals("display")) {
|
|
+ itemstack1.getTag().remove(key);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveDisplay && itemstack1.getTag() != null) {
|
|
+ itemstack1.getTag().remove("display");
|
|
+ }
|
|
+ // Purpur end
|
|
+
|
|
return itemstack1;
|
|
}
|
|
|
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
index f59247132b92abafc20437f958b69a7964676423..147175986954fbcc66a960efd65c3f60cd6016d3 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
@@ -319,6 +319,9 @@ public class PurpurConfig {
|
|
public static int beeInsideBeeHive = 3;
|
|
public static boolean anvilCumulativeCost = true;
|
|
public static int lightningRodRange = 128;
|
|
+ public static Set<Enchantment> grindstoneIgnoredEnchants = new HashSet<>();
|
|
+ public static boolean grindstoneRemoveAttributes = false;
|
|
+ public static boolean grindstoneRemoveDisplay = false;
|
|
private static void blockSettings() {
|
|
if (version < 3) {
|
|
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
|
|
@@ -353,6 +356,19 @@ public class PurpurConfig {
|
|
beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
|
|
anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
|
|
lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);
|
|
+ ArrayList<String> defaultCurses = new ArrayList<>(){{
|
|
+ add("minecraft:binding_curse");
|
|
+ add("minecraft:vanishing_curse");
|
|
+ }};
|
|
+ if (version < 24 && !getBoolean("settings.blocks.grindstone.ignore-curses", true)) {
|
|
+ defaultCurses.clear();
|
|
+ }
|
|
+ getList("settings.blocks.grindstone.ignored-enchants", defaultCurses).forEach(key -> {
|
|
+ Enchantment enchantment = Registry.ENCHANTMENT.get(new ResourceLocation(key.toString()));
|
|
+ grindstoneIgnoredEnchants.add(enchantment);
|
|
+ });
|
|
+ grindstoneRemoveAttributes = getBoolean("settings.blocks.grindstone.remove-attributes", grindstoneRemoveAttributes);
|
|
+ grindstoneRemoveDisplay = getBoolean("settings.blocks.grindstone.remove-name-and-lore", grindstoneRemoveDisplay);
|
|
}
|
|
|
|
public static boolean allowInfinityMending = false;
|