Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Some tweaks

Browse Source
This commit is contained in:
AlphaKR93
2024-05-06 20:44:16 +09:00
parent 1cd33a9a1d
commit fac51e8b64
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/api/0004-Various-API-Tweaks.patch Normal file
View File

@@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Mon, 6 May 2024 20:43:37 +0900
Subject: [PATCH] Various API Tweaks
diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
index be212b4fbeabab32a4dab6ae554768c368efaa88..2c08e2000fc1c2cfaae9b82c57c0f2a5079311f1 100644
--- a/src/main/java/com/destroystokyo/paper/MaterialTags.java
+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
@@ -584,6 +584,15 @@ public class MaterialTags {
.add(material -> material.name().startsWith("DEEPSLATE_") && material.name().endsWith("_ORE"))
.ensureSize("DEEPSLATE_ORES", 8).lock();
+ // Plazma start - Various API Tweaks
+ /**
+ * Covers the variants of stone ores.
+ */
+ public static final MaterialSetTag STONE_ORES = new MaterialSetTag(keyFor("stone_ores"))
+ .add(material -> !material.name().startsWith("DEEPSLATE_") && !material.name().startsWith("NETHER_") && material.name().endsWith("_ORE"))
+ .ensureSize("STONE_ORES", 8).lock();
+ // Plazma end - Various API Tweaks
+
/**
* Covers the variants of raw ore blocks.
*/

4
patches/server/0005-Plazma-Configurations.patch
View File

@@ -980,7 +980,7 @@ index 0000000000000000000000000000000000000000..d8006ae086c18a4ef43906d516eba0d5
+} +}
diff --git a/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java diff --git a/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..af27a8199c46c2995424a60893439c0dbc162791 index 0000000000000000000000000000000000000000..1cda921b88e0c01f9376eaafddde6d20e72fd346
--- /dev/null --- /dev/null
+++ b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java +++ b/src/main/java/org/plazmamc/plazma/configurations/PlazmaConfigurations.java
@@ -0,0 +1,217 @@ @@ -0,0 +1,217 @@
@@ -1012,7 +1012,7 @@ index 0000000000000000000000000000000000000000..af27a8199c46c2995424a60893439c0d
+@DefaultQualifier(NonNull.class) +@DefaultQualifier(NonNull.class)
+public class PlazmaConfigurations extends Configurations<GlobalConfiguration, WorldConfigurations> { +public class PlazmaConfigurations extends Configurations<GlobalConfiguration, WorldConfigurations> {
+ +
+ public static final Logger LOGGER = LogUtils.getLogger(); + public static final Logger LOGGER = LogUtils.getClassLogger();
+ public static final String CONFIG_DIR = "config"; + public static final String CONFIG_DIR = "config";
+ static final String GLOBAL_CONFIG_FILE_NAME = "plazma-global.yml"; + static final String GLOBAL_CONFIG_FILE_NAME = "plazma-global.yml";
+ static final String WORLD_DEFAULTS_CONFIG_FILE_NAME = "plazma-world-defaults.yml"; + static final String WORLD_DEFAULTS_CONFIG_FILE_NAME = "plazma-world-defaults.yml";