FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-14 19:25:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix dedicated servers wrt last commit

Browse source
This commit is contained in:
asie 2019-02-25 19:47:31 +01:00
parent cc7320db01
commit 8aa754d6eb
3 changed files with 53 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/net/fabricmc/fabric/mixin/resources/MixinReloadableResourceManagerImpl.java
View file

@ -43,17 +43,11 @@ public class MixinReloadableResourceManagerImpl {
private ResourceType type;
private void fabric_injectListeners() {
ResourceManagerHelperImpl.sort(type, field_17935);
ResourceManagerHelperImpl.sort(type, field_17936);
}
@Inject(at = @At("HEAD"), method = "createReloadHandler")
public void createReloadHandler(Executor executor_1, Executor executor_2, CompletableFuture<Void> completableFuture_1, CallbackInfoReturnable<ResourceReloadHandler> callback) {
fabric_injectListeners();
}
@Inject(at = @At("HEAD"), method = "reload")
public void reload(Executor var1, Executor var2, List<ResourcePack> packs, CompletableFuture future, CallbackInfoReturnable<CompletableFuture> info) {
fabric_injectListeners();
ResourceManagerHelperImpl.sort(type, field_17935);
ResourceManagerHelperImpl.sort(type, field_17936);
}
}

49
src/main/java/net/fabricmc/fabric/mixin/resources/MixinReloadableResourceManagerImplClient.java Normal file
View file

@ -0,0 +1,49 @@
/*
* 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.resources;
import net.fabricmc.fabric.impl.resources.ResourceManagerHelperImpl;
import net.minecraft.resource.*;
import net.minecraft.util.Void;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
@Mixin(ReloadableResourceManagerImpl.class)
public class MixinReloadableResourceManagerImplClient {
@Shadow
private List<ResourceReloadListener> field_17935;
@Shadow
private List<ResourceReloadListener> field_17936;
@Shadow
private ResourceType type;
private void fabric_injectListeners() {
}
@Inject(at = @At("HEAD"), method = "createReloadHandler")
public void createReloadHandler(Executor executor_1, Executor executor_2, CompletableFuture<Void> completableFuture_1, CallbackInfoReturnable<ResourceReloadHandler> callback) {
ResourceManagerHelperImpl.sort(type, field_17935);
ResourceManagerHelperImpl.sort(type, field_17936);
}
}

3
src/main/resources/net.fabricmc.fabric.mixins.client.json
View file

@ -25,7 +25,8 @@
"registry.client.MixinMinecraftClient",
"registry.client.MixinParticleManager",
"resources.MixinKeyedResourceReloadListener$Client",
"resources.MixinMinecraftGame"
"resources.MixinMinecraftGame",
"resources.MixinReloadableResourceManagerImplClient"
],
"injectors": {
"defaultRequire": 1