From f58a4adb3c5f89e4a7ab043a9eb4d7425ac62792 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 16 Sep 2022 22:12:48 +0100 Subject: [PATCH] Small datagen work towards block models. Waiting on a Fabric PR to complete this. --- .../techreborn/datagen/mixin/MixinTextureMap.groovy | 10 ++++++++++ .../techreborn/datagen/models/TexturePaths.groovy | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/datagen/groovy/techreborn/datagen/mixin/MixinTextureMap.groovy b/src/datagen/groovy/techreborn/datagen/mixin/MixinTextureMap.groovy index cae38f6fe..5b2471ca2 100644 --- a/src/datagen/groovy/techreborn/datagen/mixin/MixinTextureMap.groovy +++ b/src/datagen/groovy/techreborn/datagen/mixin/MixinTextureMap.groovy @@ -1,5 +1,6 @@ package techreborn.datagen.mixin +import net.minecraft.block.Block import net.minecraft.data.client.TextureMap import net.minecraft.item.Item import net.minecraft.util.Identifier @@ -20,4 +21,13 @@ class MixinTextureMap { } } } + + @Inject(method = "getId(Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier;", at = @At("HEAD"), cancellable = true) + private static void getId(Block block, CallbackInfoReturnable cir) { + TexturePaths.blockItemTexturePaths.each { + if (it.key == block) { + cir.setReturnValue(new Identifier("techreborn", "block/${it.value}")) + } + } + } } diff --git a/src/datagen/groovy/techreborn/datagen/models/TexturePaths.groovy b/src/datagen/groovy/techreborn/datagen/models/TexturePaths.groovy index ab391e57e..7764eff8c 100644 --- a/src/datagen/groovy/techreborn/datagen/models/TexturePaths.groovy +++ b/src/datagen/groovy/techreborn/datagen/models/TexturePaths.groovy @@ -31,4 +31,14 @@ class TexturePaths { public static Map blockItemTexturePaths = [ (TRContent.RUBBER_DOOR): "misc/rubber_door" ] + + static { + TRContent.Ores.values().each { + if (it.isDeepslate()) { + blockItemTexturePaths.put(it.block, "ore/deepslate/${it.name.toLowerCase()}_ore") + } else { + blockItemTexturePaths.put(it.block, "ore/${it.name.toLowerCase()}_ore") + } + } + } }