initial work on paperweight & prepare for 1.17

This commit is contained in:
Ben Kerllenevich
2021-06-12 14:51:24 -04:00
parent b3f1d47932
commit d7a6784491
278 changed files with 120 additions and 22332 deletions

View File

@@ -0,0 +1,39 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: 12emin34 <macanovic.emin@gmail.com>
Date: Fri, 21 May 2021 16:58:45 +0200
Subject: [PATCH] Make anvil cumulative cost configurable
diff --git a/src/main/java/net/minecraft/world/inventory/ContainerAnvil.java b/src/main/java/net/minecraft/world/inventory/ContainerAnvil.java
index 77810fbb70bf2e1ad03c28c0d69ceaa63221d94c..e1cc66e382b2251e0fa60f777515d5a110f1684e 100644
--- a/src/main/java/net/minecraft/world/inventory/ContainerAnvil.java
+++ b/src/main/java/net/minecraft/world/inventory/ContainerAnvil.java
@@ -337,7 +337,7 @@ public class ContainerAnvil extends ContainerAnvilAbstract {
}
public static int d(int i) {
- return i * 2 + 1;
+ return net.pl3x.purpur.PurpurConfig.anvilCumulativeCost ? i * 2 + 1 : 0;
}
public void a(String s) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b6938f1ff5688454fbbaa14f1acf3430837cbf01..72c20065e09af656a565c2c1097f26c00b76c1e4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -225,6 +225,7 @@ public class PurpurConfig {
public static boolean enderChestPermissionRows = false;
public static boolean cryingObsidianValidForPortalFrame = false;
public static int beeInsideBeeHive = 3;
+ public static boolean anvilCumulativeCost = true;
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -234,6 +235,7 @@ public class PurpurConfig {
set("settings.blocks.ender_chest.six-rows", oldValue);
set("settings.large-ender-chests", null);
}
+ anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
barrelSixRows = getBoolean("settings.blocks.barrel.six-rows", barrelSixRows);
InventoryType.BARREL.setDefaultSize(barrelSixRows ? 54 : 27);
enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);