diff --git a/gradle.properties b/gradle.properties index 189739d..abeb266 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=fun.bm.lophine version=1.21.7-R0.1-SNAPSHOT mcVersion=1.21.7 -luminolRef=e4b2d1f6da1fad1cff5230c83848dd2ae5e056f9 +luminolRef=2a2fd3b68f3b2229dbed85108e0c4c41528ff324 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch b/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch index c21a1ed..a69dbf9 100644 --- a/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch +++ b/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand to Lophine diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java -index 76a76a4e5eadf89b1b24e145045c1bbac6d01755..c2e3bd05af207c9367823a3a5fa57b3b367af63c 100644 +index 26a812cd526acfd1edf31a5c9799fa6deeae927a..9b01cf6f066b2998a2b178321782be1c96f73b0c 100644 --- a/src/main/java/me/earthme/luminol/config/ConfigManager.java +++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java -@@ -10,6 +10,7 @@ public class ConfigManager { +@@ -19,6 +19,7 @@ public class ConfigManager { public static void initConfigs() throws IOException { configfiles.put("luminol", new ConfigsInstance(new File("luminol_config"), "luminol", "me.earthme.luminol.config.modules")); @@ -16,6 +16,18 @@ index 76a76a4e5eadf89b1b24e145045c1bbac6d01755..c2e3bd05af207c9367823a3a5fa57b3b preLoad(); } +diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockExecutionConfig.java b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockExecutionConfig.java +index 531214d7ab28ece4bf84e82b39d1c9f983f0fb0c..b68fa0427bb975e91e76f73ab4cc089a424937a3 100644 +--- a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockExecutionConfig.java ++++ b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockExecutionConfig.java +@@ -5,6 +5,7 @@ import me.earthme.luminol.config.IConfigModule; + import me.earthme.luminol.config.flags.ConfigInfo; + + public class CommandBlockExecutionConfig implements IConfigModule { ++ @me.earthme.luminol.config.flags.TransformedConfig(name = "command_block_enabled", category = {"experiment", "command"}, originInstance = "lophine") + @ConfigInfo(baseName = "enabled") + public static boolean enabled = false; + diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java index ded1f0667327a70a923ebda55c41b1c9094d3e37..57ddc0832b919b115b85c81ac30f136e32f1e77e 100644 --- a/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java diff --git a/lophine-server/minecraft-patches/features/0001-Add-config-for-command-block-command-execution.patch b/lophine-server/minecraft-patches/features/0001-Add-config-for-command-block-command-execution.patch deleted file mode 100644 index a801c0c..0000000 --- a/lophine-server/minecraft-patches/features/0001-Add-config-for-command-block-command-execution.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Sun, 12 Jan 2025 10:36:31 +0800 -Subject: [PATCH] Add config for command block command execution - - -diff --git a/net/minecraft/world/level/BaseCommandBlock.java b/net/minecraft/world/level/BaseCommandBlock.java -index 8b8ce26de104211728d4b64e641a2b471ce89073..fde808499f047128010fd3f94ba086dfab44299a 100644 ---- a/net/minecraft/world/level/BaseCommandBlock.java -+++ b/net/minecraft/world/level/BaseCommandBlock.java -@@ -96,7 +96,7 @@ public abstract class BaseCommandBlock implements CommandSource { - } - - public boolean performCommand(Level level) { -- if (true) return false; // Folia - region threading -+ if (!fun.bm.lophine.config.modules.experiment.CommandConfig.block) return false; // Folia - region threading // Luminol - if (level.isClientSide || level.getGameTime() == this.lastExecution) { - return false; - } else if ("Searge".equalsIgnoreCase(this.command)) { diff --git a/lophine-server/minecraft-patches/features/0002-Add-config-to-disable-end-crystal-check.patch b/lophine-server/minecraft-patches/features/0001-Add-config-to-disable-end-crystal-check.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0002-Add-config-to-disable-end-crystal-check.patch rename to lophine-server/minecraft-patches/features/0001-Add-config-to-disable-end-crystal-check.patch diff --git a/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-tick-command.patch b/lophine-server/minecraft-patches/features/0002-Add-config-to-enable-tick-command.patch similarity index 93% rename from lophine-server/minecraft-patches/features/0003-Add-config-to-enable-tick-command.patch rename to lophine-server/minecraft-patches/features/0002-Add-config-to-enable-tick-command.patch index 4c0aa21..aa04b5b 100644 --- a/lophine-server/minecraft-patches/features/0003-Add-config-to-enable-tick-command.patch +++ b/lophine-server/minecraft-patches/features/0002-Add-config-to-enable-tick-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable tick command diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java -index 8e91ec81128bdbd5f78e1f04fe17bcbd6e5dc280..acdc5dbc34071dc4342f17fab0d483d775c9044d 100644 +index e1842ab8f20271a8b20ab8462b09a4745a612a9a..8405157ec35a443e238fa6866772c839621d73d7 100644 --- a/io/papermc/paper/threadedregions/RegionizedServer.java +++ b/io/papermc/paper/threadedregions/RegionizedServer.java @@ -299,6 +299,11 @@ public final class RegionizedServer { @@ -18,9 +18,9 @@ index 8e91ec81128bdbd5f78e1f04fe17bcbd6e5dc280..acdc5dbc34071dc4342f17fab0d483d7 + } + // Luminol end - Add a config to enable tick command // expire invalid click command callbacks - io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue((int)this.tickCount); - -@@ -321,6 +326,13 @@ public final class RegionizedServer { + io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.ADVENTURE_CLICK_MANAGER.handleQueue((int)this.tickCount); // Paper // Folia - region threading - moved to global tick + io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.handleQueue((int)this.tickCount); // Paper // Folia - region threading - moved to global tick +@@ -322,6 +327,13 @@ public final class RegionizedServer { this.globalTick(world, tickCount); } @@ -34,7 +34,7 @@ index 8e91ec81128bdbd5f78e1f04fe17bcbd6e5dc280..acdc5dbc34071dc4342f17fab0d483d7 // tick connections this.tickConnections(); -@@ -454,7 +466,7 @@ public final class RegionizedServer { +@@ -455,7 +467,7 @@ public final class RegionizedServer { } private void tickTime(final ServerLevel world, final int tickCount) { @@ -114,7 +114,7 @@ index 8a90aa5c145f53afbb3f2371f97cb09974f30bbb..0d5ed9602492c8393088954105e9a190 TitleCommand.register(this.dispatcher, context); //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index b487adb2b104b14346bf7373f07c8d48c239feb4..c285fb3b0e6d3eeda8d4c9132dbd917f4f8ec20c 100644 +index 2ed2f4cca3a81117c0beaf7a11bbbe8156f6a9ce..6675b83c9f15d0341dcf169ec3ac20f401c5d10b 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -267,7 +267,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 20 * 10 && this.isAlive(); } // KioCG @@ -92,7 +92,7 @@ index 6f00ffa05d9597917574357e0069c9b056aa5ce2..5cc7a91e32f17d8d9585ae4844a4ed3b public EntityType( EntityType.EntityFactory factory, diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java -index 47f62fbe97c559c25ad2bc67c18f2025c78e2c69..0a114ac527026473c86f11dab564ac3c31c41f39 100644 +index 2842314c712449625e9275aff7707c916c3ea767..09b549fa9568aa1ae13b1b975db14a6268fdaa46 100644 --- a/net/minecraft/world/entity/player/Player.java +++ b/net/minecraft/world/entity/player/Player.java @@ -229,6 +229,25 @@ public abstract class Player extends LivingEntity { @@ -148,7 +148,7 @@ index 47f62fbe97c559c25ad2bc67c18f2025c78e2c69..0a114ac527026473c86f11dab564ac3c this.noPhysics = this.isSpectator(); if (this.isSpectator() || this.isPassenger()) { this.setOnGround(false); -@@ -1427,6 +1466,7 @@ public abstract class Player extends LivingEntity { +@@ -1426,6 +1465,7 @@ public abstract class Player extends LivingEntity { if (this.containerMenu != null && this.hasContainerOpen()) { this.doCloseContainer(); } diff --git a/lophine-server/minecraft-patches/features/0008-Add-config-to-allow-infinite-trade.patch b/lophine-server/minecraft-patches/features/0007-Add-config-to-allow-infinite-trade.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0008-Add-config-to-allow-infinite-trade.patch rename to lophine-server/minecraft-patches/features/0007-Add-config-to-allow-infinite-trade.patch diff --git a/lophine-server/minecraft-patches/features/0009-Add-config-to-enable-unsafe-waypoint-bar.patch b/lophine-server/minecraft-patches/features/0008-Add-config-to-enable-unsafe-waypoint-bar.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0009-Add-config-to-enable-unsafe-waypoint-bar.patch rename to lophine-server/minecraft-patches/features/0008-Add-config-to-enable-unsafe-waypoint-bar.patch diff --git a/lophine-server/minecraft-patches/features/0010-Purpur-Barrels-and-enderchests-6-rows.patch b/lophine-server/minecraft-patches/features/0009-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 97% rename from lophine-server/minecraft-patches/features/0010-Purpur-Barrels-and-enderchests-6-rows.patch rename to lophine-server/minecraft-patches/features/0009-Purpur-Barrels-and-enderchests-6-rows.patch index f02b1cc..08b6f2c 100644 --- a/lophine-server/minecraft-patches/features/0010-Purpur-Barrels-and-enderchests-6-rows.patch +++ b/lophine-server/minecraft-patches/features/0009-Purpur-Barrels-and-enderchests-6-rows.patch @@ -8,10 +8,10 @@ As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18 Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/LICENSE) diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 31edc8fbe861831d72d3aad271ce1682b2caa248..9347df05c7cb1b74a610bebb99e3a5411309b491 100644 +index a24c332a8f9cb2ebc6f9926c6dabf1238238028d..58c2a6a3304e1bea25980b04046fe7c0017bc90d 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java -@@ -1073,6 +1073,10 @@ public abstract class PlayerList { +@@ -1086,6 +1086,10 @@ public abstract class PlayerList { player.getBukkitEntity().recalculatePermissions(); // CraftBukkit this.server.getCommands().sendCommands(player); } // Paper - Add sendOpLevel API @@ -23,7 +23,7 @@ index 31edc8fbe861831d72d3aad271ce1682b2caa248..9347df05c7cb1b74a610bebb99e3a541 // Paper start - whitelist verify event / login event diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java -index 0a114ac527026473c86f11dab564ac3c31c41f39..283991c8da3ff07359c89482a72a7238c2cb7e26 100644 +index 09b549fa9568aa1ae13b1b975db14a6268fdaa46..6c933c27ce155eb516a9ede96fb2c3bd19251bfa 100644 --- a/net/minecraft/world/entity/player/Player.java +++ b/net/minecraft/world/entity/player/Player.java @@ -219,6 +219,7 @@ public abstract class Player extends LivingEntity { diff --git a/lophine-server/minecraft-patches/features/0011-Stackable-ShulkerBoxes.patch b/lophine-server/minecraft-patches/features/0010-Stackable-ShulkerBoxes.patch similarity index 96% rename from lophine-server/minecraft-patches/features/0011-Stackable-ShulkerBoxes.patch rename to lophine-server/minecraft-patches/features/0010-Stackable-ShulkerBoxes.patch index 13a27d4..6f25d2d 100644 --- a/lophine-server/minecraft-patches/features/0011-Stackable-ShulkerBoxes.patch +++ b/lophine-server/minecraft-patches/features/0010-Stackable-ShulkerBoxes.patch @@ -37,10 +37,10 @@ index 5a1c21b05545a03fbb00cf734605049870d3eecb..2ade5ce23cdab08b1746e2cbe99bfe1d if (count > i) { source.sendFailure(Component.translatable("commands.give.failed.toomanyitems", i, itemStack.getDisplayName())); diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 600e7a716b94102714ed2681e52a42a6d7198fac..a82ef7dbfa7f70071042c3aeafa63c2d6681ea4a 100644 +index 3a78b917cfa2947f26a25e4d77d825e8113a83ef..bec1592ea6ce909bf9b1067e0a32d00c2c4e43f5 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3064,7 +3064,7 @@ public class ServerGamePacketListenerImpl +@@ -3072,7 +3072,7 @@ public class ServerGamePacketListenerImpl } else if (slot.mayPlace(cursor)) { if (ItemStack.isSameItemSameComponents(clickedItem, cursor)) { int toPlace = packet.buttonNum() == 0 ? cursor.getCount() : 1; @@ -49,7 +49,7 @@ index 600e7a716b94102714ed2681e52a42a6d7198fac..a82ef7dbfa7f70071042c3aeafa63c2d toPlace = Math.min(toPlace, slot.container.getMaxStackSize() - clickedItem.getCount()); if (toPlace == 1) { action = InventoryAction.PLACE_ONE; -@@ -3100,7 +3100,7 @@ public class ServerGamePacketListenerImpl +@@ -3108,7 +3108,7 @@ public class ServerGamePacketListenerImpl } } else if (ItemStack.isSameItemSameComponents(cursor, clickedItem)) { if (clickedItem.getCount() >= 0) { @@ -58,7 +58,7 @@ index 600e7a716b94102714ed2681e52a42a6d7198fac..a82ef7dbfa7f70071042c3aeafa63c2d // As of 1.5, this is result slots only action = InventoryAction.PICKUP_ALL; } -@@ -3359,6 +3359,7 @@ public class ServerGamePacketListenerImpl +@@ -3319,6 +3319,7 @@ public class ServerGamePacketListenerImpl this.player.containerMenu.broadcastFullState(); } else { this.player.containerMenu.broadcastChanges(); @@ -66,7 +66,7 @@ index 600e7a716b94102714ed2681e52a42a6d7198fac..a82ef7dbfa7f70071042c3aeafa63c2d } if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) this.player.detectEquipmentUpdates(); // Paper - Force update attributes. } -@@ -3469,7 +3470,7 @@ public class ServerGamePacketListenerImpl +@@ -3429,7 +3430,7 @@ public class ServerGamePacketListenerImpl } boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45; @@ -75,7 +75,7 @@ index 600e7a716b94102714ed2681e52a42a6d7198fac..a82ef7dbfa7f70071042c3aeafa63c2d if (flag || (flag1 && !ItemStack.matches(this.player.inventoryMenu.getSlot(packet.slotNum()).getItem(), packet.itemStack()))) { // Insist on valid slot // CraftBukkit start - Call click event org.bukkit.inventory.InventoryView inventory = this.player.inventoryMenu.getBukkitView(); -@@ -3511,6 +3512,7 @@ public class ServerGamePacketListenerImpl +@@ -3471,6 +3472,7 @@ public class ServerGamePacketListenerImpl this.player.inventoryMenu.getSlot(packet.slotNum()).setByPlayer(itemStack); this.player.inventoryMenu.setRemoteSlot(packet.slotNum(), itemStack); this.player.inventoryMenu.broadcastChanges(); @@ -251,10 +251,10 @@ index 02d2efef2dc0f0e12eac0c71fa290af706f7694d..d042b3729a615bdabeb08f559ac895a7 default SlotAccess getChestVehicleSlot(final int index) { diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java -index 852b4381985ed167b05881f068e9542c31cdaf23..379ccae078370b4e8fc909e642f1a70066f70ebf 100644 +index 9b6cd35e4dfa894069238a1365db16050aa5542b..a928c2e50e43245542a8bc8e307acf27259bbf74 100644 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java -@@ -234,6 +234,14 @@ public abstract class AbstractContainerMenu { +@@ -258,6 +258,14 @@ public abstract class AbstractContainerMenu { return list; } @@ -269,7 +269,7 @@ index 852b4381985ed167b05881f068e9542c31cdaf23..379ccae078370b4e8fc909e642f1a700 public void broadcastChanges() { for (int i = 0; i < this.slots.size(); i++) { ItemStack item = this.slots.get(i).getItem(); -@@ -427,7 +435,7 @@ public abstract class AbstractContainerMenu { +@@ -451,7 +459,7 @@ public abstract class AbstractContainerMenu { && (this.quickcraftType == 2 || carried1.getCount() >= this.quickcraftSlots.size()) && this.canDragTo(slot1)) { int i2 = slot1.hasItem() ? slot1.getItem().getCount() : 0; @@ -278,7 +278,7 @@ index 852b4381985ed167b05881f068e9542c31cdaf23..379ccae078370b4e8fc909e642f1a700 int min1 = Math.min(getQuickCraftPlaceCount(this.quickcraftSlots, this.quickcraftType, itemStack) + i2, min); count -= min1 - i2; // slot1.setByPlayer(itemStack.copyWithCount(min1)); -@@ -541,7 +549,7 @@ public abstract class AbstractContainerMenu { +@@ -563,7 +571,7 @@ public abstract class AbstractContainerMenu { slot.setByPlayer(carried2); } } else if (ItemStack.isSameItemSameComponents(carried, carried2)) { @@ -287,7 +287,7 @@ index 852b4381985ed167b05881f068e9542c31cdaf23..379ccae078370b4e8fc909e642f1a700 optional1.ifPresent(itemStack2 -> { carried2.grow(itemStack2.getCount()); slot.onTake(player, itemStack2); -@@ -603,7 +611,7 @@ public abstract class AbstractContainerMenu { +@@ -625,7 +633,7 @@ public abstract class AbstractContainerMenu { Slot slot2 = this.slots.get(slotId); if (slot2.hasItem()) { ItemStack itemStack = slot2.getItem(); @@ -296,7 +296,7 @@ index 852b4381985ed167b05881f068e9542c31cdaf23..379ccae078370b4e8fc909e642f1a700 } } else if (clickType == ClickType.THROW && this.getCarried().isEmpty() && slotId >= 0) { Slot slot2 = this.slots.get(slotId); -@@ -634,15 +642,15 @@ public abstract class AbstractContainerMenu { +@@ -656,15 +664,15 @@ public abstract class AbstractContainerMenu { int maxStackSize = button == 0 ? 1 : -1; for (int i3 = 0; i3 < 2; i3++) { @@ -315,7 +315,7 @@ index 852b4381985ed167b05881f068e9542c31cdaf23..379ccae078370b4e8fc909e642f1a700 itemStack.grow(itemStack1.getCount()); } } -@@ -744,7 +752,7 @@ public abstract class AbstractContainerMenu { +@@ -766,7 +774,7 @@ public abstract class AbstractContainerMenu { i = endIndex - 1; } @@ -324,7 +324,7 @@ index 852b4381985ed167b05881f068e9542c31cdaf23..379ccae078370b4e8fc909e642f1a700 while (!stack.isEmpty() && (reverseDirection ? i >= startIndex : i < endIndex)) { Slot slot = this.slots.get(i); ItemStack item = slot.getItem(); -@@ -845,7 +853,7 @@ public abstract class AbstractContainerMenu { +@@ -867,7 +875,7 @@ public abstract class AbstractContainerMenu { public static boolean canItemQuickReplace(@Nullable Slot slot, ItemStack stack, boolean stackSizeMatters) { boolean flag = slot == null || !slot.hasItem(); return !flag && ItemStack.isSameItemSameComponents(stack, slot.getItem()) @@ -333,7 +333,7 @@ index 852b4381985ed167b05881f068e9542c31cdaf23..379ccae078370b4e8fc909e642f1a700 : flag; } -@@ -853,7 +861,7 @@ public abstract class AbstractContainerMenu { +@@ -875,7 +883,7 @@ public abstract class AbstractContainerMenu { return switch (type) { case 0 -> Mth.floor((float)stack.getCount() / slots.size()); case 1 -> 1; @@ -342,7 +342,7 @@ index 852b4381985ed167b05881f068e9542c31cdaf23..379ccae078370b4e8fc909e642f1a700 default -> stack.getCount(); }; } -@@ -875,7 +883,7 @@ public abstract class AbstractContainerMenu { +@@ -897,7 +905,7 @@ public abstract class AbstractContainerMenu { for (int i = 0; i < container.getContainerSize(); i++) { ItemStack item = container.getItem(i); if (!item.isEmpty()) { @@ -378,7 +378,7 @@ index 5ceb8964476b40db4511bec91ff13c4f522a1357..dd978d1590fb896775a240ed87e38d85 @Nullable diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java -index 2c15a382dcbd1087dc06b562149239c8bf4e035e..25b0f7ee2d80bcfa10e850fa59001d0da7b5fd9c 100644 +index 6154da1158756cff072d7e8cae10e20eafed1eec..687249e1ad1cb09edbe2939f1db2f90e146cd664 100644 --- a/net/minecraft/world/item/ItemStack.java +++ b/net/minecraft/world/item/ItemStack.java @@ -162,7 +162,7 @@ public final class ItemStack implements DataComponentHolder { diff --git a/lophine-server/minecraft-patches/features/0012-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0011-Spawn-invulnerable-time.patch similarity index 95% rename from lophine-server/minecraft-patches/features/0012-Spawn-invulnerable-time.patch rename to lophine-server/minecraft-patches/features/0011-Spawn-invulnerable-time.patch index 216cad8..a2b7612 100644 --- a/lophine-server/minecraft-patches/features/0012-Spawn-invulnerable-time.patch +++ b/lophine-server/minecraft-patches/features/0011-Spawn-invulnerable-time.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn invulnerable time diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 0f6b2603875031048e6d6bfcd47c0e8923cdc71a..cb56ec27a5d1bdda960f609e16155a38843b1f3c 100644 +index b7bc75648634aefc549a69631ab6e401eb902e7d..0e2d575200f3ff3ec1600a0663152e3c37ea67b0 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -232,6 +232,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/lophine-server/minecraft-patches/features/0013-Old-Explosion-Damage-Calculator.patch b/lophine-server/minecraft-patches/features/0012-Old-Explosion-Damage-Calculator.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0013-Old-Explosion-Damage-Calculator.patch rename to lophine-server/minecraft-patches/features/0012-Old-Explosion-Damage-Calculator.patch diff --git a/lophine-server/minecraft-patches/features/0014-Old-replaceable-by-mushrooms.patch b/lophine-server/minecraft-patches/features/0013-Old-replaceable-by-mushrooms.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0014-Old-replaceable-by-mushrooms.patch rename to lophine-server/minecraft-patches/features/0013-Old-replaceable-by-mushrooms.patch diff --git a/lophine-server/minecraft-patches/features/0015-Old-zombie-reinforcement.patch b/lophine-server/minecraft-patches/features/0014-Old-zombie-reinforcement.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0015-Old-zombie-reinforcement.patch rename to lophine-server/minecraft-patches/features/0014-Old-zombie-reinforcement.patch diff --git a/lophine-server/minecraft-patches/features/0016-I18n-support.patch b/lophine-server/minecraft-patches/features/0015-I18n-support.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0016-I18n-support.patch rename to lophine-server/minecraft-patches/features/0015-I18n-support.patch diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java index 2cc206f..a26fd95 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java @@ -5,11 +5,6 @@ import me.earthme.luminol.config.IConfigModule; import me.earthme.luminol.config.flags.ConfigInfo; public class CommandConfig implements IConfigModule { - @ConfigInfo(baseName = "command_block_enabled", comments = - """ - Allow to use command block""") - public static boolean block = false; - @ConfigInfo(baseName = "tick_command_enabled", comments = """ Allow to use tick command""")