diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBase.java b/src/main/java/ru/betterend/blocks/basis/BlockBase.java index 3f2b09e7..8d4f2e15 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBase.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockBase.java @@ -24,10 +24,10 @@ public class BlockBase extends Block implements BlockPatterned { return Collections.singletonList(new ItemStack(this)); } - @Override - public BlockModel getBlockModel(BlockState state) { - return null; - } +// @Override +// public BlockModel getBlockModel(BlockState state) { +// return null; +// } @Override public String getStatesPattern(Reader data) { diff --git a/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java b/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java index 07c57f8f..79da3ba1 100644 --- a/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java +++ b/src/main/java/ru/betterend/mixin/client/ModelLoaderMixin.java @@ -5,6 +5,8 @@ import java.io.Reader; import java.nio.charset.StandardCharsets; import java.util.Optional; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.resources.model.UnbakedModel; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -30,6 +32,21 @@ public class ModelLoaderMixin { @Final @Shadow private ResourceManager resourceManager; + + @Inject(method = "getModel", at = @At("HEAD"), cancellable = true) + public void be_registerModel(ResourceLocation resourceLocation, CallbackInfoReturnable info) { + if (resourceLocation.getNamespace().equals(BetterEnd.MOD_ID)) { + if (resourceLocation instanceof ModelResourceLocation) { + ModelResourceLocation modelId = (ModelResourceLocation) resourceLocation; + String variant = modelId.getVariant(); + if (variant.equals("inventory")) { + + } else { + System.out.println(modelId.getVariant()); + } + } + } + } @Inject(method = "loadBlockModel", at = @At("HEAD"), cancellable = true) private void be_loadModelPattern(ResourceLocation id, CallbackInfoReturnable info) { diff --git a/src/main/java/ru/betterend/patterns/BlockPatterned.java b/src/main/java/ru/betterend/patterns/BlockPatterned.java index e8908f4f..8b6e0f71 100644 --- a/src/main/java/ru/betterend/patterns/BlockPatterned.java +++ b/src/main/java/ru/betterend/patterns/BlockPatterned.java @@ -7,7 +7,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.state.BlockState; public interface BlockPatterned extends Patterned { - BlockModel getBlockModel(BlockState state); + //BlockModel getBlockModel(BlockState state); default String getStatesPattern(Reader data) { return null; }