From 053fbf28ac8c81c6dbfed593b0e6a08da6cd0895 Mon Sep 17 00:00:00 2001 From: Newwind Date: Sat, 7 Dec 2024 17:04:31 +0000 Subject: [PATCH 1/5] Create 0501-Command-block-materialtags.patch --- .../api/0501-Command-block-materialtags.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 patches/api/0501-Command-block-materialtags.patch diff --git a/patches/api/0501-Command-block-materialtags.patch b/patches/api/0501-Command-block-materialtags.patch new file mode 100644 index 000000000000..13c56da7b2fb --- /dev/null +++ b/patches/api/0501-Command-block-materialtags.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Newwind +Date: Sat, 7 Dec 2024 17:03:37 +0200 +Subject: [PATCH] Add command block material tags + +diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java +index 41eaa815..20009179 100644 +--- a/src/main/java/com/destroystokyo/paper/MaterialTags.java ++++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java +@@ -577,6 +577,13 @@ public class MaterialTags { + public static final MaterialSetTag RAW_ORES = new MaterialSetTag(keyFor("raw_ores")) + .add(Material.RAW_COPPER, Material.RAW_GOLD, Material.RAW_IRON).lock(); + ++ /** ++ * Covers all command block types. ++ */ ++ public static final MaterialSetTag COMMAND_BLOCKS = new MaterialSetTag(keyFor("command_blocks")) ++ .endsWith("_COMMAND_BLOCK") ++ .ensureSize("COMMAND_BLOCKS", 3).lock(); ++ + /** + * Covers the variants of deepslate ores. + */ From a65e6bba5e6f76f7aea73fef5486eb1981d945bd Mon Sep 17 00:00:00 2001 From: Newwind Date: Sat, 7 Dec 2024 17:07:56 +0000 Subject: [PATCH 2/5] Move into material tags patch? --- patches/api/0147-Add-Material-Tags.patch | 18 +++++++++++++++ .../api/0501-Command-block-materialtags.patch | 23 ------------------- 2 files changed, 18 insertions(+), 23 deletions(-) delete mode 100644 patches/api/0501-Command-block-materialtags.patch diff --git a/patches/api/0147-Add-Material-Tags.patch b/patches/api/0147-Add-Material-Tags.patch index 49457e836534..6d17ee7e3b53 100644 --- a/patches/api/0147-Add-Material-Tags.patch +++ b/patches/api/0147-Add-Material-Tags.patch @@ -1245,3 +1245,21 @@ index 0000000000000000000000000000000000000000..91d70cc703192b5a3a48211ee0dadd2e + } + } +} +diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java +index 41eaa815..20009179 100644 +--- a/src/main/java/com/destroystokyo/paper/MaterialTags.java ++++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java +@@ -577,6 +577,13 @@ public class MaterialTags { + public static final MaterialSetTag RAW_ORES = new MaterialSetTag(keyFor("raw_ores")) + .add(Material.RAW_COPPER, Material.RAW_GOLD, Material.RAW_IRON).lock(); + ++ /** ++ * Covers all command block types. ++ */ ++ public static final MaterialSetTag COMMAND_BLOCKS = new MaterialSetTag(keyFor("command_blocks")) ++ .endsWith("_COMMAND_BLOCK") ++ .ensureSize("COMMAND_BLOCKS", 3).lock(); ++ + /** + * Covers the variants of deepslate ores. + */ \ No newline at end of file diff --git a/patches/api/0501-Command-block-materialtags.patch b/patches/api/0501-Command-block-materialtags.patch deleted file mode 100644 index 13c56da7b2fb..000000000000 --- a/patches/api/0501-Command-block-materialtags.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Newwind -Date: Sat, 7 Dec 2024 17:03:37 +0200 -Subject: [PATCH] Add command block material tags - -diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java -index 41eaa815..20009179 100644 ---- a/src/main/java/com/destroystokyo/paper/MaterialTags.java -+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java -@@ -577,6 +577,13 @@ public class MaterialTags { - public static final MaterialSetTag RAW_ORES = new MaterialSetTag(keyFor("raw_ores")) - .add(Material.RAW_COPPER, Material.RAW_GOLD, Material.RAW_IRON).lock(); - -+ /** -+ * Covers all command block types. -+ */ -+ public static final MaterialSetTag COMMAND_BLOCKS = new MaterialSetTag(keyFor("command_blocks")) -+ .endsWith("_COMMAND_BLOCK") -+ .ensureSize("COMMAND_BLOCKS", 3).lock(); -+ - /** - * Covers the variants of deepslate ores. - */ From 13267a2f05fd07613227432ad5d7f84be1d816a2 Mon Sep 17 00:00:00 2001 From: Newwind Date: Sat, 7 Dec 2024 17:10:49 +0000 Subject: [PATCH 3/5] Revert "Move into material tags patch?" This reverts commit 34bbd818cc6f35913f15340dcaa980634920103f. --- patches/api/0147-Add-Material-Tags.patch | 18 --------------- .../api/0501-Command-block-materialtags.patch | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 patches/api/0501-Command-block-materialtags.patch diff --git a/patches/api/0147-Add-Material-Tags.patch b/patches/api/0147-Add-Material-Tags.patch index 6d17ee7e3b53..49457e836534 100644 --- a/patches/api/0147-Add-Material-Tags.patch +++ b/patches/api/0147-Add-Material-Tags.patch @@ -1245,21 +1245,3 @@ index 0000000000000000000000000000000000000000..91d70cc703192b5a3a48211ee0dadd2e + } + } +} -diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java -index 41eaa815..20009179 100644 ---- a/src/main/java/com/destroystokyo/paper/MaterialTags.java -+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java -@@ -577,6 +577,13 @@ public class MaterialTags { - public static final MaterialSetTag RAW_ORES = new MaterialSetTag(keyFor("raw_ores")) - .add(Material.RAW_COPPER, Material.RAW_GOLD, Material.RAW_IRON).lock(); - -+ /** -+ * Covers all command block types. -+ */ -+ public static final MaterialSetTag COMMAND_BLOCKS = new MaterialSetTag(keyFor("command_blocks")) -+ .endsWith("_COMMAND_BLOCK") -+ .ensureSize("COMMAND_BLOCKS", 3).lock(); -+ - /** - * Covers the variants of deepslate ores. - */ \ No newline at end of file diff --git a/patches/api/0501-Command-block-materialtags.patch b/patches/api/0501-Command-block-materialtags.patch new file mode 100644 index 000000000000..13c56da7b2fb --- /dev/null +++ b/patches/api/0501-Command-block-materialtags.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Newwind +Date: Sat, 7 Dec 2024 17:03:37 +0200 +Subject: [PATCH] Add command block material tags + +diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java +index 41eaa815..20009179 100644 +--- a/src/main/java/com/destroystokyo/paper/MaterialTags.java ++++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java +@@ -577,6 +577,13 @@ public class MaterialTags { + public static final MaterialSetTag RAW_ORES = new MaterialSetTag(keyFor("raw_ores")) + .add(Material.RAW_COPPER, Material.RAW_GOLD, Material.RAW_IRON).lock(); + ++ /** ++ * Covers all command block types. ++ */ ++ public static final MaterialSetTag COMMAND_BLOCKS = new MaterialSetTag(keyFor("command_blocks")) ++ .endsWith("_COMMAND_BLOCK") ++ .ensureSize("COMMAND_BLOCKS", 3).lock(); ++ + /** + * Covers the variants of deepslate ores. + */ From fcc2c0e6da4849854e1cd82f16eb016986ada91e Mon Sep 17 00:00:00 2001 From: Newwind Date: Sat, 7 Dec 2024 22:28:48 +0000 Subject: [PATCH 4/5] oops --- patches/api/0501-Command-block-materialtags.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/api/0501-Command-block-materialtags.patch b/patches/api/0501-Command-block-materialtags.patch index 13c56da7b2fb..cac33e1628d0 100644 --- a/patches/api/0501-Command-block-materialtags.patch +++ b/patches/api/0501-Command-block-materialtags.patch @@ -15,7 +15,7 @@ index 41eaa815..20009179 100644 + * Covers all command block types. + */ + public static final MaterialSetTag COMMAND_BLOCKS = new MaterialSetTag(keyFor("command_blocks")) -+ .endsWith("_COMMAND_BLOCK") ++ .endsWith("COMMAND_BLOCK") + .ensureSize("COMMAND_BLOCKS", 3).lock(); + /** From 666f669b1464f7c5f0baf82b20b5d64fd11cbd94 Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Sun, 8 Dec 2024 22:02:32 +0100 Subject: [PATCH 5/5] Merge into correct patch --- patches/api/0147-Add-Material-Tags.patch | 12 ++++++++-- .../api/0501-Command-block-materialtags.patch | 23 ------------------- 2 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 patches/api/0501-Command-block-materialtags.patch diff --git a/patches/api/0147-Add-Material-Tags.patch b/patches/api/0147-Add-Material-Tags.patch index 49457e836534..6029e08ddc7e 100644 --- a/patches/api/0147-Add-Material-Tags.patch +++ b/patches/api/0147-Add-Material-Tags.patch @@ -9,6 +9,7 @@ are related to each other by a trait. Co-authored-by: Jake Potrebic Co-authored-by: Lena Kolb Co-authored-by: Layla Silbernberg +Co-authored-by: Newwind diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java new file mode 100644 @@ -118,10 +119,10 @@ index 0000000000000000000000000000000000000000..28282090c8b3668c11faefa0523f9e4a +} diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java new file mode 100644 -index 0000000000000000000000000000000000000000..41eaa8159f8c028faa118300e95f6a0fb9cfe989 +index 0000000000000000000000000000000000000000..679f78e07a3a2de745fa237165d0a8db5e086f29 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java -@@ -0,0 +1,717 @@ +@@ -0,0 +1,724 @@ +/* + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License + * @@ -702,6 +703,13 @@ index 0000000000000000000000000000000000000000..41eaa8159f8c028faa118300e95f6a0f + .add(Material.RAW_COPPER, Material.RAW_GOLD, Material.RAW_IRON).lock(); + + /** ++ * Covers all command block types. ++ */ ++ public static final MaterialSetTag COMMAND_BLOCKS = new MaterialSetTag(keyFor("command_blocks")) ++ .endsWith("COMMAND_BLOCK") ++ .ensureSize("COMMAND_BLOCKS", 3).lock(); ++ ++ /** + * Covers the variants of deepslate ores. + */ + public static final MaterialSetTag DEEPSLATE_ORES = new MaterialSetTag(keyFor("deepslate_ores")) diff --git a/patches/api/0501-Command-block-materialtags.patch b/patches/api/0501-Command-block-materialtags.patch deleted file mode 100644 index cac33e1628d0..000000000000 --- a/patches/api/0501-Command-block-materialtags.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Newwind -Date: Sat, 7 Dec 2024 17:03:37 +0200 -Subject: [PATCH] Add command block material tags - -diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java -index 41eaa815..20009179 100644 ---- a/src/main/java/com/destroystokyo/paper/MaterialTags.java -+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java -@@ -577,6 +577,13 @@ public class MaterialTags { - public static final MaterialSetTag RAW_ORES = new MaterialSetTag(keyFor("raw_ores")) - .add(Material.RAW_COPPER, Material.RAW_GOLD, Material.RAW_IRON).lock(); - -+ /** -+ * Covers all command block types. -+ */ -+ public static final MaterialSetTag COMMAND_BLOCKS = new MaterialSetTag(keyFor("command_blocks")) -+ .endsWith("COMMAND_BLOCK") -+ .ensureSize("COMMAND_BLOCKS", 3).lock(); -+ - /** - * Covers the variants of deepslate ores. - */