Upstream has released updates that appear to apply and compile correctly. [Purpur Changes] PurpurMC/Purpur@e86a1b6: Updated Upstream (Paper) PurpurMC/Purpur@962ee30: Updated Upstream (Paper) PurpurMC/Purpur@74d1b4c: Updated Upstream (Paper) PurpurMC/Purpur@e2e8c61: Updated Upstream (Paper) PurpurMC/Purpur@7a01fd8: Updated Upstream (Paper) PurpurMC/Purpur@34c18f0: Updated Upstream (Paper) PurpurMC/Purpur@ca668ab: Updated Upstream (Paper) PurpurMC/Purpur@200178d: Updated Upstream (Paper) PurpurMC/Purpur@9968cbb: Updated Upstream (Paper) PurpurMC/Purpur@db09358: Fix clamp-levels option not being true by default (#1609) PurpurMC/Purpur@f289b6a: Updated Upstream (Paper) PurpurMC/Purpur@959c29d: Fix Tridents giving errors without having an Elytra equipped (#1612) PurpurMC/Purpur@68c1612: Fix villagers not spawning when the `follow-emerald-blocks` option is enabled (#1611) PurpurMC/Purpur@5b75c68: fix `bypass-mob-griefing` not being the inverse of mobgriefing gamerule, closes #1603 PurpurMC/Purpur@55d4309: Updated Upstream (Paper) PurpurMC/Purpur@0601f87: Updated Upstream (Paper) PurpurMC/Purpur@06dde9d: Add Ridable and Attribute options for Creaking mob (#1613) PurpurMC/Purpur@420a1ce: Set the bee's `takes-damage-from-water` option to true by default (#1614) PurpurMC/Purpur@2b6f273: Updated Upstream (Paper) PurpurMC/Purpur@504f311: Updated Upstream (Paper) PurpurMC/Purpur@2b694c9: Updated Upstream (Paper) PurpurMC/Purpur@96d7ef7: Updated Upstream (Paper) PurpurMC/Purpur@e141f68: Updated Upstream (Paper) PurpurMC/Purpur@7f6f667: Updated Upstream (Pufferfish) PurpurMC/Purpur@de20ba9: ignore `minecart.max-speed` config value if using minecart experiment, closes #1618 PurpurMC/Purpur@03062a8: fix ridable mobs not being controllable, closes #1620 PurpurMC/Purpur@0493ac3: Updated Upstream (Paper) PurpurMC/Purpur@16ce24a: fix(ridables/creaking): override tick method in look/move control
135 lines
3.9 KiB
Diff
135 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: AlphaKR93 <dev@alpha93.kr>
|
|
Date: Sun, 5 Nov 2023 10:47:05 +0900
|
|
Subject: [PATCH] Setup basic configuration sections
|
|
|
|
|
|
diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
|
|
index d8006ae086c18a4ef43906d516eba0d5fd397f5f..aff5c68bc715c6ea9b5b808e5a94cbac9a3725ba 100644
|
|
--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
|
|
+++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
|
|
@@ -3,6 +3,7 @@ package org.plazmamc.plazma.configurations;
|
|
import io.papermc.paper.configuration.Configuration;
|
|
import io.papermc.paper.configuration.ConfigurationPart;
|
|
import org.jetbrains.annotations.NotNull;
|
|
+import org.spongepowered.configurate.objectmapping.meta.PostProcess;
|
|
import org.spongepowered.configurate.objectmapping.meta.Setting;
|
|
|
|
@SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "InnerClassMayBeStatic"})
|
|
@@ -23,4 +24,49 @@ public class GlobalConfiguration extends ConfigurationPart {
|
|
@Setting(Configuration.VERSION_FIELD)
|
|
int version = VERSION;
|
|
|
|
+ public Player player;
|
|
+ public class Player extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ }
|
|
+
|
|
+ @Setting("world-generation")
|
|
+ public WorldGeneration worldgen;
|
|
+ public class WorldGeneration extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ }
|
|
+
|
|
+ public Entity entity;
|
|
+ public class Entity extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ @PostProcess
|
|
+ public void post() {
|
|
+ }
|
|
+
|
|
+ }
|
|
+
|
|
+ public World world;
|
|
+ public class World extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ @PostProcess
|
|
+ public void post() {
|
|
+ }
|
|
+
|
|
+ }
|
|
+
|
|
+ public Structure structure;
|
|
+ public class Structure extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ }
|
|
+
|
|
+ public Miscellaneous misc;
|
|
+ public class Miscellaneous extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ }
|
|
+
|
|
}
|
|
diff --git a/src/main/java/org/plazmamc/plazma/configurations/RemovedConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/RemovedConfigurations.java
|
|
index 25c0f5d28107b45677aa7b19bc0d5238512d9826..ac0f038de0ce5cf6df0b730af69d3229c3119eff 100644
|
|
--- a/src/main/java/org/plazmamc/plazma/configurations/RemovedConfigurations.java
|
|
+++ b/src/main/java/org/plazmamc/plazma/configurations/RemovedConfigurations.java
|
|
@@ -2,9 +2,12 @@ package org.plazmamc.plazma.configurations;
|
|
|
|
import org.spongepowered.configurate.NodePath;
|
|
|
|
+import static org.spongepowered.configurate.NodePath.path;
|
|
+
|
|
interface RemovedConfigurations {
|
|
|
|
NodePath[] WORLD_PATHS = {
|
|
+ path("structure", "nether-portal")
|
|
};
|
|
|
|
NodePath[] GLOBAL_PATHS = {
|
|
diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
|
|
index f2d3d51cb4b8fc7a5fd6db1a63289fff6d32a1ea..c222d58520b655b54b8975ec226a4ba948691cd4 100644
|
|
--- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
|
|
+++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java
|
|
@@ -19,4 +19,44 @@ public class WorldConfigurations extends ConfigurationPart {
|
|
@Setting(Configuration.VERSION_FIELD)
|
|
int version = VERSION;
|
|
|
|
+ public Miscellaneous misc;
|
|
+ public class Miscellaneous extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ }
|
|
+
|
|
+ public Entity entity;
|
|
+ public class Entity extends ConfigurationPart {
|
|
+
|
|
+ public Phantom phantom;
|
|
+ public class Phantom extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ }
|
|
+
|
|
+ }
|
|
+
|
|
+ public Structure structure;
|
|
+ public class Structure extends ConfigurationPart {
|
|
+
|
|
+ public NetherPortal netherPortal;
|
|
+ public class NetherPortal extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ }
|
|
+
|
|
+ }
|
|
+
|
|
+ public Block block;
|
|
+ public class Block extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ }
|
|
+
|
|
+ public Item item;
|
|
+ public class Item extends ConfigurationPart {
|
|
+
|
|
+
|
|
+ }
|
|
+
|
|
}
|