infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

Fix dedicated server commands (#93) - hopefully a temporary approach (I wish...) (#106)

Browse source
This commit is contained in:
Modmuss50 2019-02-24 23:48:35 +00:00 committed by Adrian Siekierka
parent 5c683237dd
commit 98c307909e
4 changed files with 61 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -39,7 +39,7 @@ minecraft {
dependencies {
minecraft "com.mojang:minecraft:$mcVersion"
mappings "net.fabricmc:yarn:$mcVersion.4"
modCompile "net.fabricmc:fabric-loader:0.3.7.108"
modCompile "net.fabricmc:fabric-loader:0.3.7.109"
}
task sourcesJar(type: Jar, dependsOn: classes) {

57
src/main/java/net/fabricmc/fabric/mixin/commands/MixinMinecraftDedicatedServer.java Normal file
View file

@ -0,0 +1,57 @@
/*
* Copyright (c) 2016, 2017, 2018 FabricMC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.fabricmc.fabric.mixin.commands;
import com.mojang.authlib.GameProfileRepository;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.datafixers.DataFixer;
import net.fabricmc.fabric.api.registry.CommandRegistry;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.WorldGenerationProgressListenerFactory;
import net.minecraft.server.command.ServerCommandManager;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.server.dedicated.MinecraftDedicatedServer;
import net.minecraft.util.UserCache;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.io.File;
import java.net.Proxy;
import java.util.function.Consumer;
@Mixin(MinecraftDedicatedServer.class)
public abstract class MixinMinecraftDedicatedServer extends MinecraftServer {
public MixinMinecraftDedicatedServer(File file_1, Proxy proxy_1, DataFixer dataFixer_1, ServerCommandManager serverCommandManager_1, YggdrasilAuthenticationService yggdrasilAuthenticationService_1, MinecraftSessionService minecraftSessionService_1, GameProfileRepository gameProfileRepository_1, UserCache userCache_1, WorldGenerationProgressListenerFactory worldGenerationProgressListenerFactory_1, String string_1) {
super(file_1, proxy_1, dataFixer_1, serverCommandManager_1, yggdrasilAuthenticationService_1, minecraftSessionService_1, gameProfileRepository_1, userCache_1, worldGenerationProgressListenerFactory_1, string_1);
}
@Inject(method = "setupServer", at = @At("HEAD"))
private void setupServer(CallbackInfoReturnable<Boolean> info){
//Load none dedicated only commands and dedicated only commands
for(Consumer<CommandDispatcher<ServerCommandSource>> entry : CommandRegistry.INSTANCE.entries(false)){
entry.accept(getCommandManager().getDispatcher());
}
for(Consumer<CommandDispatcher<ServerCommandSource>> entry : CommandRegistry.INSTANCE.entries(true)){
entry.accept(getCommandManager().getDispatcher());
}
}
}

5
src/main/java/net/fabricmc/fabric/mixin/commands/MixinServerCommandManager.java
View file

@ -37,9 +37,8 @@ public class MixinServerCommandManager {
@Inject(method = "<init>(Z)V", at = @At("RETURN"))
public void addMethods(boolean dedicated, CallbackInfo info) {
// TODO: Run before findAmbiguities
CommandRegistry.INSTANCE.entries(false).forEach((e) -> e.accept(dispatcher));
if (dedicated) {
CommandRegistry.INSTANCE.entries(true).forEach((e) -> e.accept(dispatcher));
if(!dedicated){
CommandRegistry.INSTANCE.entries(false).forEach((e) -> e.accept(dispatcher));
}
}
}

1
src/main/resources/net.fabricmc.fabric.mixins.common.json
View file

@ -6,6 +6,7 @@
"block.MixinBlockBuilder",
"block.MixinFireBlock",
"block.entity.MixinBlockEntity",
"commands.MixinMinecraftDedicatedServer",
"commands.MixinServerCommandManager",
"container.MixinServerPlayerEntity",
"entity.MixinEntityTracker",