From 89f84f5dc815ca0d4aa75030c2fde68d786f3875 Mon Sep 17 00:00:00 2001 From: DancingSnow <1121149616@qq.com> Date: Tue, 7 May 2024 22:27:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=9C=89=E6=97=B6=E5=80=99=E6=98=AF=E9=80=8F=E6=98=8E=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A4=A7=E6=A6=82=E4=BF=AE=E5=A5=BD?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dancingsnow/bigger_ae2/BiggerAE2Mod.java | 18 ++++++++---------- .../mixins/client/ModelBakeryMixin.java | 4 +++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/cn/dancingsnow/bigger_ae2/BiggerAE2Mod.java b/src/main/java/cn/dancingsnow/bigger_ae2/BiggerAE2Mod.java index 1d0c74e..34ca0d5 100644 --- a/src/main/java/cn/dancingsnow/bigger_ae2/BiggerAE2Mod.java +++ b/src/main/java/cn/dancingsnow/bigger_ae2/BiggerAE2Mod.java @@ -69,15 +69,13 @@ private static void initStorageCells(FMLCommonSetupEvent event) { } private static void initCraftingUnitModels(FMLClientSetupEvent event) { - event.enqueueWork(() -> { - for (ModCraftingUnitType type : ModCraftingUnitType.values()) { - BuiltInModelHooks.addBuiltInModel( - BiggerAE2Mod.of("block/crafting/" + type.getAffix() + "_formed"), - new CraftingCubeModel(new ModCraftingUnitModelProvider(type)) - ); - - ItemBlockRenderTypes.setRenderLayer(type.getBlockFromType(), RenderType.cutout()); - } - }); + for (ModCraftingUnitType type : ModCraftingUnitType.values()) { + BuiltInModelHooks.addBuiltInModel( + BiggerAE2Mod.of("block/crafting/" + type.getAffix() + "_formed"), + new CraftingCubeModel(new ModCraftingUnitModelProvider(type)) + ); + + ItemBlockRenderTypes.setRenderLayer(type.getBlockFromType(), RenderType.cutout()); + } } } diff --git a/src/main/java/cn/dancingsnow/bigger_ae2/mixins/client/ModelBakeryMixin.java b/src/main/java/cn/dancingsnow/bigger_ae2/mixins/client/ModelBakeryMixin.java index 12384e5..25d2c0a 100644 --- a/src/main/java/cn/dancingsnow/bigger_ae2/mixins/client/ModelBakeryMixin.java +++ b/src/main/java/cn/dancingsnow/bigger_ae2/mixins/client/ModelBakeryMixin.java @@ -14,11 +14,13 @@ @Mixin(ModelBakery.class) public abstract class ModelBakeryMixin { - @Shadow protected abstract void cacheAndQueueDependencies(ResourceLocation location, UnbakedModel model); + @Shadow + protected abstract void cacheAndQueueDependencies(ResourceLocation location, UnbakedModel model); @Inject(method = "loadModel", at = @At("HEAD"), cancellable = true) private void loadModelHook(ResourceLocation id, CallbackInfo ci) { UnbakedModel model = bigger_ae2$getUnbakedModel(id); + if (model != null) { cacheAndQueueDependencies(id, model); ci.cancel(); From 31af755b4d788d16cceeb77bacbba16fb6c76b9f Mon Sep 17 00:00:00 2001 From: DancingSnow <1121149616@qq.com> Date: Tue, 7 May 2024 22:28:00 +0800 Subject: [PATCH 2/2] bump version to 1.2.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 056f3e3..1324695 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ mod_authors= DancingSnow mod_description = A mod added more ae cells and so on. mod_license = MIT mod_url = https://github.com/GregTech-Exploring-Pioneer/BiggerAE2 -mod_version = 1.2.0 +mod_version = 1.2.1 maven_group = cn.dancingsnow.bigger_ae2