Controllable mixin core features w/ Update LegacyLauncher to 1.22

This commit is contained in:
Sotr
2018-06-14 19:56:08 +08:00
parent 974cf681d0
commit 19e1d0d927
11 changed files with 56 additions and 30 deletions

View File

@@ -126,7 +126,7 @@
<dependency> <dependency>
<groupId>io.akarin</groupId> <groupId>io.akarin</groupId>
<artifactId>legacylauncher</artifactId> <artifactId>legacylauncher</artifactId>
<version>1.20</version> <version>1.22</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.spongepowered</groupId> <groupId>org.spongepowered</groupId>

View File

@@ -20,7 +20,7 @@ import net.minecraft.server.ICommandListener;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@Mixin(value = CommandBan.class, remap = false) @Mixin(value = CommandBan.class, remap = false)
public class MixinCommandBan { public abstract class MixinCommandBan {
@Overwrite @Overwrite
public void execute(MinecraftServer server, ICommandListener sender, String[] args) throws CommandException { public void execute(MinecraftServer server, ICommandListener sender, String[] args) throws CommandException {
if (args.length >= 1 && args[0].length() > 1) { if (args.length >= 1 && args[0].length() > 1) {

View File

@@ -18,7 +18,7 @@ import net.minecraft.server.IpBanEntry;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@Mixin(value = CommandBanIp.class, remap = false) @Mixin(value = CommandBanIp.class, remap = false)
public class MixinCommandBanIp { public abstract class MixinCommandBanIp {
@Overwrite // PAIL: banIp @Overwrite // PAIL: banIp
protected void a(MinecraftServer server, ICommandListener sender, String args, @Nullable String banReason) { protected void a(MinecraftServer server, ICommandListener sender, String args, @Nullable String banReason) {
// Akarin start - modify message // Akarin start - modify message

View File

@@ -14,7 +14,7 @@ import net.minecraft.server.ICommandListener;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@Mixin(value = CommandKick.class, remap = false) @Mixin(value = CommandKick.class, remap = false)
public class MixinCommandKick { public abstract class MixinCommandKick {
@Overwrite @Overwrite
public void execute(MinecraftServer server, ICommandListener sender, String[] args) throws CommandException { public void execute(MinecraftServer server, ICommandListener sender, String[] args) throws CommandException {
if (args.length > 0 && args[0].length() > 1) { if (args.length > 0 && args[0].length() > 1) {

View File

@@ -12,7 +12,7 @@ import me.nallar.whocalled.WhoCalled;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@Mixin(value = CraftServer.class, remap = false) @Mixin(value = CraftServer.class, remap = false)
public class MixinCraftServer { public abstract class MixinCraftServer {
@Shadow @Final @Mutable private String serverName; @Shadow @Final @Mutable private String serverName;
@Shadow @Final protected MinecraftServer console; @Shadow @Final protected MinecraftServer console;
private boolean needApplyServerName = true; private boolean needApplyServerName = true;

View File

@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Overwrite;
import net.minecraft.server.MCUtil; import net.minecraft.server.MCUtil;
@Mixin(value = MCUtil.class, remap = false) @Mixin(value = MCUtil.class, remap = false)
public class MixinMCUtil { public abstract class MixinMCUtil {
@Overwrite @Overwrite
public static <T> T ensureMain(String reason, Supplier<T> run) { public static <T> T ensureMain(String reason, Supplier<T> run) {
return run.get(); return run.get();

View File

@@ -16,7 +16,7 @@ import net.minecraft.server.WorldGenBigTree;
* Fixes MC-128547(https://bugs.mojang.com/browse/MC-128547) * Fixes MC-128547(https://bugs.mojang.com/browse/MC-128547)
*/ */
@Mixin(value = WorldGenBigTree.class, remap = false) @Mixin(value = WorldGenBigTree.class, remap = false)
public class WeakBigTree { public abstract class WeakBigTree {
@Shadow(aliases = "l") private World worldReference; @Shadow(aliases = "l") private World worldReference;
@Inject(method = "generate", at = @At("RETURN")) @Inject(method = "generate", at = @At("RETURN"))

View File

@@ -25,37 +25,14 @@
"core.MixinMinecraftServer", "core.MixinMinecraftServer",
"core.MixinChunkIOExecutor", "core.MixinChunkIOExecutor",
"cps.MixinChunk",
"cps.MixinCraftWorld", "cps.MixinCraftWorld",
"cps.MixinChunkProviderServer", "cps.MixinChunkProviderServer",
"nsc.OptimisticNetworkManager", "nsc.OptimisticNetworkManager",
"nsc.NonblockingServerConnection", "nsc.NonblockingServerConnection",
"lighting.MixinChunk",
"lighting.MixinWorld",
"lighting.MixinWorldServer",
"lighting.MixinChunkProviderServer",
"realtime.MixinWorld",
"realtime.MixinEntity",
"realtime.MixinEntityItem",
"realtime.MixinWorldServer",
"realtime.MixinEntityHuman",
"realtime.MixinEntityPlayer",
"realtime.MixinEntityAgeable",
"realtime.MixinMinecraftServer",
"realtime.MixinEntityInsentient",
"realtime.MixinPlayerConnection",
"realtime.MixinTileEntityFurnace",
"realtime.MixinEntityExperienceOrb",
"realtime.MixinEntityZombieVillager",
"realtime.MixinPlayerInteractManager",
"realtime.MixinTileEntityBrewingStand",
"optimization.WeakBigTree", "optimization.WeakBigTree",
"optimization.MixinPlayerChunk", "optimization.MixinPlayerChunk",
"optimization.PandaRedstoneWire",
"optimization.WeakEnchantmentManager", "optimization.WeakEnchantmentManager",
"optimization.MixinEntityHorseAbstract", "optimization.MixinEntityHorseAbstract",
"optimization.MixinEntityTameableAnimal", "optimization.MixinEntityTameableAnimal",

View File

@@ -0,0 +1,15 @@
{
"required": true,
"minVersion": "0.7.8",
"package": "io.akarin.server.mixin",
"target": "@env(DEFAULT)",
"compatibilityLevel": "JAVA_8",
"server": [
"cps.MixinChunk",
"lighting.MixinChunk",
"lighting.MixinWorld",
"lighting.MixinWorldServer",
"lighting.MixinChunkProviderServer",
]
}

View File

@@ -0,0 +1,10 @@
{
"required": true,
"minVersion": "0.7.8",
"package": "io.akarin.server.mixin",
"target": "@env(DEFAULT)",
"compatibilityLevel": "JAVA_8",
"server": [
"optimization.PandaRedstoneWire",
]
}

View File

@@ -0,0 +1,24 @@
{
"required": true,
"minVersion": "0.7.8",
"package": "io.akarin.server.mixin",
"target": "@env(DEFAULT)",
"compatibilityLevel": "JAVA_8",
"server": [
"realtime.MixinWorld",
"realtime.MixinEntity",
"realtime.MixinEntityItem",
"realtime.MixinWorldServer",
"realtime.MixinEntityHuman",
"realtime.MixinEntityPlayer",
"realtime.MixinEntityAgeable",
"realtime.MixinMinecraftServer",
"realtime.MixinEntityInsentient",
"realtime.MixinPlayerConnection",
"realtime.MixinTileEntityFurnace",
"realtime.MixinEntityExperienceOrb",
"realtime.MixinEntityZombieVillager",
"realtime.MixinPlayerInteractManager",
"realtime.MixinTileEntityBrewingStand",
]
}