mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-02-02 20:29:13 +00:00
Code Issues Releases Wiki Activity

Fix model hook nullability

Browse Source 
Only an issue on the latest FAPI, so we also bump that.
This commit is contained in:
Jonathan Coates 2023-08-05 10:32:21 +01:00
parent 41b6711b38
commit b6632c9ed9
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libs.versions.toml
View File

@ -7,7 +7,7 @@
# Minecraft # Minecraft
# MC version is specified in gradle.properties, as we need that in settings.gradle. # MC version is specified in gradle.properties, as we need that in settings.gradle.
# Remember to update corresponding versions in fabric.mod.json/mods.toml # Remember to update corresponding versions in fabric.mod.json/mods.toml
fabric-api = "0.86.0+1.19.4" fabric-api = "0.86.1+1.19.4"
fabric-loader = "0.14.21" fabric-loader = "0.14.21"
forge = "45.0.42" forge = "45.0.42"
forgeSpi = "6.0.0" forgeSpi = "6.0.0"

1
projects/common/src/client/java/dan200/computercraft/client/render/ModelRenderer.java
View File

@ -69,6 +69,7 @@ public final class ModelRenderer {
* @param blue The blue tint of this quad. * @param blue The blue tint of this quad.
* @param lightmapCoord The lightmap coordinate * @param lightmapCoord The lightmap coordinate
* @param overlayLight The overlay light. * @param overlayLight The overlay light.
* @param invert Whether to reverse the order of this quad.
*/ */
private static void putBulkQuad(VertexConsumer buffer, PoseStack.Pose pose, BakedQuad quad, float red, float green, float blue, int lightmapCoord, int overlayLight, boolean invert) { private static void putBulkQuad(VertexConsumer buffer, PoseStack.Pose pose, BakedQuad quad, float red, float green, float blue, int lightmapCoord, int overlayLight, boolean invert) {
var matrix = pose.pose(); var matrix = pose.pose();

2
projects/fabric/src/client/java/dan200/computercraft/client/ComputerCraftClient.java
View File

@ -42,7 +42,7 @@ public class ComputerCraftClient {
PreparableModelLoadingPlugin.register(CustomModelLoader::prepare, (state, context) -> { PreparableModelLoadingPlugin.register(CustomModelLoader::prepare, (state, context) -> {
ClientRegistry.registerExtraModels(context::addModels); ClientRegistry.registerExtraModels(context::addModels);
context.resolveModel().register(ctx -> state.loadModel(ctx.id())); context.resolveModel().register(ctx -> state.loadModel(ctx.id()));
context.modifyModelAfterBake().register((model, ctx) -> state.wrapModel(ctx, model)); context.modifyModelAfterBake().register((model, ctx) -> model == null ? null : state.wrapModel(ctx, model));
}); });
BlockRenderLayerMap.INSTANCE.putBlock(ModRegistry.Blocks.COMPUTER_NORMAL.get(), RenderType.cutout()); BlockRenderLayerMap.INSTANCE.putBlock(ModRegistry.Blocks.COMPUTER_NORMAL.get(), RenderType.cutout());

2
projects/fabric/src/main/resources/fabric.mod.json
View File

@ -50,7 +50,7 @@
], ],
"depends": { "depends": {
"fabricloader": ">=0.14.21", "fabricloader": ">=0.14.21",
"fabric-api": ">=0.86.0", "fabric-api": ">=0.86.1",
"minecraft": ">=1.19.4 <1.20" "minecraft": ">=1.19.4 <1.20"
}, },
"accessWidener": "computercraft.accesswidener" "accessWidener": "computercraft.accesswidener"