HitR0ck/e4mc_minecraft
1
0
Fork 0
forked from me/e4mc_minecraft
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'touch up the server network io mixin and restrict /e4mc stop' (#19) from BasiqueEvangelist/e4mc_minecraft:some-fixes into main

Browse source 
Reviewed-on: me/e4mc_minecraft#19
This commit is contained in:
me 2023-05-14 05:54:37 +00:00
commit 017d5f88f0
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
gradlew vendored Normal file → Executable file
View file

7
src/main/java/vg/skye/e4mc_minecraft/mixins/ServerNetworkIoMixin.java
View file

@ -11,6 +11,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import vg.skye.e4mc_minecraft.E4mcClient; import vg.skye.e4mc_minecraft.E4mcClient;
@ -45,9 +46,9 @@ public abstract class ServerNetworkIoMixin {
} }
} }
@Redirect(method = "bind", at = @At(value = "INVOKE", target = "Lio/netty/bootstrap/ServerBootstrap;channel(Ljava/lang/Class;)Lio/netty/bootstrap/AbstractBootstrap;", remap = false)) @ModifyArg(method = "bind", at = @At(value = "INVOKE", target = "Lio/netty/bootstrap/ServerBootstrap;channel(Ljava/lang/Class;)Lio/netty/bootstrap/AbstractBootstrap;", remap = false))
private AbstractBootstrap<ServerBootstrap, ServerChannel> redirectChannel(ServerBootstrap instance, Class<? extends ServerSocketChannel> aClass) { private Class<? extends ServerChannel> redirectChannel(Class<? extends ServerChannel> aClass) {
return initializingE4mc.get() ? instance.channel(LocalServerChannel.class) : instance.channel(aClass); return initializingE4mc.get() ? LocalServerChannel.class : aClass;
} }
@Redirect(method = "bind", at = @At(value = "INVOKE", target = "Lio/netty/bootstrap/ServerBootstrap;localAddress(Ljava/net/InetAddress;I)Lio/netty/bootstrap/AbstractBootstrap;", remap = false)) @Redirect(method = "bind", at = @At(value = "INVOKE", target = "Lio/netty/bootstrap/ServerBootstrap;localAddress(Ljava/net/InetAddress;I)Lio/netty/bootstrap/AbstractBootstrap;", remap = false))

7
src/main/kotlin/vg/skye/e4mc_minecraft/E4mcClient.kt
View file

@ -49,6 +49,13 @@ object E4mcClient : ModInitializer {
dispatcher.register(literal("e4mc") dispatcher.register(literal("e4mc")
.then( .then(
literal("stop") literal("stop")
.requires { src ->
if (src.server.isDedicated) {
src.hasPermissionLevel(4)
} else {
src.server.isHost((src.player ?: return@requires false).gameProfile)
}
}
.executes { context -> .executes { context ->
if (HANDLER != null) { if (HANDLER != null) {
HANDLER!!.close() HANDLER!!.close()