Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to 1.21

Browse Source
This commit is contained in:
Linnea Gräf
2024-07-05 22:17:02 +02:00
parent 5ee4b8d925
commit 3d792dbef7
31 changed files with 126 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/moe/nea/firmament/mixins/CustomModelBakerPatch.java
View File

@@ -30,21 +30,21 @@ import java.util.function.BiFunction;
public abstract class CustomModelBakerPatch {
@Shadow
protected abstract void addModel(ModelIdentifier modelId);
protected abstract void loadItemModel(ModelIdentifier id);
@Shadow
abstract UnbakedModel getOrLoadModel(Identifier id);
@Shadow
@Final
private Map<Identifier, UnbakedModel> modelsToBake;
@Shadow
public abstract UnbakedModel getOrLoadModel(Identifier id);
private Map<ModelIdentifier, UnbakedModel> modelsToBake;
@Inject(method = "bake", at = @At("HEAD"))
public void onBake(BiFunction<Identifier, SpriteIdentifier, Sprite> spriteLoader, CallbackInfo ci) {
BakeExtraModelsEvent.Companion.publish(new BakeExtraModelsEvent(this::addModel));
public void onBake(ModelLoader.SpriteGetter spliteGetter, CallbackInfo ci) {
BakeExtraModelsEvent.Companion.publish(new BakeExtraModelsEvent(this::loadItemModel));
modelsToBake.values().forEach(model -> model.setParents(this::getOrLoadModel));
modelsToBake.keySet().stream()
.filter(it -> !it.getNamespace().equals("minecraft"))
.forEach(it -> System.out.println("Non minecraft texture is being loaded: " + it));
// modelsToBake.keySet().stream()
// .filter(it -> !it.id().getNamespace().equals("minecraft"))
// .forEach(it -> System.out.println("Non minecraft texture is being loaded: " + it));
}
}