diff --git a/build.gradle b/build.gradle index 7c375b8..2b14019 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,11 @@ -import de.griefed.generation.BlockAndItemCodeGenerator - plugins { id 'fabric-loom' version '1.3-SNAPSHOT' apply(false) id 'net.minecraftforge.gradle' version '[6.0,6.2)' apply(false) id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' apply(false) id("org.spongepowered.mixin") version "0.7-SNAPSHOT" apply(false) + id 'de.griefed.generation.block-and-item-code-generator' } -apply plugin: BlockAndItemCodeGenerator - subprojects { apply plugin: 'java' diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index bff6923..438afc2 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java' + id 'java-gradle-plugin' } group = 'de.griefed' @@ -19,3 +20,11 @@ test { useJUnitPlatform() } +gradlePlugin { + plugins { + create("block-and-item-code-generator") { + id = "de.griefed.generation.block-and-item-code-generator" + implementationClass = "de.griefed.generation.BlockAndItemCodeGenerator" + } + } +} diff --git a/buildSrc/src/main/java/de/griefed/generation/generator/CodeGenerator.java b/buildSrc/src/main/java/de/griefed/generation/generator/CodeGenerator.java index 63baad0..9906c8b 100644 --- a/buildSrc/src/main/java/de/griefed/generation/generator/CodeGenerator.java +++ b/buildSrc/src/main/java/de/griefed/generation/generator/CodeGenerator.java @@ -23,7 +23,7 @@ public abstract class CodeGenerator { private static final String BLOCKSTATE_TEMPLATE = """ { "variants": { - "": { "model": "MODID:block/BLOCKID_block" } + "": { "model": "%s:block/generated/%s/%s_block" } } } """; @@ -32,14 +32,14 @@ public abstract class CodeGenerator { { "parent": "block/cube_all", "textures": { - "all": "MODID:block/BLOCKID_block" + "all": "%s:block/generated/%s/%s_block" } } """; private static final String BLOCK_MODELS_ITEM_TEMPLATE = """ { - "parent": "MODID:block/BLOCKID_block" + "parent": "%s:block/generated/%s/%s_block" } """; @@ -157,12 +157,16 @@ protected void updateTranslations() throws IOException { } else { //translations not from our generation, add our block ObjectNode translationNode = (ObjectNode) objectMapper.readTree(this.translationsFile); - String itemPrefix = "\"item." + id + "."; - String blockPrefix = "\"block." + id + "."; + String itemPrefix = "\"item.%s.generated.%s.%s_block"; + String blockPrefix = "\"block.%s.generated.%s.%s_block\""; translationNode.put("DO.NOT.EDIT.MANUALLY.BEGIN", "BEGIN"); for (BlockDefinition block : blockDefinitionParser.getBlocks()) { - translationNode.put(itemPrefix + block.getId() + "_block", block.getTranslation()); - translationNode.put(blockPrefix + block.getId() + "_block", block.getTranslation()); + translationNode.put( + String.format(itemPrefix, id, block.getMaterial().toLowerCase(), block.getId()), + block.getTranslation()); + translationNode.put( + String.format(blockPrefix, id, block.getMaterial().toLowerCase(), block.getId()), + block.getTranslation()); } translationNode.put("DO.NOT.EDIT.MANUALLY.END", "END"); objectMapper.writeValue(this.translationsFile, translationNode); @@ -172,17 +176,17 @@ protected void updateTranslations() throws IOException { private StringBuilder buildTranslationText() { StringBuilder translations = new StringBuilder(); - String itemPrefix = "\"item." + id + "."; - String blockPrefix = "\"block." + id + "."; + String itemPrefix = "\"item.%s.generated.%s.%s_block"; + String blockPrefix = "\"block.%s.generated.%s.%s_block"; for (BlockDefinition block : blockDefinitionParser.getBlocks()) { //add item //key - translations.append("\n ").append(itemPrefix).append(block.getId()).append("_block").append("\":"); + translations.append("\n ").append(String.format(itemPrefix, id, block.getMaterial().toLowerCase(), block.getId())).append("\":"); //value translations.append(" \"").append(block.getTranslation()).append("\","); //add block //key - translations.append("\n ").append(blockPrefix).append(block.getId()).append("_block").append("\":"); + translations.append("\n ").append(String.format(blockPrefix, id, block.getMaterial().toLowerCase(), block.getId())).append("\":"); //value translations.append(" \"").append(block.getTranslation()).append("\",\n"); } @@ -206,10 +210,10 @@ public void createBlockFiles() throws IOException { itemModelsDir.mkdirs(); itemTexturesDir.mkdirs(); blockTexturesDir.mkdirs(); - String blockstatesTemp = "BLOCKID_block.json"; - String blockModelTemp = "BLOCKID_block.json"; - String itemBlockModelTemp = "BLOCKID.json"; - String blockTextureTemp = "BLOCKID_block.png"; + String blockstatesTemp = "generated/%s/%s_block.json"; + String blockModelTemp = "generated/%s/%s_block.json"; + String itemBlockModelTemp = "generated/%s/%s.json"; + String blockTextureTemp = "generated/%s/%s_block.png"; File blockstate; File blockModel; File itemBlockModel; @@ -219,21 +223,28 @@ public void createBlockFiles() throws IOException { BufferedImage texture; for (BlockDefinition block : blockDefinitionParser.getBlocks()) { //blockstate - blockstate = new File(blockstatesDir, blockstatesTemp.replace("BLOCKID", block.getId())); - writeToFile(blockstate, BLOCKSTATE_TEMPLATE.replace("MODID", id).replace("BLOCKID", block.getId())); + blockstate = new File(blockstatesDir, String.format(blockstatesTemp, block.getMaterial().toLowerCase(), block.getId())); + blockstate.getParentFile().mkdirs(); + writeToFile(blockstate, String.format(BLOCKSTATE_TEMPLATE, id, block.getMaterial().toLowerCase(), block.getId())); + //block model - blockModel = new File(blockModelsDir, blockModelTemp.replace("BLOCKID", block.getId())); - writeToFile(blockModel, BLOCK_MODELS_TEMPLATE.replace("MODID", id).replace("BLOCKID", block.getId())); + blockModel = new File(blockModelsDir, String.format(blockModelTemp, block.getMaterial().toLowerCase(), block.getId())); + blockModel.getParentFile().mkdirs(); + writeToFile(blockModel, String.format(BLOCK_MODELS_TEMPLATE, id, block.getMaterial().toLowerCase(), block.getId())); + //item block model - itemBlockModel = new File(itemModelsDir, itemBlockModelTemp.replace("BLOCKID", block.getId())); - writeToFile(itemBlockModel, BLOCK_MODELS_ITEM_TEMPLATE.replace("MODID", id).replace("BLOCKID", block.getId())); + itemBlockModel = new File(itemModelsDir, String.format(itemBlockModelTemp, block.getMaterial().toLowerCase(), block.getId())); + itemBlockModel.getParentFile().mkdirs(); + writeToFile(itemBlockModel, String.format(BLOCK_MODELS_ITEM_TEMPLATE, id, block.getMaterial().toLowerCase(), block.getId())); + //block texture - blockTexture = new File(blockTexturesDir, blockTextureTemp.replace("BLOCKID", block.getId())); + blockTexture = new File(blockTexturesDir, String.format(blockTextureTemp, block.getMaterial().toLowerCase(), block.getId())); + blockTexture.getParentFile().mkdirs(); textureSource = new File(blockDefinitionParser.getAssetsDirectory(), block.getId() + ".png"); texture = ImageIO.read(textureSource); if (texture.getWidth() > 16 && texture.getHeight() > 16) { texture = TextureScaler.getScaledInstance(texture); - ImageIO.write(texture,"png",textureSource); + ImageIO.write(texture, "png", textureSource); } if (texture.getWidth() < texture.getHeight()) { textureMCMeta = new File(blockTexture.getParent(), blockTexture.getName() + ".mcmeta"); diff --git a/buildSrc/src/main/java/de/griefed/generation/generator/CommonSubProjectGenerator.java b/buildSrc/src/main/java/de/griefed/generation/generator/CommonSubProjectGenerator.java index 12f2068..8ea35e4 100644 --- a/buildSrc/src/main/java/de/griefed/generation/generator/CommonSubProjectGenerator.java +++ b/buildSrc/src/main/java/de/griefed/generation/generator/CommonSubProjectGenerator.java @@ -130,13 +130,13 @@ public static void onItemTooltip(ItemStack stack, TooltipFlag context, List %s = BLOCKS.register("%s_block", + \tpublic static final RegistryObject %s = BLOCKS.register("generated/%s/%s_block", \t\t\t() -> new Block(BlockBehaviour.Properties.of(Material.%s).sound(SoundType.%s) \t.strength(%df, %df).lightLevel(state -> %d).explosionResistance(%df)TOOLBREAK)); """; private static final String BLOCK_ITEM_REGISTRATION_TEMPLATE = """ - \tpublic static final RegistryObject %s_ITEM = ITEMS.register("%s", + \tpublic static final RegistryObject %s_ITEM = ITEMS.register("generated/%s/%s", \t\t() -> new BlockItem(%s.get(), itemBuilder())); """; @@ -193,7 +193,7 @@ public void updateModBlocksClass() throws IOException { //block blockToRegister = String.format( BLOCK_REGISTRATION_TEMPLATE, - block.getId().toUpperCase(), block.getId(), + block.getId().toUpperCase(), block.getMaterial().toLowerCase(), block.getId(), block.getMaterial(), block.getSoundType(), block.getStrengthOne(), block.getStrengthTwo(), block.getLightLevel(), block.getExplosionResistance()); if (block.isRequiresCorrectTool()) { @@ -210,7 +210,7 @@ public void updateModBlocksClass() throws IOException { //block item blockItemToRegister = String.format( BLOCK_ITEM_REGISTRATION_TEMPLATE, - block.getId().toUpperCase(), block.getId(), block.getId().toUpperCase() + block.getId().toUpperCase(), block.getMaterial().toLowerCase(), block.getId(), block.getId().toUpperCase() ); //add block and block item diff --git a/common/src/main/java/de/griefed/addemall/CommonClass.java b/common/src/main/java/de/griefed/addemall/CommonClass.java index ec0f33a..259771d 100644 --- a/common/src/main/java/de/griefed/addemall/CommonClass.java +++ b/common/src/main/java/de/griefed/addemall/CommonClass.java @@ -5,10 +5,14 @@ import de.griefed.addemall.platform.Services; import net.minecraft.core.Registry; import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.food.FoodProperties; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.block.Block; import java.util.List; diff --git a/common/src/main/java/de/griefed/addemall/block/GeneratedModBlocks.java b/common/src/main/java/de/griefed/addemall/block/GeneratedModBlocks.java index 3999c48..5c2b103 100644 --- a/common/src/main/java/de/griefed/addemall/block/GeneratedModBlocks.java +++ b/common/src/main/java/de/griefed/addemall/block/GeneratedModBlocks.java @@ -17,39 +17,39 @@ public class GeneratedModBlocks { /*###GENERATED CODE - DO NOT EDIT - MANUALLY EDITED CODE WILL BE LOST###*/ - public static final RegistryObject GREEN_ZEN = BLOCKS.register("green_zen_block", + public static final RegistryObject GREEN_ZEN = BLOCKS.register("generated/dirt/green_zen_block", () -> new Block(BlockBehaviour.Properties.of(Material.DIRT).sound(SoundType.GRASS) .strength(2f, 2f).lightLevel(state -> 4).explosionResistance(0f))); - public static final RegistryObject GREEN_ZEN_ITEM = ITEMS.register("green_zen", + public static final RegistryObject GREEN_ZEN_ITEM = ITEMS.register("generated/dirt/green_zen", () -> new BlockItem(GREEN_ZEN.get(), itemBuilder())); - public static final RegistryObject YELLOW_ZEN = BLOCKS.register("yellow_zen_block", + public static final RegistryObject YELLOW_ZEN = BLOCKS.register("generated/dirt/yellow_zen_block", () -> new Block(BlockBehaviour.Properties.of(Material.DIRT).sound(SoundType.GRASS) .strength(2f, 2f).lightLevel(state -> 4).explosionResistance(0f))); - public static final RegistryObject YELLOW_ZEN_ITEM = ITEMS.register("yellow_zen", + public static final RegistryObject YELLOW_ZEN_ITEM = ITEMS.register("generated/dirt/yellow_zen", () -> new BlockItem(YELLOW_ZEN.get(), itemBuilder())); - public static final RegistryObject BLUE_ZEN = BLOCKS.register("blue_zen_block", + public static final RegistryObject BLUE_ZEN = BLOCKS.register("generated/dirt/blue_zen_block", () -> new Block(BlockBehaviour.Properties.of(Material.DIRT).sound(SoundType.GRASS) .strength(2f, 2f).lightLevel(state -> 4).explosionResistance(0f))); - public static final RegistryObject BLUE_ZEN_ITEM = ITEMS.register("blue_zen", + public static final RegistryObject BLUE_ZEN_ITEM = ITEMS.register("generated/dirt/blue_zen", () -> new BlockItem(BLUE_ZEN.get(), itemBuilder())); - public static final RegistryObject BROWN_ZEN = BLOCKS.register("brown_zen_block", + public static final RegistryObject BROWN_ZEN = BLOCKS.register("generated/dirt/brown_zen_block", () -> new Block(BlockBehaviour.Properties.of(Material.DIRT).sound(SoundType.GRASS) .strength(2f, 2f).lightLevel(state -> 4).explosionResistance(0f))); - public static final RegistryObject BROWN_ZEN_ITEM = ITEMS.register("brown_zen", + public static final RegistryObject BROWN_ZEN_ITEM = ITEMS.register("generated/dirt/brown_zen", () -> new BlockItem(BROWN_ZEN.get(), itemBuilder())); - public static final RegistryObject RED_ZEN = BLOCKS.register("red_zen_block", + public static final RegistryObject RED_ZEN = BLOCKS.register("generated/dirt/red_zen_block", () -> new Block(BlockBehaviour.Properties.of(Material.DIRT).sound(SoundType.GRASS) .strength(2f, 2f).lightLevel(state -> 4).explosionResistance(0f))); - public static final RegistryObject RED_ZEN_ITEM = ITEMS.register("red_zen", + public static final RegistryObject RED_ZEN_ITEM = ITEMS.register("generated/dirt/red_zen", () -> new BlockItem(RED_ZEN.get(), itemBuilder())); /*###GENERATED CODE - DO NOT EDIT - MANUALLY EDITED CODE WILL BE LOST###*/ diff --git a/common/src/main/resources/addemall.png b/common/src/main/resources/addemall.png index 1c1db17..d50c468 100644 Binary files a/common/src/main/resources/addemall.png and b/common/src/main/resources/addemall.png differ diff --git a/common/src/main/resources/assets/addemall/blockstates/blue_zen_block.json b/common/src/main/resources/assets/addemall/blockstates/blue_zen_block.json deleted file mode 100644 index 1d5a28c..0000000 --- a/common/src/main/resources/assets/addemall/blockstates/blue_zen_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "addemall:block/blue_zen_block" } - } -} diff --git a/common/src/main/resources/assets/addemall/blockstates/brown_zen_block.json b/common/src/main/resources/assets/addemall/blockstates/brown_zen_block.json deleted file mode 100644 index 7f80de8..0000000 --- a/common/src/main/resources/assets/addemall/blockstates/brown_zen_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "addemall:block/brown_zen_block" } - } -} diff --git a/common/src/main/resources/assets/addemall/blockstates/generated/dirt/blue_zen_block.json b/common/src/main/resources/assets/addemall/blockstates/generated/dirt/blue_zen_block.json new file mode 100644 index 0000000..c7a7388 --- /dev/null +++ b/common/src/main/resources/assets/addemall/blockstates/generated/dirt/blue_zen_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "addemall:block/generated/dirt/blue_zen_block" } + } +} diff --git a/common/src/main/resources/assets/addemall/blockstates/generated/dirt/brown_zen_block.json b/common/src/main/resources/assets/addemall/blockstates/generated/dirt/brown_zen_block.json new file mode 100644 index 0000000..a76d670 --- /dev/null +++ b/common/src/main/resources/assets/addemall/blockstates/generated/dirt/brown_zen_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "addemall:block/generated/dirt/brown_zen_block" } + } +} diff --git a/common/src/main/resources/assets/addemall/blockstates/generated/dirt/green_zen_block.json b/common/src/main/resources/assets/addemall/blockstates/generated/dirt/green_zen_block.json new file mode 100644 index 0000000..0e619ec --- /dev/null +++ b/common/src/main/resources/assets/addemall/blockstates/generated/dirt/green_zen_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "addemall:block/generated/dirt/green_zen_block" } + } +} diff --git a/common/src/main/resources/assets/addemall/blockstates/generated/dirt/red_zen_block.json b/common/src/main/resources/assets/addemall/blockstates/generated/dirt/red_zen_block.json new file mode 100644 index 0000000..096258a --- /dev/null +++ b/common/src/main/resources/assets/addemall/blockstates/generated/dirt/red_zen_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "addemall:block/generated/dirt/red_zen_block" } + } +} diff --git a/common/src/main/resources/assets/addemall/blockstates/generated/dirt/yellow_zen_block.json b/common/src/main/resources/assets/addemall/blockstates/generated/dirt/yellow_zen_block.json new file mode 100644 index 0000000..e00fdaa --- /dev/null +++ b/common/src/main/resources/assets/addemall/blockstates/generated/dirt/yellow_zen_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "addemall:block/generated/dirt/yellow_zen_block" } + } +} diff --git a/common/src/main/resources/assets/addemall/blockstates/green_zen_block.json b/common/src/main/resources/assets/addemall/blockstates/green_zen_block.json deleted file mode 100644 index 246b957..0000000 --- a/common/src/main/resources/assets/addemall/blockstates/green_zen_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "addemall:block/green_zen_block" } - } -} diff --git a/common/src/main/resources/assets/addemall/blockstates/red_zen_block.json b/common/src/main/resources/assets/addemall/blockstates/red_zen_block.json deleted file mode 100644 index 57d0733..0000000 --- a/common/src/main/resources/assets/addemall/blockstates/red_zen_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "addemall:block/red_zen_block" } - } -} diff --git a/common/src/main/resources/assets/addemall/blockstates/yellow_zen_block.json b/common/src/main/resources/assets/addemall/blockstates/yellow_zen_block.json deleted file mode 100644 index 7226ed0..0000000 --- a/common/src/main/resources/assets/addemall/blockstates/yellow_zen_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "addemall:block/yellow_zen_block" } - } -} diff --git a/common/src/main/resources/assets/addemall/lang/en_us.json b/common/src/main/resources/assets/addemall/lang/en_us.json index ca82df0..2b18deb 100644 --- a/common/src/main/resources/assets/addemall/lang/en_us.json +++ b/common/src/main/resources/assets/addemall/lang/en_us.json @@ -1,19 +1,19 @@ { "DO.NOT.EDIT.MANUALLY.BEGIN": "BEGIN", - "item.addemall.green_zen_block": "Green Zen", - "block.addemall.green_zen_block": "Green Zen", + "item.addemall.generated.dirt.green_zen_block": "Green Zen", + "block.addemall.generated.dirt.green_zen_block": "Green Zen", - "item.addemall.yellow_zen_block": "Yellow Zen", - "block.addemall.yellow_zen_block": "Yellow Zen", + "item.addemall.generated.dirt.yellow_zen_block": "Yellow Zen", + "block.addemall.generated.dirt.yellow_zen_block": "Yellow Zen", - "item.addemall.blue_zen_block": "Blue Zen", - "block.addemall.blue_zen_block": "Blue Zen", + "item.addemall.generated.dirt.blue_zen_block": "Blue Zen", + "block.addemall.generated.dirt.blue_zen_block": "Blue Zen", - "item.addemall.brown_zen_block": "Brown Zen", - "block.addemall.brown_zen_block": "Brown Zen", + "item.addemall.generated.dirt.brown_zen_block": "Brown Zen", + "block.addemall.generated.dirt.brown_zen_block": "Brown Zen", - "item.addemall.red_zen_block": "Red Zen", - "block.addemall.red_zen_block": "Red Zen", + "item.addemall.generated.dirt.red_zen_block": "Red Zen", + "block.addemall.generated.dirt.red_zen_block": "Red Zen", "DO.NOT.EDIT.MANUALLY.END": "END", "itemGroup.addemall.tab": "AddEmAll" } diff --git a/common/src/main/resources/assets/addemall/models/block/blue_zen_block.json b/common/src/main/resources/assets/addemall/models/block/blue_zen_block.json deleted file mode 100644 index 0a16538..0000000 --- a/common/src/main/resources/assets/addemall/models/block/blue_zen_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "addemall:block/blue_zen_block" - } -} diff --git a/common/src/main/resources/assets/addemall/models/block/brown_zen_block.json b/common/src/main/resources/assets/addemall/models/block/brown_zen_block.json deleted file mode 100644 index 432826e..0000000 --- a/common/src/main/resources/assets/addemall/models/block/brown_zen_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "addemall:block/brown_zen_block" - } -} diff --git a/common/src/main/resources/assets/addemall/models/block/generated/dirt/blue_zen_block.json b/common/src/main/resources/assets/addemall/models/block/generated/dirt/blue_zen_block.json new file mode 100644 index 0000000..57d79b3 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/dirt/blue_zen_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "addemall:block/generated/dirt/blue_zen_block" + } +} diff --git a/common/src/main/resources/assets/addemall/models/block/generated/dirt/brown_zen_block.json b/common/src/main/resources/assets/addemall/models/block/generated/dirt/brown_zen_block.json new file mode 100644 index 0000000..d053e00 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/dirt/brown_zen_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "addemall:block/generated/dirt/brown_zen_block" + } +} diff --git a/common/src/main/resources/assets/addemall/models/block/generated/dirt/green_zen_block.json b/common/src/main/resources/assets/addemall/models/block/generated/dirt/green_zen_block.json new file mode 100644 index 0000000..7dfc6c5 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/dirt/green_zen_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "addemall:block/generated/dirt/green_zen_block" + } +} diff --git a/common/src/main/resources/assets/addemall/models/block/generated/dirt/red_zen_block.json b/common/src/main/resources/assets/addemall/models/block/generated/dirt/red_zen_block.json new file mode 100644 index 0000000..f717689 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/dirt/red_zen_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "addemall:block/generated/dirt/red_zen_block" + } +} diff --git a/common/src/main/resources/assets/addemall/models/block/generated/dirt/yellow_zen_block.json b/common/src/main/resources/assets/addemall/models/block/generated/dirt/yellow_zen_block.json new file mode 100644 index 0000000..53b91f4 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/block/generated/dirt/yellow_zen_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "addemall:block/generated/dirt/yellow_zen_block" + } +} diff --git a/common/src/main/resources/assets/addemall/models/block/green_zen_block.json b/common/src/main/resources/assets/addemall/models/block/green_zen_block.json deleted file mode 100644 index b3c8330..0000000 --- a/common/src/main/resources/assets/addemall/models/block/green_zen_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "addemall:block/green_zen_block" - } -} diff --git a/common/src/main/resources/assets/addemall/models/block/red_zen_block.json b/common/src/main/resources/assets/addemall/models/block/red_zen_block.json deleted file mode 100644 index a3012df..0000000 --- a/common/src/main/resources/assets/addemall/models/block/red_zen_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "addemall:block/red_zen_block" - } -} diff --git a/common/src/main/resources/assets/addemall/models/block/yellow_zen_block.json b/common/src/main/resources/assets/addemall/models/block/yellow_zen_block.json deleted file mode 100644 index 38172fd..0000000 --- a/common/src/main/resources/assets/addemall/models/block/yellow_zen_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "addemall:block/yellow_zen_block" - } -} diff --git a/common/src/main/resources/assets/addemall/models/item/blue_zen.json b/common/src/main/resources/assets/addemall/models/item/blue_zen.json deleted file mode 100644 index a141526..0000000 --- a/common/src/main/resources/assets/addemall/models/item/blue_zen.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "addemall:block/blue_zen_block" -} diff --git a/common/src/main/resources/assets/addemall/models/item/brown_zen.json b/common/src/main/resources/assets/addemall/models/item/brown_zen.json deleted file mode 100644 index 61db593..0000000 --- a/common/src/main/resources/assets/addemall/models/item/brown_zen.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "addemall:block/brown_zen_block" -} diff --git a/common/src/main/resources/assets/addemall/models/item/generated/dirt/blue_zen.json b/common/src/main/resources/assets/addemall/models/item/generated/dirt/blue_zen.json new file mode 100644 index 0000000..7b5392a --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/item/generated/dirt/blue_zen.json @@ -0,0 +1,3 @@ +{ + "parent": "addemall:block/generated/dirt/blue_zen_block" +} diff --git a/common/src/main/resources/assets/addemall/models/item/generated/dirt/brown_zen.json b/common/src/main/resources/assets/addemall/models/item/generated/dirt/brown_zen.json new file mode 100644 index 0000000..7e9874d --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/item/generated/dirt/brown_zen.json @@ -0,0 +1,3 @@ +{ + "parent": "addemall:block/generated/dirt/brown_zen_block" +} diff --git a/common/src/main/resources/assets/addemall/models/item/generated/dirt/green_zen.json b/common/src/main/resources/assets/addemall/models/item/generated/dirt/green_zen.json new file mode 100644 index 0000000..c2e55fe --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/item/generated/dirt/green_zen.json @@ -0,0 +1,3 @@ +{ + "parent": "addemall:block/generated/dirt/green_zen_block" +} diff --git a/common/src/main/resources/assets/addemall/models/item/generated/dirt/red_zen.json b/common/src/main/resources/assets/addemall/models/item/generated/dirt/red_zen.json new file mode 100644 index 0000000..2cda14f --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/item/generated/dirt/red_zen.json @@ -0,0 +1,3 @@ +{ + "parent": "addemall:block/generated/dirt/red_zen_block" +} diff --git a/common/src/main/resources/assets/addemall/models/item/generated/dirt/yellow_zen.json b/common/src/main/resources/assets/addemall/models/item/generated/dirt/yellow_zen.json new file mode 100644 index 0000000..27215f5 --- /dev/null +++ b/common/src/main/resources/assets/addemall/models/item/generated/dirt/yellow_zen.json @@ -0,0 +1,3 @@ +{ + "parent": "addemall:block/generated/dirt/yellow_zen_block" +} diff --git a/common/src/main/resources/assets/addemall/models/item/green_zen.json b/common/src/main/resources/assets/addemall/models/item/green_zen.json deleted file mode 100644 index 1f8b7bd..0000000 --- a/common/src/main/resources/assets/addemall/models/item/green_zen.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "addemall:block/green_zen_block" -} diff --git a/common/src/main/resources/assets/addemall/models/item/red_zen.json b/common/src/main/resources/assets/addemall/models/item/red_zen.json deleted file mode 100644 index 19bcdcd..0000000 --- a/common/src/main/resources/assets/addemall/models/item/red_zen.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "addemall:block/red_zen_block" -} diff --git a/common/src/main/resources/assets/addemall/models/item/yellow_zen.json b/common/src/main/resources/assets/addemall/models/item/yellow_zen.json deleted file mode 100644 index f230fa9..0000000 --- a/common/src/main/resources/assets/addemall/models/item/yellow_zen.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "addemall:block/yellow_zen_block" -} diff --git a/common/src/main/resources/assets/addemall/textures/block/blue_zen_block.png b/common/src/main/resources/assets/addemall/textures/block/generated/dirt/blue_zen_block.png similarity index 100% rename from common/src/main/resources/assets/addemall/textures/block/blue_zen_block.png rename to common/src/main/resources/assets/addemall/textures/block/generated/dirt/blue_zen_block.png diff --git a/common/src/main/resources/assets/addemall/textures/block/brown_zen_block.png b/common/src/main/resources/assets/addemall/textures/block/generated/dirt/brown_zen_block.png similarity index 100% rename from common/src/main/resources/assets/addemall/textures/block/brown_zen_block.png rename to common/src/main/resources/assets/addemall/textures/block/generated/dirt/brown_zen_block.png diff --git a/common/src/main/resources/assets/addemall/textures/block/green_zen_block.png b/common/src/main/resources/assets/addemall/textures/block/generated/dirt/green_zen_block.png similarity index 100% rename from common/src/main/resources/assets/addemall/textures/block/green_zen_block.png rename to common/src/main/resources/assets/addemall/textures/block/generated/dirt/green_zen_block.png diff --git a/common/src/main/resources/assets/addemall/textures/block/red_zen_block.png b/common/src/main/resources/assets/addemall/textures/block/generated/dirt/red_zen_block.png similarity index 100% rename from common/src/main/resources/assets/addemall/textures/block/red_zen_block.png rename to common/src/main/resources/assets/addemall/textures/block/generated/dirt/red_zen_block.png diff --git a/common/src/main/resources/assets/addemall/textures/block/yellow_zen_block.png b/common/src/main/resources/assets/addemall/textures/block/generated/dirt/yellow_zen_block.png similarity index 100% rename from common/src/main/resources/assets/addemall/textures/block/yellow_zen_block.png rename to common/src/main/resources/assets/addemall/textures/block/generated/dirt/yellow_zen_block.png