From 758c2ef3b4b52fe00a758b9f22441dc518afe62f Mon Sep 17 00:00:00 2001 From: Aleksey Date: Sun, 11 Oct 2020 21:35:38 +0300 Subject: [PATCH] WIP: json model patterns --- .../mixin/client/ModelLoaderMixin.java | 23 +++++++++++++++++++ .../betterend/blockstates/flavolite_slab.json | 4 ++-- .../resources/betterend.mixins.client.json | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java diff --git a/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java b/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java new file mode 100644 index 00000000..eba25f3d --- /dev/null +++ b/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java @@ -0,0 +1,23 @@ +package ru.betterend.mixin.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.client.render.model.ModelLoader; +import net.minecraft.client.render.model.json.JsonUnbakedModel; +import net.minecraft.util.Identifier; +import ru.betterend.BetterEnd; + +@Mixin(ModelLoader.class) +public class ModelLoaderMixin { + + @Inject(method = "loadModelFromJson", at = @At("HEAD")) + private void loadModelFromJson(Identifier id, CallbackInfoReturnable info) { + if (id.getNamespace().equals(BetterEnd.MOD_ID) && id.getPath().contains("pattern")) { + System.out.println(id.getPath()); + info.cancel(); + } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/flavolite_slab.json b/src/main/resources/assets/betterend/blockstates/flavolite_slab.json index 6984730e..85af9593 100644 --- a/src/main/resources/assets/betterend/blockstates/flavolite_slab.json +++ b/src/main/resources/assets/betterend/blockstates/flavolite_slab.json @@ -1,13 +1,13 @@ { "variants": { "type=bottom": { - "model": "betterend:block/flavolite_slab" + "model": "betterend:pattern/slab/flavolite" }, "type=double": { "model": "betterend:block/flavolite" }, "type=top": { - "model": "betterend:block/flavolite_slab_top" + "model": "betterend:pattern/slab_top/flavolite" } } } \ No newline at end of file diff --git a/src/main/resources/betterend.mixins.client.json b/src/main/resources/betterend.mixins.client.json index 58f342fb..427e0d6e 100644 --- a/src/main/resources/betterend.mixins.client.json +++ b/src/main/resources/betterend.mixins.client.json @@ -7,6 +7,7 @@ "WorldRendererMixin", "BackgroundRendererMixin", "ClientRecipeBookMixin", + "ModelLoaderMixin", "ClientPlayNetworkHandlerMixin", "MinecraftClientMixin" ],