Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Controllable mixin core features w/ Update LegacyLauncher to 1.22

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/pom.xml
View File

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

2
sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBan.java
View File

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

2
sources/src/main/java/io/akarin/server/mixin/core/MixinCommandBanIp.java
View File

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

2
sources/src/main/java/io/akarin/server/mixin/core/MixinCommandKick.java
View File

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

2
sources/src/main/java/io/akarin/server/mixin/core/MixinCraftServer.java
View File

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

2
sources/src/main/java/io/akarin/server/mixin/core/MixinMCUtil.java
View File

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

2
sources/src/main/java/io/akarin/server/mixin/optimization/WeakBigTree.java
View File

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

23
sources/src/main/resources/mixins.akarin.core.json
View File

@@ -25,37 +25,14 @@
"core.MixinMinecraftServer",
"core.MixinChunkIOExecutor",
"cps.MixinChunk",
"cps.MixinCraftWorld",
"cps.MixinChunkProviderServer",
"nsc.OptimisticNetworkManager",
"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.MixinPlayerChunk",
"optimization.PandaRedstoneWire",
"optimization.WeakEnchantmentManager",
"optimization.MixinEntityHorseAbstract",
"optimization.MixinEntityTameableAnimal",

15
sources/src/main/resources/mixins.akarin.optimization.lighting.json Normal file
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",
]
}

10
sources/src/main/resources/mixins.akarin.optimization.pandawire.json Normal file
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",
]
}

24
sources/src/main/resources/mixins.akarin.optimization.realtime.json Normal file
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",
]
}