R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add PreparableModelLoadingPlugin support

Browse Source 
Related: #522
This commit is contained in:
embeddedt 2025-02-08 11:40:00 -05:00
parent 95ffcb3194
commit ad8a026bd1
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelProvider.java
View File

@ -137,7 +137,7 @@ public class DynamicModelProvider {
this.missingItemModel = new MissingItemModel(this.missingModel); this.missingItemModel = new MissingItemModel(this.missingModel);
try { try {
Class.forName("net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin"); Class.forName("net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin");
pluginList.add(new FabricDynamicModelHandler(this)); pluginList.add(new FabricDynamicModelHandler(this, this.resourceManager));
} catch(Exception ignored) { } catch(Exception ignored) {
// Fabric API likely not present // Fabric API likely not present
} }

31
common/src/main/java/org/embeddedt/modernfix/dynamicresources/FabricDynamicModelHandler.java
View File

@ -3,6 +3,7 @@ package org.embeddedt.modernfix.dynamicresources;
import net.fabricmc.fabric.api.client.model.loading.v1.BlockStateResolver; import net.fabricmc.fabric.api.client.model.loading.v1.BlockStateResolver;
import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin; import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
import net.fabricmc.fabric.api.client.model.loading.v1.ModelModifier; import net.fabricmc.fabric.api.client.model.loading.v1.ModelModifier;
import net.fabricmc.fabric.api.client.model.loading.v1.PreparableModelLoadingPlugin;
import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.Event;
import net.fabricmc.fabric.api.event.EventFactory; import net.fabricmc.fabric.api.event.EventFactory;
import net.minecraft.client.renderer.block.BlockModelShaper; import net.minecraft.client.renderer.block.BlockModelShaper;
@ -13,19 +14,20 @@ import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.client.resources.model.ModelState; import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel; import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class FabricDynamicModelHandler implements DynamicModelProvider.DynamicModelPlugin { public class FabricDynamicModelHandler implements DynamicModelProvider.DynamicModelPlugin {
private final List<ModelLoadingPlugin> pluginList;
// Borrowed from Fabric API, this dispatching logic is extremely trivial // Borrowed from Fabric API, this dispatching logic is extremely trivial
private static final ResourceLocation[] MODEL_MODIFIER_PHASES = new ResourceLocation[] { ModelModifier.OVERRIDE_PHASE, ModelModifier.DEFAULT_PHASE, ModelModifier.WRAP_PHASE, ModelModifier.WRAP_LAST_PHASE }; private static final ResourceLocation[] MODEL_MODIFIER_PHASES = new ResourceLocation[] { ModelModifier.OVERRIDE_PHASE, ModelModifier.DEFAULT_PHASE, ModelModifier.WRAP_PHASE, ModelModifier.WRAP_LAST_PHASE };
@ -99,12 +101,31 @@ public class FabricDynamicModelHandler implements DynamicModelProvider.DynamicMo
return model; return model;
}, MODEL_MODIFIER_PHASES); }, MODEL_MODIFIER_PHASES);
public FabricDynamicModelHandler(DynamicModelProvider provider) { record PreparablePluginData<T>(CompletableFuture<T> data, PreparableModelLoadingPlugin.Holder<T> plugin) {
this.pluginList = ModelLoadingPlugin.getAll(); void initialize(ModelLoadingPlugin.Context context) {
plugin.plugin().initialize(data.join(), context);
}
}
private <T> PreparablePluginData<T> makeDataRecord(ResourceManager manager, PreparableModelLoadingPlugin.Holder<T> holder) {
return new PreparablePluginData<>(holder.loader().load(manager, ModernFix.resourceReloadExecutor()), holder);
}
public FabricDynamicModelHandler(DynamicModelProvider provider, ResourceManager manager) {
List<ModelLoadingPlugin> pluginList = new ArrayList<>(ModelLoadingPlugin.getAll());
var preparablePluginData = new ArrayList<PreparablePluginData<?>>();
for (var holder : PreparableModelLoadingPlugin.getAll()) {
preparablePluginData.add(makeDataRecord(manager, holder));
}
// Wait for all the preparable plugins to finish loading
CompletableFuture.allOf(preparablePluginData.stream().map(PreparablePluginData::data).toArray(CompletableFuture[]::new)).join();
var context = new PluginContext(provider); var context = new PluginContext(provider);
for (var plugin : this.pluginList) { for (var plugin : pluginList) {
plugin.initialize(context); plugin.initialize(context);
} }
for (var data : preparablePluginData) {
data.initialize(context);
}
context.fireResolvers(); context.fireResolvers();
} }