diff --git a/patches/server/0002-Divine-Configuration.patch b/patches/server/0002-Divine-Configuration.patch new file mode 100644 index 0000000..95924b7 --- /dev/null +++ b/patches/server/0002-Divine-Configuration.patch @@ -0,0 +1,249 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: NONPLAY +Date: Sun, 8 Jan 2023 09:57:55 +0300 +Subject: [PATCH] Divine Configuration + + +diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java +index 2cc44fbf8e5bd436b6d4e19f6c06b351e750cb31..d432f5e58508da9691861fa0f057a30be562697b 100644 +--- a/src/main/java/co/aikar/timings/TimingsExport.java ++++ b/src/main/java/co/aikar/timings/TimingsExport.java +@@ -242,7 +242,8 @@ public class TimingsExport extends Thread { + pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)), + pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), + pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Pufferfish +- pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)) // Pufferfish ++ pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)), // Pufferfish // DivineMC ++ pair("divinemc", mapAsJSON(gq.bxteam.divinemc.DivineConfig.getConfigCopy(), null)) // DivineMC + )); + + new TimingsExport(listeners, parent, history).start(); +diff --git a/src/main/java/gq/bxteam/divinemc/DivineCommand.java b/src/main/java/gq/bxteam/divinemc/DivineCommand.java +new file mode 100644 +index 0000000000000000000000000000000000000000..8bdd69d8712ac160b8dba2750b920f27231b3893 +--- /dev/null ++++ b/src/main/java/gq/bxteam/divinemc/DivineCommand.java +@@ -0,0 +1,68 @@ ++package gq.bxteam.divinemc; ++ ++import java.io.IOException; ++import java.util.Collections; ++import java.util.List; ++import java.util.stream.Collectors; ++import java.util.stream.Stream; ++import net.kyori.adventure.text.Component; ++import net.kyori.adventure.text.format.NamedTextColor; ++import net.md_5.bungee.api.ChatColor; ++import net.minecraft.server.MinecraftServer; ++import org.bukkit.Bukkit; ++import org.bukkit.Location; ++import org.bukkit.command.Command; ++import org.bukkit.command.CommandSender; ++ ++public class DivineCommand extends Command { ++ ++ public DivineCommand() { ++ super("divinemc"); ++ this.description = "DivineMC related commands"; ++ this.usageMessage = "/divinemc [reload | version]"; ++ this.setPermission("bukkit.command.divinemc"); ++ } ++ ++ public static void init() { ++ MinecraftServer.getServer().server.getCommandMap().register("divinemc", "DivineMC", new DivineCommand()); ++ } ++ ++ @Override ++ public List tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException { ++ if (args.length == 1) { ++ return Stream.of("reload", "version") ++ .filter(arg -> arg.startsWith(args[0].toLowerCase())) ++ .collect(Collectors.toList()); ++ } ++ return Collections.emptyList(); ++ } ++ ++ @Override ++ public boolean execute(CommandSender sender, String commandLabel, String[] args) { ++ if (!testPermission(sender)) return true; ++ String prefix = ChatColor.of("#12fff6") + "" + ChatColor.BOLD + "DivineMC ยป " + ChatColor.of("#e8f9f9"); ++ ++ if (args.length != 1) { ++ sender.sendMessage(prefix + "Usage: " + usageMessage); ++ args = new String[]{"version"}; ++ } ++ ++ if (args[0].equalsIgnoreCase("reload")) { ++ MinecraftServer console = MinecraftServer.getServer(); ++ try { ++ DivineConfig.load(); ++ } catch (IOException e) { ++ sender.sendMessage(Component.text("Failed to reload.", NamedTextColor.RED)); ++ e.printStackTrace(); ++ return true; ++ } ++ console.server.reloadCount++; ++ ++ Command.broadcastCommandMessage(sender, prefix + "DivineMC configuration has been reloaded."); ++ } else if (args[0].equalsIgnoreCase("version")) { ++ Command.broadcastCommandMessage(sender, prefix + "This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); ++ } ++ ++ return true; ++ } ++} +\ No newline at end of file +diff --git a/src/main/java/gq/bxteam/divinemc/DivineConfig.java b/src/main/java/gq/bxteam/divinemc/DivineConfig.java +new file mode 100644 +index 0000000000000000000000000000000000000000..541acfc832fe4caa13b5fb46bc455fc6a7294af8 +--- /dev/null ++++ b/src/main/java/gq/bxteam/divinemc/DivineConfig.java +@@ -0,0 +1,134 @@ ++package gq.bxteam.divinemc; ++ ++import java.io.File; ++import java.io.IOException; ++import java.lang.reflect.Method; ++import java.lang.reflect.Modifier; ++import java.util.List; ++import net.minecraft.server.MinecraftServer; ++import org.apache.logging.log4j.Level; ++import org.bukkit.configuration.ConfigurationSection; ++import org.bukkit.configuration.MemoryConfiguration; ++import org.jetbrains.annotations.Nullable; ++import org.simpleyaml.configuration.comments.CommentType; ++import org.simpleyaml.configuration.file.YamlFile; ++import org.simpleyaml.exceptions.InvalidConfigurationException; ++ ++public class DivineConfig { ++ ++ private static final YamlFile config = new YamlFile(); ++ private static int updates = 0; ++ ++ private static ConfigurationSection convertToBukkit(org.simpleyaml.configuration.ConfigurationSection section) { ++ ConfigurationSection newSection = new MemoryConfiguration(); ++ for (String key : section.getKeys(false)) { ++ if (section.isConfigurationSection(key)) { ++ newSection.set(key, convertToBukkit(section.getConfigurationSection(key))); ++ } else { ++ newSection.set(key, section.get(key)); ++ } ++ } ++ return newSection; ++ } ++ ++ public static ConfigurationSection getConfigCopy() { ++ return convertToBukkit(config); ++ } ++ ++ public static int getUpdates() { ++ return updates; ++ } ++ ++ public static void load() throws IOException { ++ File configFile = new File("divinemc.yml"); ++ ++ if (configFile.exists()) { ++ try { ++ config.load(configFile); ++ } catch (InvalidConfigurationException e) { ++ throw new IOException(e); ++ } ++ } ++ ++ getString("info.version", "1.0"); ++ setComment("info", ++ "DivineMC Configuration", ++ "Join our Discord at https://discord.gg/p7cxhw7E2M", ++ "Download new builds at https://github.com/DivineMC/DivineMC/releases/latest"); ++ ++ for (Method method : DivineConfig.class.getDeclaredMethods()) { ++ if (Modifier.isStatic(method.getModifiers()) && Modifier.isPrivate(method.getModifiers()) && method.getParameterCount() == 0 && ++ method.getReturnType() == Void.TYPE && !method.getName().startsWith("lambda")) { ++ method.setAccessible(true); ++ try { ++ method.invoke(null); ++ } catch (Throwable t) { ++ MinecraftServer.LOGGER.warn("Failed to load configuration option from " + method.getName(), t); ++ } ++ } ++ } ++ ++ updates++; ++ ++ config.save(configFile); ++ } ++ ++ private static void setComment(String key, String... comment) { ++ if (config.contains(key)) { ++ config.setComment(key, String.join("\n", comment), CommentType.BLOCK); ++ } ++ } ++ ++ private static void ensureDefault(String key, Object defaultValue, String... comment) { ++ if (!config.contains(key)) { ++ config.set(key, defaultValue); ++ config.setComment(key, String.join("\n", comment), CommentType.BLOCK); ++ } ++ } ++ ++ private static boolean getBoolean(String key, boolean defaultValue, String... comment) { ++ return getBoolean(key, null, defaultValue, comment); ++ } ++ ++ private static boolean getBoolean(String key, @Nullable String oldKey, boolean defaultValue, String... comment) { ++ ensureDefault(key, defaultValue, comment); ++ return config.getBoolean(key, defaultValue); ++ } ++ ++ private static int getInt(String key, int defaultValue, String... comment) { ++ return getInt(key, null, defaultValue, comment); ++ } ++ ++ private static int getInt(String key, @Nullable String oldKey, int defaultValue, String... comment) { ++ ensureDefault(key, defaultValue, comment); ++ return config.getInt(key, defaultValue); ++ } ++ ++ private static double getDouble(String key, double defaultValue, String... comment) { ++ return getDouble(key, null, defaultValue, comment); ++ } ++ ++ private static double getDouble(String key, @Nullable String oldKey, double defaultValue, String... comment) { ++ ensureDefault(key, defaultValue, comment); ++ return config.getDouble(key, defaultValue); ++ } ++ ++ private static String getString(String key, String defaultValue, String... comment) { ++ return getOldString(key, null, defaultValue, comment); ++ } ++ ++ private static String getOldString(String key, @Nullable String oldKey, String defaultValue, String... comment) { ++ ensureDefault(key, defaultValue, comment); ++ return config.getString(key, defaultValue); ++ } ++ ++ private static List getStringList(String key, List defaultValue, String... comment) { ++ return getStringList(key, null, defaultValue, comment); ++ } ++ ++ private static List getStringList(String key, @Nullable String oldKey, List defaultValue, String... comment) { ++ ensureDefault(key, defaultValue, comment); ++ return config.getStringList(key); ++ } ++ ++} +\ No newline at end of file +diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +index 673fb3955291407be37dc78be4eec9bf2018128b..f7934ce8a62404d7eaee2d334317d894e7c9ad05 100644 +--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java ++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +@@ -223,6 +223,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + // Paper end + gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish + gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish ++ gq.bxteam.divinemc.DivineConfig.load(); // DivineMC ++ gq.bxteam.divinemc.DivineCommand.init(); // DivineMC + + this.setPvpAllowed(dedicatedserverproperties.pvp); + this.setFlightAllowed(dedicatedserverproperties.allowFlight); diff --git a/patches/server/0002-Fix-legacy-colors-in-console.patch b/patches/server/0003-Fix-legacy-colors-in-console.patch similarity index 100% rename from patches/server/0002-Fix-legacy-colors-in-console.patch rename to patches/server/0003-Fix-legacy-colors-in-console.patch diff --git a/patches/server/0003-Time-Utilities.patch b/patches/server/0004-Time-Utilities.patch similarity index 100% rename from patches/server/0003-Time-Utilities.patch rename to patches/server/0004-Time-Utilities.patch diff --git a/patches/server/0004-lithium-fast-util.patch b/patches/server/0005-lithium-fast-util.patch similarity index 100% rename from patches/server/0004-lithium-fast-util.patch rename to patches/server/0005-lithium-fast-util.patch diff --git a/patches/server/0005-lithium-HashedReferenceList.patch b/patches/server/0006-lithium-HashedReferenceList.patch similarity index 100% rename from patches/server/0005-lithium-HashedReferenceList.patch rename to patches/server/0006-lithium-HashedReferenceList.patch diff --git a/patches/server/0006-Add-last-tick-time-API.patch b/patches/server/0007-Add-last-tick-time-API.patch similarity index 100% rename from patches/server/0006-Add-last-tick-time-API.patch rename to patches/server/0007-Add-last-tick-time-API.patch diff --git a/patches/server/0007-lithium-shapes.blockstate_cache.patch b/patches/server/0008-lithium-shapes.blockstate_cache.patch similarity index 100% rename from patches/server/0007-lithium-shapes.blockstate_cache.patch rename to patches/server/0008-lithium-shapes.blockstate_cache.patch diff --git a/patches/server/0008-lithium-ai.raid.patch b/patches/server/0009-lithium-ai.raid.patch similarity index 100% rename from patches/server/0008-lithium-ai.raid.patch rename to patches/server/0009-lithium-ai.raid.patch diff --git a/patches/server/0009-Stop-wasting-resources-on-JsonList-get.patch b/patches/server/0010-Stop-wasting-resources-on-JsonList-get.patch similarity index 98% rename from patches/server/0009-Stop-wasting-resources-on-JsonList-get.patch rename to patches/server/0010-Stop-wasting-resources-on-JsonList-get.patch index e995022..ddd99a0 100644 --- a/patches/server/0009-Stop-wasting-resources-on-JsonList-get.patch +++ b/patches/server/0010-Stop-wasting-resources-on-JsonList-get.patch @@ -7,7 +7,7 @@ Original code by YatopiaMC, licensed under MIT You can find the original code on https://github.com/YatopiaMC/Yatopia diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c0b599b1835d28ddda3690b29f29bd8c6f03e215..0c491a991d329569f1372ea431640513172fdfeb 100644 +index 8961310c0789c4dd95a729ecc0b8dbf8d701ffc4..d82912b4ff8325b4c3460171b0204597fdbfbb21 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -689,13 +689,19 @@ public abstract class PlayerList { diff --git a/patches/server/0010-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0011-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0010-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0011-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0011-Remove-TickTask.patch b/patches/server/0012-Remove-TickTask.patch similarity index 100% rename from patches/server/0011-Remove-TickTask.patch rename to patches/server/0012-Remove-TickTask.patch diff --git a/patches/server/0012-Don-t-create-new-random-instance.patch b/patches/server/0013-Don-t-create-new-random-instance.patch similarity index 100% rename from patches/server/0012-Don-t-create-new-random-instance.patch rename to patches/server/0013-Don-t-create-new-random-instance.patch diff --git a/patches/server/0013-Completely-remove-bootstrapExecutor.patch b/patches/server/0014-Completely-remove-bootstrapExecutor.patch similarity index 100% rename from patches/server/0013-Completely-remove-bootstrapExecutor.patch rename to patches/server/0014-Completely-remove-bootstrapExecutor.patch diff --git a/patches/server/0014-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0015-Fix-rotating-UP-DOWN-CW-and-CCW.patch similarity index 100% rename from patches/server/0014-Fix-rotating-UP-DOWN-CW-and-CCW.patch rename to patches/server/0015-Fix-rotating-UP-DOWN-CW-and-CCW.patch diff --git a/patches/server/0015-Fix-vanilla-command-permission-handler.patch b/patches/server/0016-Fix-vanilla-command-permission-handler.patch similarity index 100% rename from patches/server/0015-Fix-vanilla-command-permission-handler.patch rename to patches/server/0016-Fix-vanilla-command-permission-handler.patch diff --git a/patches/server/0016-Remove-sync-chunk-writes-in-server.properties.patch b/patches/server/0017-Remove-sync-chunk-writes-in-server.properties.patch similarity index 94% rename from patches/server/0016-Remove-sync-chunk-writes-in-server.properties.patch rename to patches/server/0017-Remove-sync-chunk-writes-in-server.properties.patch index dee477a..cdb5a3a 100644 --- a/patches/server/0016-Remove-sync-chunk-writes-in-server.properties.patch +++ b/patches/server/0017-Remove-sync-chunk-writes-in-server.properties.patch @@ -7,10 +7,10 @@ Original code by Titaniumtown, licensed under GNU General Public License v3.0 You can find the original code on https://gitlab.com/Titaniumtown/JettPack diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 673fb3955291407be37dc78be4eec9bf2018128b..d3497d4cc2e9587e64c1dac3b3b2b94cd3590c07 100644 +index f7934ce8a62404d7eaee2d334317d894e7c9ad05..41017d870814f5e6c1d686d56b195b19574a504c 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -386,7 +386,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -388,7 +388,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface BufferedWriter bufferedwriter = Files.newBufferedWriter(file); try { diff --git a/patches/server/0017-Remove-Spigot-tick-limiter.patch b/patches/server/0018-Remove-Spigot-tick-limiter.patch similarity index 100% rename from patches/server/0017-Remove-Spigot-tick-limiter.patch rename to patches/server/0018-Remove-Spigot-tick-limiter.patch diff --git a/patches/server/0018-Don-t-save-Fireworks.patch b/patches/server/0019-Don-t-save-Fireworks.patch similarity index 100% rename from patches/server/0018-Don-t-save-Fireworks.patch rename to patches/server/0019-Don-t-save-Fireworks.patch diff --git a/patches/server/0019-Paper-PR-BoneMeal-API.patch b/patches/server/0020-Paper-PR-BoneMeal-API.patch similarity index 100% rename from patches/server/0019-Paper-PR-BoneMeal-API.patch rename to patches/server/0020-Paper-PR-BoneMeal-API.patch diff --git a/patches/server/0020-Do-not-drop-items-from-Give-command.patch b/patches/server/0021-Do-not-drop-items-from-Give-command.patch similarity index 100% rename from patches/server/0020-Do-not-drop-items-from-Give-command.patch rename to patches/server/0021-Do-not-drop-items-from-Give-command.patch diff --git a/patches/server/0021-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0022-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0021-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0022-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0022-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0023-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0022-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0023-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0023-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0024-Arrows-should-not-reset-despawn-counter.patch similarity index 100% rename from patches/server/0023-Arrows-should-not-reset-despawn-counter.patch rename to patches/server/0024-Arrows-should-not-reset-despawn-counter.patch diff --git a/patches/server/0024-PaperPR-Use-DataConverter-for-itemstack-entity-deser.patch b/patches/server/0025-PaperPR-Use-DataConverter-for-itemstack-entity-deser.patch similarity index 100% rename from patches/server/0024-PaperPR-Use-DataConverter-for-itemstack-entity-deser.patch rename to patches/server/0025-PaperPR-Use-DataConverter-for-itemstack-entity-deser.patch diff --git a/patches/server/0025-Dont-eat-blocks-in-non-ticking-chunks.patch b/patches/server/0026-Dont-eat-blocks-in-non-ticking-chunks.patch similarity index 100% rename from patches/server/0025-Dont-eat-blocks-in-non-ticking-chunks.patch rename to patches/server/0026-Dont-eat-blocks-in-non-ticking-chunks.patch diff --git a/patches/server/0026-carpetfixes-BiomeAccess-prediction.patch b/patches/server/0027-carpetfixes-BiomeAccess-prediction.patch similarity index 100% rename from patches/server/0026-carpetfixes-BiomeAccess-prediction.patch rename to patches/server/0027-carpetfixes-BiomeAccess-prediction.patch diff --git a/patches/server/0027-Fix-MC-121706.patch b/patches/server/0028-Fix-MC-121706.patch similarity index 100% rename from patches/server/0027-Fix-MC-121706.patch rename to patches/server/0028-Fix-MC-121706.patch diff --git a/patches/server/0028-Fix-hunger-saturation-depleting-on-peaceful.patch b/patches/server/0029-Fix-hunger-saturation-depleting-on-peaceful.patch similarity index 100% rename from patches/server/0028-Fix-hunger-saturation-depleting-on-peaceful.patch rename to patches/server/0029-Fix-hunger-saturation-depleting-on-peaceful.patch diff --git a/patches/server/0029-Fix-mobs-attacking-themselves.patch b/patches/server/0030-Fix-mobs-attacking-themselves.patch similarity index 100% rename from patches/server/0029-Fix-mobs-attacking-themselves.patch rename to patches/server/0030-Fix-mobs-attacking-themselves.patch diff --git a/patches/server/0030-PaperPR-Optimize-VarInts.patch b/patches/server/0031-PaperPR-Optimize-VarInts.patch similarity index 100% rename from patches/server/0030-PaperPR-Optimize-VarInts.patch rename to patches/server/0031-PaperPR-Optimize-VarInts.patch diff --git a/patches/server/0031-Fix-MC-238526.patch b/patches/server/0032-Fix-MC-238526.patch similarity index 100% rename from patches/server/0031-Fix-MC-238526.patch rename to patches/server/0032-Fix-MC-238526.patch diff --git a/patches/server/0032-lithium-cached-hashcode.patch b/patches/server/0033-lithium-cached-hashcode.patch similarity index 100% rename from patches/server/0032-lithium-cached-hashcode.patch rename to patches/server/0033-lithium-cached-hashcode.patch diff --git a/patches/server/0033-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0034-vmp-skip-entity-move-if-movement-is-zero.patch similarity index 95% rename from patches/server/0033-vmp-skip-entity-move-if-movement-is-zero.patch rename to patches/server/0034-vmp-skip-entity-move-if-movement-is-zero.patch index 9bdd20f..000f073 100644 --- a/patches/server/0033-vmp-skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0034-vmp-skip-entity-move-if-movement-is-zero.patch @@ -9,7 +9,7 @@ Original code by RelativityMC, licensed under MIT You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6a9c0f0b4b749c5907a274d6a83254284d8763bb..323c032506c94abdf20104123f511e0ab4163f8d 100644 +index 3073b34a0e0281b6b0330721bb0440147de28511..f150d57ed1acc8423e86b1345ad3e1091c73ba95 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -299,6 +299,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0034-lithium-suffocation.patch b/patches/server/0035-lithium-suffocation.patch similarity index 98% rename from patches/server/0034-lithium-suffocation.patch rename to patches/server/0035-lithium-suffocation.patch index b55ddfc..c4571c6 100644 --- a/patches/server/0034-lithium-suffocation.patch +++ b/patches/server/0035-lithium-suffocation.patch @@ -9,7 +9,7 @@ Original license: GNU Lesser General Public License v3.0 Original project: https://github.com/CaffeineMC/lithium-fabric (Yarn mappings) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 323c032506c94abdf20104123f511e0ab4163f8d..5b657b72132ee7d01dd9b3ac15147bbec3551d3a 100644 +index f150d57ed1acc8423e86b1345ad3e1091c73ba95..49537da22dfc5f99edd64fbe351987ecb5ff4826 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2610,39 +2610,64 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0035-lithium-ai.sensor.secondary_poi.patch b/patches/server/0036-lithium-ai.sensor.secondary_poi.patch similarity index 100% rename from patches/server/0035-lithium-ai.sensor.secondary_poi.patch rename to patches/server/0036-lithium-ai.sensor.secondary_poi.patch diff --git a/patches/server/0036-lithium-store-gamerules-in-fastutil-hashmap.patch b/patches/server/0037-lithium-store-gamerules-in-fastutil-hashmap.patch similarity index 100% rename from patches/server/0036-lithium-store-gamerules-in-fastutil-hashmap.patch rename to patches/server/0037-lithium-store-gamerules-in-fastutil-hashmap.patch diff --git a/patches/server/0037-lithium-precompute-shape-arrays.patch b/patches/server/0038-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0037-lithium-precompute-shape-arrays.patch rename to patches/server/0038-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0038-lithium-entity.fast_elytra_check.patch b/patches/server/0039-lithium-entity.fast_elytra_check.patch similarity index 100% rename from patches/server/0038-lithium-entity.fast_elytra_check.patch rename to patches/server/0039-lithium-entity.fast_elytra_check.patch diff --git a/patches/server/0039-lithium-entity.fast_hand_swing.patch b/patches/server/0040-lithium-entity.fast_hand_swing.patch similarity index 100% rename from patches/server/0039-lithium-entity.fast_hand_swing.patch rename to patches/server/0040-lithium-entity.fast_hand_swing.patch diff --git a/patches/server/0040-lithium-entity.fast_powder_snow_check.patch b/patches/server/0041-lithium-entity.fast_powder_snow_check.patch similarity index 100% rename from patches/server/0040-lithium-entity.fast_powder_snow_check.patch rename to patches/server/0041-lithium-entity.fast_powder_snow_check.patch diff --git a/patches/server/0041-lithium-collections.attributes.patch b/patches/server/0042-lithium-collections.attributes.patch similarity index 100% rename from patches/server/0041-lithium-collections.attributes.patch rename to patches/server/0042-lithium-collections.attributes.patch diff --git a/patches/server/0042-lithium-collections.entity_by_type.patch b/patches/server/0043-lithium-collections.entity_by_type.patch similarity index 100% rename from patches/server/0042-lithium-collections.entity_by_type.patch rename to patches/server/0043-lithium-collections.entity_by_type.patch diff --git a/patches/server/0043-lithium-collections.entity_filtering.patch b/patches/server/0044-lithium-collections.entity_filtering.patch similarity index 100% rename from patches/server/0043-lithium-collections.entity_filtering.patch rename to patches/server/0044-lithium-collections.entity_filtering.patch diff --git a/patches/server/0044-lithium-chunk.serialization.patch b/patches/server/0045-lithium-chunk.serialization.patch similarity index 100% rename from patches/server/0044-lithium-chunk.serialization.patch rename to patches/server/0045-lithium-chunk.serialization.patch diff --git a/patches/server/0045-lithium-cache-iterate-outwards.patch b/patches/server/0046-lithium-cache-iterate-outwards.patch similarity index 100% rename from patches/server/0045-lithium-cache-iterate-outwards.patch rename to patches/server/0046-lithium-cache-iterate-outwards.patch diff --git a/patches/server/0046-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch b/patches/server/0047-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch similarity index 100% rename from patches/server/0046-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch rename to patches/server/0047-vmp-use-linked-map-for-entity-trackers-for-faster-it.patch diff --git a/patches/server/0047-lithium-block.moving_block_shapes.patch b/patches/server/0048-lithium-block.moving_block_shapes.patch similarity index 100% rename from patches/server/0047-lithium-block.moving_block_shapes.patch rename to patches/server/0048-lithium-block.moving_block_shapes.patch diff --git a/patches/server/0048-Skip-cloning-loot-parameters.patch b/patches/server/0049-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0048-Skip-cloning-loot-parameters.patch rename to patches/server/0049-Skip-cloning-loot-parameters.patch diff --git a/patches/todo/0015-Make-a-field-final.patch b/patches/todo/0015-Make-a-field-final.patch deleted file mode 100644 index 04cfb33..0000000 --- a/patches/todo/0015-Make-a-field-final.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: foss-mc <69294560+foss-mc@users.noreply.github.com> -Date: Thu, 1 Jul 2021 12:11:49 +0000 -Subject: [PATCH] Make a field final - -Original code by PatinaMC, licensed under GNU General Public License v3.0 -You can find the original code on https://github.com/PatinaMC/Patina - -diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java -index e0dd0fc1638377f4d4226d4b2976b901d635dff0..e75a428ff261a52b8d5f72d5c46437feef5b8ac4 100644 ---- a/src/main/java/net/minecraft/commands/CommandSourceStack.java -+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java -@@ -59,7 +59,7 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy - private final Vec2 rotation; - private final CommandSigningContext signingContext; - private final TaskChainer chatMessageChainer; -- public java.util.Map currentCommand = new java.util.concurrent.ConcurrentHashMap<>(); // CraftBukkit // Paper -+ public final java.util.Map currentCommand = new java.util.concurrent.ConcurrentHashMap<>(); // CraftBukkit // Paper // Patina - make a field final - - public CommandSourceStack(CommandSource output, Vec3 pos, Vec2 rot, ServerLevel world, int level, String name, Component displayName, MinecraftServer server, @Nullable Entity entity) { - this(output, pos, rot, world, level, name, displayName, server, entity, false, (commandcontext, flag, j) -> {