diff --git a/sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java index ffe2da92c..24751302f 100644 --- a/sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java +++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/Bootstrap.java @@ -14,7 +14,7 @@ import io.akarin.api.internal.Akari; import io.akarin.server.core.AkarinGlobalConfig; @Mixin(value = Main.class, remap = false) -public class Bootstrap { +public abstract class Bootstrap { @Inject(method = "main([Ljava/lang/String;)V", at = @At("HEAD")) private static void premain(CallbackInfo info) { AkarinGlobalConfig.init(new File("akarin.yml")); diff --git a/sources/src/main/java/io/akarin/server/mixin/bootstrap/DummyEula.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/DummyEula.java index 1598cbf27..0b6b2f0db 100644 --- a/sources/src/main/java/io/akarin/server/mixin/bootstrap/DummyEula.java +++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/DummyEula.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Overwrite; import net.minecraft.server.EULA; @Mixin(value = EULA.class, remap = false) -public class DummyEula { +public abstract class DummyEula { /** * Read then check the EULA file formerly * @param file diff --git a/sources/src/main/java/io/akarin/server/mixin/bootstrap/MetricsBootstrap.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/MetricsBootstrap.java index 6ff1892c2..aff6d21c4 100644 --- a/sources/src/main/java/io/akarin/server/mixin/bootstrap/MetricsBootstrap.java +++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/MetricsBootstrap.java @@ -14,7 +14,7 @@ import com.destroystokyo.paper.Metrics; import net.minecraft.server.MinecraftServer; @Mixin(targets = "com.destroystokyo.paper.Metrics$PaperMetrics", remap = false) -public class MetricsBootstrap { +public abstract class MetricsBootstrap { @Overwrite static void startMetrics() { // Get the config file diff --git a/sources/src/main/java/io/akarin/server/mixin/bootstrap/MixinMetrics.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/MixinMetrics.java index 0b77f3c23..66d6be309 100644 --- a/sources/src/main/java/io/akarin/server/mixin/bootstrap/MixinMetrics.java +++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/MixinMetrics.java @@ -17,7 +17,7 @@ import com.destroystokyo.paper.Metrics; import com.destroystokyo.paper.Metrics.CustomChart; @Mixin(value = Metrics.class, remap = false) -public class MixinMetrics { +public abstract class MixinMetrics { // The url to which the data is sent - bukkit/Torch (keep our old name) private final static String URL = "https://bStats.org/submitData/bukkit"; diff --git a/sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java index fcafd087d..8a899b9c1 100644 --- a/sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java +++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/ParallelRegistry.java @@ -24,7 +24,7 @@ import net.minecraft.server.PotionRegistry; import net.minecraft.server.SoundEffect; @Mixin(value = DispenserRegistry.class, remap = false) -public class ParallelRegistry { +public abstract class ParallelRegistry { /** * Registry order: SoundEffect -> Block */ diff --git a/sources/src/main/java/io/akarin/server/mixin/bootstrap/Watchcat.java b/sources/src/main/java/io/akarin/server/mixin/bootstrap/Watchcat.java index 4deb6dbd4..60dc41f72 100644 --- a/sources/src/main/java/io/akarin/server/mixin/bootstrap/Watchcat.java +++ b/sources/src/main/java/io/akarin/server/mixin/bootstrap/Watchcat.java @@ -21,7 +21,7 @@ import io.akarin.server.core.AkarinGlobalConfig; import net.minecraft.server.MinecraftServer; @Mixin(value = WatchdogThread.class, remap = false) -public class Watchcat extends Thread { +public abstract class Watchcat extends Thread { @Shadow private static WatchdogThread instance; @Shadow private @Final long timeoutTime; @Shadow private @Final boolean restart; diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinAsyncCatcher.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinAsyncCatcher.java index 4785d88fb..f23c59ce0 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinAsyncCatcher.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinAsyncCatcher.java @@ -10,7 +10,7 @@ import io.akarin.server.core.AkarinGlobalConfig; import net.minecraft.server.MinecraftServer; @Mixin(value = AsyncCatcher.class, remap = false) -public class MixinAsyncCatcher { +public abstract class MixinAsyncCatcher { @Shadow public static boolean enabled; @Overwrite diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinChunkIOExecutor.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinChunkIOExecutor.java index 0b6603e43..5b33d2bdf 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinChunkIOExecutor.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinChunkIOExecutor.java @@ -12,7 +12,7 @@ import io.akarin.server.core.AkarinGlobalConfig; import net.minecraft.server.Chunk; @Mixin(value = ChunkIOExecutor.class, remap = false) -public class MixinChunkIOExecutor { +public abstract class MixinChunkIOExecutor { @Shadow @Final static int BASE_THREADS; @Shadow @Mutable @Final static int PLAYERS_PER_THREAD; @Shadow @Final private static AsynchronousExecutor instance; diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java index c8961292f..e6bf75f1e 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinVersionCommand.java @@ -14,7 +14,7 @@ import io.akarin.server.core.AkarinGlobalConfig; import net.minecraft.server.MCUtil; @Mixin(value = VersionCommand.class, remap = false) -public class MixinVersionCommand { +public abstract class MixinVersionCommand { @Shadow private static int getFromRepo(String repo, String hash) { return 0; } /** diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinWorldServer.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinWorldServer.java index 191f80b68..20b82c46f 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinWorldServer.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinWorldServer.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; import net.minecraft.server.WorldServer; @Mixin(value = WorldServer.class, remap = false) -public class MixinWorldServer { +public abstract class MixinWorldServer { @Redirect(method = "doTick", at = @At( value = "INVOKE", target = "net/minecraft/server/PlayerChunkMap.flush()V" diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MonsterEggGuardian.java b/sources/src/main/java/io/akarin/server/mixin/core/MonsterEggGuardian.java index fcc1a7a45..d7c7e7307 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MonsterEggGuardian.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MonsterEggGuardian.java @@ -11,7 +11,7 @@ import net.minecraft.server.Blocks; import net.minecraft.server.ItemMonsterEgg; @Mixin(value = ItemMonsterEgg.class, remap = false) -public class MonsterEggGuardian { +public abstract class MonsterEggGuardian { @Redirect(method = "a", at = @At( value = "FIELD", target = "net/minecraft/server/Blocks.MOB_SPAWNER:Lnet/minecraft/server/Block;", diff --git a/sources/src/main/java/io/akarin/server/mixin/cps/MixinCraftWorld.java b/sources/src/main/java/io/akarin/server/mixin/cps/MixinCraftWorld.java index 39ce2aafc..04a28cc77 100644 --- a/sources/src/main/java/io/akarin/server/mixin/cps/MixinCraftWorld.java +++ b/sources/src/main/java/io/akarin/server/mixin/cps/MixinCraftWorld.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; import net.minecraft.server.WorldServer; @Mixin(value = CraftWorld.class, remap = false) -public class MixinCraftWorld { +public abstract class MixinCraftWorld { @Shadow @Final private WorldServer world; @Redirect(method = "processChunkGC()V", at = @At( diff --git a/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunkProviderServer.java b/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunkProviderServer.java index 61fff71e5..aa384fcba 100644 --- a/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunkProviderServer.java +++ b/sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunkProviderServer.java @@ -35,7 +35,7 @@ import net.minecraft.server.ChunkProviderServer; import net.minecraft.server.WorldServer; @Mixin(value = ChunkProviderServer.class, remap = false, priority = 1001) -public class MixinChunkProviderServer { +public abstract class MixinChunkProviderServer { @Shadow @Final public WorldServer world; @Redirect(method = "unloadChunks", at = @At( diff --git a/sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java b/sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java index 41de9c1de..af54f2f03 100644 --- a/sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java +++ b/sources/src/main/java/io/akarin/server/mixin/nsc/NonblockingServerConnection.java @@ -17,7 +17,6 @@ import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; import com.google.common.collect.Lists; -import io.akarin.api.internal.Akari; import io.akarin.api.internal.LocalAddress; import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.ChannelAdapter; @@ -37,7 +36,7 @@ import net.minecraft.server.PacketPlayOutKickDisconnect; import net.minecraft.server.ServerConnection; @Mixin(value = ServerConnection.class, remap = false) -public class NonblockingServerConnection { +public abstract class NonblockingServerConnection { private final static Logger logger = LogManager.getLogger("NSC"); /** diff --git a/sources/src/main/java/io/akarin/server/mixin/optimization/MixinPlayerChunk.java b/sources/src/main/java/io/akarin/server/mixin/optimization/MixinPlayerChunk.java index b8baa94c6..b0887c78e 100644 --- a/sources/src/main/java/io/akarin/server/mixin/optimization/MixinPlayerChunk.java +++ b/sources/src/main/java/io/akarin/server/mixin/optimization/MixinPlayerChunk.java @@ -15,7 +15,7 @@ import net.minecraft.server.EntityPlayer; import net.minecraft.server.PlayerChunk; @Mixin(value = PlayerChunk.class, remap = false) -public class MixinPlayerChunk { +public abstract class MixinPlayerChunk { @Shadow @Final public List c; // PAIL: players @Inject(method = "b", at = @At( diff --git a/sources/src/main/java/io/akarin/server/mixin/optimization/MixinTileEntityEnchantTable.java b/sources/src/main/java/io/akarin/server/mixin/optimization/MixinTileEntityEnchantTable.java index b6779b0a9..f5fedc9ae 100644 --- a/sources/src/main/java/io/akarin/server/mixin/optimization/MixinTileEntityEnchantTable.java +++ b/sources/src/main/java/io/akarin/server/mixin/optimization/MixinTileEntityEnchantTable.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Overwrite; import net.minecraft.server.TileEntityEnchantTable; @Mixin(value = TileEntityEnchantTable.class, remap = false) -public class MixinTileEntityEnchantTable { +public abstract class MixinTileEntityEnchantTable { @Overwrite public void e() {} // No tickable } diff --git a/sources/src/main/java/io/akarin/server/mixin/optimization/PandaRedstoneWire.java b/sources/src/main/java/io/akarin/server/mixin/optimization/PandaRedstoneWire.java index d1cb5e70d..8204490fb 100644 --- a/sources/src/main/java/io/akarin/server/mixin/optimization/PandaRedstoneWire.java +++ b/sources/src/main/java/io/akarin/server/mixin/optimization/PandaRedstoneWire.java @@ -7,7 +7,6 @@ import java.util.Set; import javax.annotation.Nullable; import org.apache.commons.lang3.ArrayUtils; -import org.bukkit.event.Event; import org.bukkit.event.block.BlockRedstoneEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/sources/src/main/java/io/akarin/server/mixin/optimization/WeakEnchantmentManager.java b/sources/src/main/java/io/akarin/server/mixin/optimization/WeakEnchantmentManager.java index bdcebb082..23718cedb 100644 --- a/sources/src/main/java/io/akarin/server/mixin/optimization/WeakEnchantmentManager.java +++ b/sources/src/main/java/io/akarin/server/mixin/optimization/WeakEnchantmentManager.java @@ -40,7 +40,7 @@ import net.minecraft.server.ItemStack; * Fixes MC-128547(https://bugs.mojang.com/browse/MC-128547) */ @Mixin(value = EnchantmentManager.class, remap = false) -public class WeakEnchantmentManager { +public abstract class WeakEnchantmentManager { @Shadow(aliases = "a") @Final private static EnchantmentManager.EnchantmentModifierProtection protection; @Shadow(aliases = "c") @Final private static EnchantmentManager.EnchantmentModifierThorns thorns; @Shadow(aliases = "d") @Final private static EnchantmentManager.EnchantmentModifierArthropods arthropods; diff --git a/sources/src/main/java/io/akarin/server/mixin/realtime/MixinWorld.java b/sources/src/main/java/io/akarin/server/mixin/realtime/MixinWorld.java index bfec6c590..9905faecf 100644 --- a/sources/src/main/java/io/akarin/server/mixin/realtime/MixinWorld.java +++ b/sources/src/main/java/io/akarin/server/mixin/realtime/MixinWorld.java @@ -1,3 +1,27 @@ +/* + * This file is part of Sponge, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ package io.akarin.server.mixin.realtime; import javax.annotation.Nullable;