Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
Fix save file purpur.yml conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
@Euphillya
Euphillya committed Nov 5, 2023
1 parent 1a5a250 commit d1dceaf
Show file tree
Hide file tree
Showing 13 changed files with 84 additions and 51 deletions.
20 changes: 13 additions & 7 deletions patches/server/0005-Purpur-EnderChest-1-to-6-Rows.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Purpur - EnderChest 1 to 6 Rows


diff --git a/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java b/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
index b32c065215c06e82ffe6370dec12f755c5608f2a..2e53b730d14ab99bbad3525c30cfe7b4716ed90e 100644
index b32c065215c06e82ffe6370dec12f755c5608f2a..bf396039ef4fa8dd711918cbcc7c45c991fbf38b 100644
--- a/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
+++ b/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
@@ -7,6 +7,7 @@ import org.bukkit.configuration.ConfigurationSection;
Expand All @@ -21,15 +21,15 @@ index b32c065215c06e82ffe6370dec12f755c5608f2a..2e53b730d14ab99bbad3525c30cfe7b4
return builder.build();
}
+
+ private static boolean enderChestSixRows = false;
+ private static boolean enderChestPermissionRows = false;
+ public static boolean enderChestSixRows = false;
+ public static boolean enderChestPermissionRows = false;
+ private static void blockSettings() {
+ if (version < 2) {
+ PurpurConfig.enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestPermissionRows);
+ enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
+ set("settings.blocks.ender_chest.six-rows", null);
+ }
+ if (version < 2) {
+ PurpurConfig.enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
+ enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
+ set("settings.blocks.ender_chest.use-permissions-for-rows", null);
+ }
+ }
Expand Down Expand Up @@ -205,17 +205,23 @@ index 471ae4458e7ea7c29d7551b32cec98180fbccd4e..698d64c9a44fc2c62d13072741351119
for (int i = 0; i < this.getSize(); i++) {
if (i >= items.length) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 4c27b3a153df97dafa206de44b005780f0353986..ecebdbbf79f407993963dc3d43f0ed4b9ae91e0f 100644
index 4c27b3a153df97dafa206de44b005780f0353986..840aef59f276b25af8a28c99d94906fd0199c232 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -172,4 +172,12 @@ public class PurpurConfig {
@@ -172,4 +172,18 @@ public class PurpurConfig {
}
return builder.build();
}
+
+ public static boolean enderChestSixRows = false;
+ public static boolean enderChestPermissionRows = false;
+ private static void blockSettings() {
+ if (fr.euphilia.tenseimc.TenseiConfig.version < 2) {
+ enderChestSixRows = fr.euphilia.tenseimc.TenseiConfig.enderChestSixRows;
+ set("settings.blocks.ender_chest.six-rows", enderChestSixRows);
+ enderChestPermissionRows = fr.euphilia.tenseimc.TenseiConfig.enderChestPermissionRows;
+ set("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
+ }
+ enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
+ org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
+ enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
Expand Down
5 changes: 3 additions & 2 deletions patches/server/0007-Add-Option-for-disable-observer-clocks.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ index 7b45d6b9a005036ca5051d089a7be792eb87012f..3836ee4965d9803eea0639aad6bc6473

return super.updateShape(state, direction, neighborState, world, pos, neighborPos);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 89d8dd14823ca57c3338790bcb23690151e13ff9..77143a5d3038017edd2ea5889969a4b27811a55c 100644
index 89d8dd14823ca57c3338790bcb23690151e13ff9..e742e5935c7ed0f352ed828550fa90b02cd38c7b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -17,15 +17,14 @@ package org.purpurmc.purpur;
Expand Down Expand Up @@ -83,7 +83,7 @@ index 89d8dd14823ca57c3338790bcb23690151e13ff9..77143a5d3038017edd2ea5889969a4b2
init();
}

@@ -89,4 +90,14 @@ public class PurpurWorldConfig {
@@ -89,4 +90,15 @@ public class PurpurWorldConfig {
final Map<String, Object> value = PurpurConfig.getMap("world-settings." + worldName + "." + path, null);
return value.isEmpty() ? fallback : value;
}
Expand All @@ -93,6 +93,7 @@ index 89d8dd14823ca57c3338790bcb23690151e13ff9..77143a5d3038017edd2ea5889969a4b2
+ // TenseiMC rework start
+ if (TenseiConfig.version < 2) {
+ disableObserverClocks = this.tenseiWorldConfig.disableObserverClocks;
+ set("blocks.observer.disable-clock", disableObserverClocks);
+ }
+ // TenseiMC rework end
+ disableObserverClocks = getBoolean("blocks.observer.disable-clock", disableObserverClocks);
Expand Down
5 changes: 3 additions & 2 deletions patches/server/0008-Configurable-piston-push-limit.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..e6cb76e2bc25d555db087a986f5a8938
}

diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 77143a5d3038017edd2ea5889969a4b27811a55c..0e3da7516e3e5601f33e6dad9315751f37c1f5a1 100644
index e742e5935c7ed0f352ed828550fa90b02cd38c7b..fab41119d81589185731bfdaffcf3d56625a0867 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -100,4 +100,13 @@ public class PurpurWorldConfig {
@@ -101,4 +101,14 @@ public class PurpurWorldConfig {
// TenseiMC rework end
disableObserverClocks = getBoolean("blocks.observer.disable-clock", disableObserverClocks);
}
Expand All @@ -69,6 +69,7 @@ index 77143a5d3038017edd2ea5889969a4b27811a55c..0e3da7516e3e5601f33e6dad9315751f
+ // TenseiMC rework start
+ if (TenseiConfig.version < 2) {
+ pistonBlockPushLimit = this.tenseiWorldConfig.pistonBlockPushLimit;
+ set("blocks.piston.block-push-limit", pistonBlockPushLimit);
+ }
+ pistonBlockPushLimit = getInt("blocks.piston.block-push-limit", pistonBlockPushLimit);
+ }
Expand Down
28 changes: 16 additions & 12 deletions patches/server/0009-Purpur-Barrels-6-rows.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ Subject: [PATCH] Purpur - Barrels 6 rows


diff --git a/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java b/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
index 2e53b730d14ab99bbad3525c30cfe7b4716ed90e..bf1110e21a31a2acfc7df3f6e91e5b278b3a59e3 100644
index bf396039ef4fa8dd711918cbcc7c45c991fbf38b..909959fe6844227d0251b85663e54bcb21739eb7 100644
--- a/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
+++ b/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
@@ -126,6 +126,7 @@ public class TenseiConfig {

private static boolean enderChestSixRows = false;
private static boolean enderChestPermissionRows = false;
+ private static int barrelRows = 3;
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
+ public static int barrelRows = 3;
private static void blockSettings() {
if (version < 2) {
PurpurConfig.enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestPermissionRows);
enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
@@ -135,5 +136,9 @@ public class TenseiConfig {
PurpurConfig.enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
set("settings.blocks.ender_chest.use-permissions-for-rows", null);
}
+ if (version < 2) {
+ PurpurConfig.barrelRows = getInt("settings.blocks.barrel.rows", barrelRows);
+ barrelRows = getInt("settings.blocks.barrel.rows", barrelRows);
+ set("settings.blocks.barrel.rows", null);
+ }
}
Expand Down Expand Up @@ -89,23 +89,27 @@ index 2730e8fd695a9bad0e991fcb98f6127cc895557f..e466f35911943de42f3ca808ce31b025
case DISPENSER:
case DROPPER:
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index ecebdbbf79f407993963dc3d43f0ed4b9ae91e0f..2565d0857a0f578ca7e10e895e8a8ac303f7daf8 100644
index 840aef59f276b25af8a28c99d94906fd0199c232..9841b60b5806a579191470882330f48e850f9fdd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -173,9 +173,16 @@ public class PurpurConfig {
@@ -173,9 +173,20 @@ public class PurpurConfig {
return builder.build();
}

+ public static int barrelRows = 3;
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
private static void blockSettings() {
+ if (fr.euphilia.tenseimc.TenseiConfig.version < 2) {
+ barrelRows = fr.euphilia.tenseimc.TenseiConfig.barrelRows;
+ set("settings.blocks.barrel.rows", barrelRows);
+ }
+ barrelRows = getInt("settings.blocks.barrel.rows", barrelRows);
+ if (barrelRows < 1 || barrelRows > 6) {
+ Bukkit.getLogger().severe("settings.blocks.barrel.rows must be 1-6, resetting to default");
+ barrelRows = 3;
+ }
+ org.bukkit.event.inventory.InventoryType.BARREL.setDefaultSize(barrelRows*9);
enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
if (fr.euphilia.tenseimc.TenseiConfig.version < 2) {
enderChestSixRows = fr.euphilia.tenseimc.TenseiConfig.enderChestSixRows;
set("settings.blocks.ender_chest.six-rows", enderChestSixRows);
8 changes: 6 additions & 2 deletions patches/server/0012-Beacon-Activation-Range-Configurable.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ index 9c3a271f98e723f1d8bf3badd3fca7a19fdc6d13..3ff48acdf99e9aca2109f19cd893aece
} else {
return effectRange;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 0e3da7516e3e5601f33e6dad9315751f37c1f5a1..de2886b19d9639d616c63657407c0bcc4e7eae8b 100644
index fab41119d81589185731bfdaffcf3d56625a0867..5a3aac37763ac3bdd4044f262d4acda009cad51d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -109,4 +109,21 @@ public class PurpurWorldConfig {
@@ -111,4 +111,25 @@ public class PurpurWorldConfig {
}
pistonBlockPushLimit = getInt("blocks.piston.block-push-limit", pistonBlockPushLimit);
}
Expand All @@ -69,6 +69,10 @@ index 0e3da7516e3e5601f33e6dad9315751f37c1f5a1..de2886b19d9639d616c63657407c0bcc
+ beaconLevelTwo = this.tenseiWorldConfig.beaconLevelTwo;
+ beaconLevelThree = this.tenseiWorldConfig.beaconLevelThree;
+ beaconLevelFour = this.tenseiWorldConfig.beaconLevelFour;
+ set("blocks.beacon.effect-range.level-1", beaconLevelOne);
+ set("blocks.beacon.effect-range.level-2", beaconLevelTwo);
+ set("blocks.beacon.effect-range.level-3", beaconLevelThree);
+ set("blocks.beacon.effect-range.level-4", beaconLevelFour);
+ }
+ beaconLevelOne = getInt("blocks.beacon.effect-range.level-1", beaconLevelOne);
+ beaconLevelTwo = getInt("blocks.beacon.effect-range.level-2", beaconLevelTwo);
Expand Down
12 changes: 6 additions & 6 deletions patches/server/0013-Compostable-items-configuration.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Compostable items configuration.


diff --git a/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java b/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
index bf1110e21a31a2acfc7df3f6e91e5b278b3a59e3..edc68abf1d012084a21eea59f40092bb4b37a363 100644
index 909959fe6844227d0251b85663e54bcb21739eb7..22ce015ac324f546965ded5e27bd83e39bd964e4 100644
--- a/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
+++ b/src/main/java/fr/euphilia/tenseimc/TenseiConfig.java
@@ -2,6 +2,9 @@ package fr.euphilia.tenseimc;
Expand All @@ -27,15 +27,15 @@ index bf1110e21a31a2acfc7df3f6e91e5b278b3a59e3..edc68abf1d012084a21eea59f40092bb
import java.util.Map;
import java.util.logging.Level;
@@ -127,6 +131,7 @@ public class TenseiConfig {
private static boolean enderChestSixRows = false;
private static boolean enderChestPermissionRows = false;
private static int barrelRows = 3;
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
public static int barrelRows = 3;
+ public static HashMap<Item, Double> itemCompostable = new HashMap<>();
private static void blockSettings() {
if (version < 2) {
PurpurConfig.enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestPermissionRows);
enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
@@ -140,5 +145,15 @@ public class TenseiConfig {
PurpurConfig.barrelRows = getInt("settings.blocks.barrel.rows", barrelRows);
barrelRows = getInt("settings.blocks.barrel.rows", barrelRows);
set("settings.blocks.barrel.rows", null);
}
+ itemCompostable.clear();
Expand Down
5 changes: 3 additions & 2 deletions patches/server/0017-Add-config-change-multiplier-critical-damage-value.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ index 97efc245e0e1dcbd5ba1c602c0a67dcf403cb7a5..82722a5cbdd9551e3aedfd6b1f5ddc14

f += f1;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index de2886b19d9639d616c63657407c0bcc4e7eae8b..790d50c037ad0aeb038d1cdd554fa2c15336b32c 100644
index 5a3aac37763ac3bdd4044f262d4acda009cad51d..eb35e0be366b416618fd89a532b08619ef617fe9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -126,4 +126,12 @@ public class PurpurWorldConfig {
@@ -132,4 +132,13 @@ public class PurpurWorldConfig {
beaconLevelThree = getInt("blocks.beacon.effect-range.level-3", beaconLevelThree);
beaconLevelFour = getInt("blocks.beacon.effect-range.level-4", beaconLevelFour);
}
Expand All @@ -47,6 +47,7 @@ index de2886b19d9639d616c63657407c0bcc4e7eae8b..790d50c037ad0aeb038d1cdd554fa2c1
+ private void playerSettings() {
+ if (TenseiConfig.version < 2) {
+ playerCriticalDamageMultiplier = this.tenseiWorldConfig.playerCriticalDamageMultiplier;
+ set("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
+ }
+ playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier);
+ }
Expand Down
5 changes: 3 additions & 2 deletions patches/server/0019-Purpur-Option-for-chests-to-open-even-with-a-solid-b.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,18 @@ index 5e22d175b1048a58802cdf64ac70a8b56329e915..b32f5e021e372f2a35e3e67dc9142145

return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 790d50c037ad0aeb038d1cdd554fa2c15336b32c..960f03367abb55014d679d4885caa4ff339fd223 100644
index eb35e0be366b416618fd89a532b08619ef617fe9..0d1b9d43ce81e4931c8e5beea2b29adfd3a56a35 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -127,6 +127,14 @@ public class PurpurWorldConfig {
@@ -133,6 +133,15 @@ public class PurpurWorldConfig {
beaconLevelFour = getInt("blocks.beacon.effect-range.level-4", beaconLevelFour);
}

+ public boolean chestOpenWithBlockOnTop = false;
+ private void chestSettings() {
+ if (TenseiConfig.version < 2) {
+ chestOpenWithBlockOnTop = this.tenseiWorldConfig.chestOpenWithBlockOnTop;
+ set("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
+ }
+ chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
+ }
Expand Down
6 changes: 4 additions & 2 deletions patches/server/0020-Bee-can-work-when-raining-or-at-night.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ index 41c9f074203915c31c1ae7a160ce509c13383f84..f0dde6d99fa0035ffec89701691e7f18
return false;
} else {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 960f03367abb55014d679d4885caa4ff339fd223..ed221dd99a9678e02c74ed6fbe5f9eda438435f6 100644
index 0d1b9d43ce81e4931c8e5beea2b29adfd3a56a35..af9c2fbcb3da068f23ccbaa9e76b3b1a06d68724 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -127,6 +127,17 @@ public class PurpurWorldConfig {
@@ -133,6 +133,19 @@ public class PurpurWorldConfig {
beaconLevelFour = getInt("blocks.beacon.effect-range.level-4", beaconLevelFour);
}

Expand All @@ -65,6 +65,8 @@ index 960f03367abb55014d679d4885caa4ff339fd223..ed221dd99a9678e02c74ed6fbe5f9eda
+ if (TenseiConfig.version < 2) {
+ beeCanWorkAtNight = this.tenseiWorldConfig.beeCanWorkAtNight;
+ beeCanWorkInRain = this.tenseiWorldConfig.beeCanWorkInRain;
+ set("mobs.bee.can-work-at-night", beeCanWorkAtNight);
+ set("mobs.bee.can-work-in-rain", beeCanWorkInRain);
+ }
+ beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight);
+ beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain);
Expand Down
Loading

0 comments on commit d1dceaf

Please sign in to comment.