From 7ae4858bb49806b8af60ba41274cf5bc1cfc7d4b Mon Sep 17 00:00:00 2001 From: Adrien1106 Date: Fri, 9 Feb 2024 00:03:46 +0100 Subject: [PATCH] naming + texture change and cleanup --- .../reframedtemplates/Templates.java | 23 ++--- .../model/TemplateAppearance.java | 12 --- .../model/TemplateAppearanceManager.java | 2 +- .../model/UnbakedAutoRetexturedModel.java | 7 -- .../model/UnbakedJsonRetexturedModel.java | 28 +++--- .../model/UnbakedMeshRetexturedModel.java | 6 -- .../blockstates/button.json | 48 +++++------ .../reframedtemplates/blockstates/candle.json | 16 ++++ .../reframedtemplates/blockstates/carpet.json | 7 ++ .../reframedtemplates/blockstates/cube.json | 7 ++ .../blockstates/door.json | 64 +++++++------- .../blockstates/fence.json | 10 +-- .../blockstates/fence_gate.json | 32 +++---- .../blockstates/iron_door.json | 64 +++++++------- .../blockstates/iron_trapdoor.json | 32 +++---- .../blockstates/lever.json | 48 +++++------ .../blockstates/pane.json | 18 ++-- .../blockstates/post.json | 6 +- .../blockstates/pressure_plate.json | 10 +++ .../reframedtemplates/blockstates/slab.json | 13 +++ .../blockstates/slope.json | 24 +++--- .../blockstates/stairs.json | 80 +++++++++--------- .../blockstates/tiny_slope.json | 24 +++--- .../blockstates/trapdoor.json | 32 +++---- .../blockstates/vertical_slab.json | 25 ++++++ .../blockstates/wall.json | 18 ++-- .../assets/reframedtemplates/lang/en_us.json | 25 ++++++ .../models/block/fence_post_inventory.json | 0 .../models/block/fence_side.json | 12 +-- .../models/block/glass_pane_side.json | 12 +-- .../models/block/glass_pane_side_alt.json | 12 +-- .../models/block/lever.json | 12 +-- .../models/block/lever_on.json | 12 +-- .../models/block/slope_base.json | 0 .../models/block/tiny_slope_base.json | 2 +- .../models/block/trapdoor_open.json | 12 +-- .../models/block/vertical_slab.json | 12 +-- .../models/block/wall_side.json | 12 +-- .../models/block/wall_side_tall.json | 12 +-- .../models/item/candle.json | 2 +- .../models/item/door.json | 2 +- .../models/item/iron_door.json | 2 +- .../models/item/lever.json | 2 +- .../models/item/pane.json | 2 +- .../textures/block/framed_accent_block.png | Bin .../textures/block/framed_block.png | Bin .../textures/item/candle.png | Bin .../textures/item/door.png | Bin .../textures/item/lever.png | Bin .../textures/templates_special/down.png | Bin .../textures/templates_special/east.png | Bin .../textures/templates_special/north.png | Bin .../textures/templates_special/south.png | Bin .../textures/templates_special/up.png | Bin .../textures/templates_special/west.png | Bin .../assets/templates/blockstates/candle.json | 16 ---- .../assets/templates/blockstates/carpet.json | 7 -- .../templates/blockstates/cool_rivulet.json | 19 ----- .../assets/templates/blockstates/cube.json | 7 -- .../templates/blockstates/pressure_plate.json | 10 --- .../assets/templates/blockstates/slab.json | 13 --- .../templates/blockstates/vertical_slab.json | 25 ------ .../assets/templates/lang/en_us.json | 26 ------ .../templates/models/block/cool_rivulet.json | 6 -- .../templates/models/item/cool_rivulet.json | 3 - .../templates/textures/block/cool_rivulet.png | Bin 752 -> 0 bytes .../data/minecraft/tags/blocks/candles.json | 2 +- .../data/minecraft/tags/blocks/doors.json | 2 +- .../minecraft/tags/blocks/fence_gates.json | 2 +- .../minecraft/tags/blocks/mineable/axe.json | 36 ++++---- .../tags/blocks/mineable/pickaxe.json | 5 +- .../data/minecraft/tags/blocks/trapdoors.json | 2 +- .../data/minecraft/tags/blocks/walls.json | 2 +- .../minecraft/tags/blocks/wooden_buttons.json | 2 +- .../minecraft/tags/blocks/wooden_doors.json | 2 +- .../minecraft/tags/blocks/wooden_fences.json | 2 +- .../tags/blocks/wooden_pressure_plates.json | 2 +- .../minecraft/tags/blocks/wooden_slabs.json | 4 +- .../minecraft/tags/blocks/wooden_stairs.json | 2 +- .../tags/blocks/wooden_trapdoors.json | 2 +- .../minecraft/tags/blocks/wool_carpets.json | 2 +- .../data/minecraft/tags/items/candles.json | 2 +- .../data/minecraft/tags/items/doors.json | 2 +- .../minecraft/tags/items/fence_gates.json | 2 +- .../data/minecraft/tags/items/trapdoors.json | 2 +- .../data/minecraft/tags/items/walls.json | 2 +- .../minecraft/tags/items/wooden_buttons.json | 2 +- .../minecraft/tags/items/wooden_doors.json | 2 +- .../minecraft/tags/items/wooden_fences.json | 2 +- .../tags/items/wooden_pressure_plates.json | 2 +- .../minecraft/tags/items/wooden_slabs.json | 4 +- .../minecraft/tags/items/wooden_stairs.json | 2 +- .../tags/items/wooden_trapdoors.json | 2 +- .../minecraft/tags/items/wool_carpets.json | 2 +- .../recipes/decorations/templates.json | 51 +++++++++++ .../loot_tables/blocks/button.json | 2 +- .../loot_tables/blocks/candle.json | 8 +- .../loot_tables/blocks/carpet.json | 2 +- .../loot_tables/blocks/cube.json | 2 +- .../loot_tables/blocks/door.json | 4 +- .../loot_tables/blocks/fence.json | 2 +- .../loot_tables/blocks/fence_gate.json | 2 +- .../loot_tables/blocks/iron_door.json | 4 +- .../loot_tables/blocks/iron_trapdoor.json | 2 +- .../loot_tables/blocks/lever.json | 2 +- .../loot_tables/blocks/pane.json | 2 +- .../loot_tables/blocks/post.json | 2 +- .../loot_tables/blocks/pressure_plate.json | 2 +- .../loot_tables/blocks/slab.json | 4 +- .../loot_tables/blocks/slope.json | 2 +- .../loot_tables/blocks/stairs.json | 2 +- .../loot_tables/blocks/tiny_slope.json | 2 +- .../loot_tables/blocks/trapdoor.json | 2 +- .../loot_tables/blocks/vertical_slab.json | 4 +- .../loot_tables/blocks/wall.json | 2 +- .../recipes/button.json | 4 +- .../recipes/candle.json | 4 +- .../recipes/carpet.json | 4 +- .../recipes/cube.json | 4 +- .../recipes/door.json | 4 +- .../recipes/fence.json | 4 +- .../recipes/fence_gate.json | 4 +- .../recipes/iron_door.json | 4 +- .../recipes/iron_trapdoor.json | 4 +- .../recipes/lever.json | 4 +- .../recipes/pane.json | 4 +- .../recipes/post.json | 4 +- .../recipes/pressure_plate.json | 4 +- .../recipes/slab.json | 4 +- .../recipes/slope.json | 4 +- .../recipes/stairs.json | 4 +- .../recipes/tiny_slope.json | 4 +- .../recipes/trapdoor.json | 4 +- .../recipes/vertical_slab.json | 4 +- .../recipes/wall.json | 4 +- .../recipes/decorations/templates.json | 51 ----------- .../loot_tables/blocks/cool_rivulet.json | 19 ----- src/main/resources/fabric.mod.json | 2 +- ...ins.json => reframedtemplates.mixins.json} | 3 +- 139 files changed, 599 insertions(+), 691 deletions(-) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/button.json (58%) create mode 100644 src/main/resources/assets/reframedtemplates/blockstates/candle.json create mode 100644 src/main/resources/assets/reframedtemplates/blockstates/carpet.json create mode 100644 src/main/resources/assets/reframedtemplates/blockstates/cube.json rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/door.json (52%) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/fence.json (61%) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/fence_gate.json (57%) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/iron_door.json (52%) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/iron_trapdoor.json (51%) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/lever.json (58%) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/pane.json (53%) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/post.json (51%) create mode 100644 src/main/resources/assets/reframedtemplates/blockstates/pressure_plate.json create mode 100644 src/main/resources/assets/reframedtemplates/blockstates/slab.json rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/slope.json (54%) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/stairs.json (61%) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/tiny_slope.json (52%) rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/trapdoor.json (51%) create mode 100644 src/main/resources/assets/reframedtemplates/blockstates/vertical_slab.json rename src/main/resources/assets/{templates => reframedtemplates}/blockstates/wall.json (63%) create mode 100644 src/main/resources/assets/reframedtemplates/lang/en_us.json rename src/main/resources/assets/{templates => reframedtemplates}/models/block/fence_post_inventory.json (100%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/fence_side.json (75%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/glass_pane_side.json (61%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/glass_pane_side_alt.json (61%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/lever.json (78%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/lever_on.json (78%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/slope_base.json (100%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/tiny_slope_base.json (75%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/trapdoor_open.json (70%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/vertical_slab.json (79%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/wall_side.json (55%) rename src/main/resources/assets/{templates => reframedtemplates}/models/block/wall_side_tall.json (55%) rename src/main/resources/assets/{templates => reframedtemplates}/models/item/candle.json (56%) rename src/main/resources/assets/{templates => reframedtemplates}/models/item/door.json (57%) rename src/main/resources/assets/{templates => reframedtemplates}/models/item/iron_door.json (57%) rename src/main/resources/assets/{templates => reframedtemplates}/models/item/lever.json (57%) rename src/main/resources/assets/{templates => reframedtemplates}/models/item/pane.json (53%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/block/framed_accent_block.png (100%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/block/framed_block.png (100%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/item/candle.png (100%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/item/door.png (100%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/item/lever.png (100%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/templates_special/down.png (100%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/templates_special/east.png (100%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/templates_special/north.png (100%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/templates_special/south.png (100%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/templates_special/up.png (100%) rename src/main/resources/assets/{templates => reframedtemplates}/textures/templates_special/west.png (100%) delete mode 100644 src/main/resources/assets/templates/blockstates/candle.json delete mode 100644 src/main/resources/assets/templates/blockstates/carpet.json delete mode 100644 src/main/resources/assets/templates/blockstates/cool_rivulet.json delete mode 100644 src/main/resources/assets/templates/blockstates/cube.json delete mode 100644 src/main/resources/assets/templates/blockstates/pressure_plate.json delete mode 100644 src/main/resources/assets/templates/blockstates/slab.json delete mode 100644 src/main/resources/assets/templates/blockstates/vertical_slab.json delete mode 100644 src/main/resources/assets/templates/lang/en_us.json delete mode 100644 src/main/resources/assets/templates/models/block/cool_rivulet.json delete mode 100644 src/main/resources/assets/templates/models/item/cool_rivulet.json delete mode 100644 src/main/resources/assets/templates/textures/block/cool_rivulet.png create mode 100644 src/main/resources/data/reframedtemplates/advancements/recipes/decorations/templates.json rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/button.json (84%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/candle.json (86%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/carpet.json (84%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/cube.json (84%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/door.json (81%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/fence.json (84%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/fence_gate.json (82%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/iron_door.json (80%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/iron_trapdoor.json (81%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/lever.json (84%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/pane.json (84%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/post.json (84%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/pressure_plate.json (81%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/slab.json (87%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/slope.json (84%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/stairs.json (84%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/tiny_slope.json (82%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/trapdoor.json (83%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/vertical_slab.json (85%) rename src/main/resources/data/{templates => reframedtemplates}/loot_tables/blocks/wall.json (84%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/button.json (74%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/candle.json (78%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/carpet.json (74%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/cube.json (76%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/door.json (76%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/fence.json (75%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/fence_gate.json (73%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/iron_door.json (79%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/iron_trapdoor.json (77%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/lever.json (79%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/pane.json (76%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/post.json (75%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/pressure_plate.json (72%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/slab.json (75%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/slope.json (75%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/stairs.json (75%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/tiny_slope.json (73%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/trapdoor.json (75%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/vertical_slab.json (73%) rename src/main/resources/data/{templates => reframedtemplates}/recipes/wall.json (76%) delete mode 100644 src/main/resources/data/templates/advancements/recipes/decorations/templates.json delete mode 100644 src/main/resources/data/templates/loot_tables/blocks/cool_rivulet.json rename src/main/resources/{templates.mixins.json => reframedtemplates.mixins.json} (91%) diff --git a/src/main/java/fr/adrien1106/reframedtemplates/Templates.java b/src/main/java/fr/adrien1106/reframedtemplates/Templates.java index ed30ca2..9f4268b 100644 --- a/src/main/java/fr/adrien1106/reframedtemplates/Templates.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/Templates.java @@ -49,14 +49,14 @@ import java.util.function.BiConsumer; import java.util.stream.Collectors; /** - * TODO handle random textures, handle grass side, multiple camos + * TODO handle random textures wip, handle grass side, multiple camos */ public class Templates implements ModInitializer { - public static final String MODID = "templates"; + public static final String MODID = "reframedtemplates"; //addon devs: *Don't* add your blocks to this collection, it's just for my registration convenience since Templates adds a lot of blocks... @ApiStatus.Internal static final ArrayList INTERNAL_TEMPLATES = new ArrayList<>(); - @ApiStatus.Internal static Block CUBE, STAIRS, SLAB, VERTICAL_SLAB, POST, FENCE, FENCE_GATE, DOOR, TRAPDOOR, IRON_DOOR, IRON_TRAPDOOR, PRESSURE_PLATE, BUTTON, LEVER, WALL, CARPET, PANE, CANDLE, SLOPE, TINY_SLOPE, COOL_RIVULET; + @ApiStatus.Internal static Block CUBE, STAIRS, SLAB, VERTICAL_SLAB, POST, FENCE, FENCE_GATE, DOOR, TRAPDOOR, IRON_DOOR, IRON_TRAPDOOR, PRESSURE_PLATE, BUTTON, LEVER, WALL, CARPET, PANE, CANDLE, SLOPE, TINY_SLOPE; //For addon devs: Please don't stuff more blocks into this BlockEntityType, and register your own. //You can even re-register the same TemplateEntity class under your own ID if you like. (It's an extensible block entity.) @@ -71,7 +71,7 @@ public class Templates implements ModInitializer { //the ordering is used in the creative tab, so they're roughly sorted by encounter order of the //corresponding vanilla block in the "search" creative tab... with the non-vanilla "post" and //"vertical slab" inserted where they fit ...and i moved the lever way up next to the pressureplate - //and button, cause theyre redstoney... hopefully this ordering makes sense lol + //and button, because they're redstoney... hopefully this ordering makes sense lol CUBE = registerTemplate("cube" , new TemplateBlock(TemplateInteractionUtil.makeSettings())); STAIRS = registerTemplate("stairs" , new TemplateStairsBlock(cp(Blocks.OAK_STAIRS))); SLAB = registerTemplate("slab" , new TemplateSlabBlock(cp(Blocks.OAK_SLAB))); @@ -98,24 +98,11 @@ public class Templates implements ModInitializer { FabricBlockEntityTypeBuilder.create((pos, state) -> new TemplateEntity(TEMPLATE_BLOCK_ENTITY, pos, state), INTERNAL_TEMPLATES.toArray(new Block[0])).build(null) ); - //hey guys rate my registration code - Registry.register(Registries.ITEM, id("cool_rivulet"), new BlockItem( - COOL_RIVULET = Registry.register(Registries.BLOCK, id("cool_rivulet"), new GlazedTerracottaBlock( - AbstractBlock.Settings.create().hardness(0.2f)) { - @Override - public void appendTooltip(ItemStack stack, @Nullable BlockView world, List tooltip, TooltipContext eggbals) { - tooltip.add(Text.translatable("block.templates.cool_rivulet").formatted(Formatting.GRAY)); - } - }), - new Item.Settings() - )); - Registry.register(Registries.ITEM_GROUP, id("tab"), FabricItemGroup.builder() - .displayName(Text.translatable("itemGroup.templates.tab")) + .displayName(Text.translatable("itemGroup.reframedtemplates.tab")) .icon(() -> new ItemStack(SLOPE)) .entries((ctx, e) -> { e.addAll(INTERNAL_TEMPLATES.stream().map(ItemStack::new).collect(Collectors.toList())); - e.add(COOL_RIVULET); }).build() ); } diff --git a/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearance.java b/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearance.java index 714628b..070c0e9 100644 --- a/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearance.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearance.java @@ -11,16 +11,4 @@ public interface TemplateAppearance { @NotNull Sprite getSprite(Direction dir); int getBakeFlags(Direction dir); boolean hasColor(Direction dir); - - //TODO ABI: Dates from before conditional model AO was added. - @Deprecated(forRemoval = true) - default @NotNull RenderMaterial getRenderMaterial() { - return getRenderMaterial(false); - } - - //TODO ABI: Deprecated in 2.2. I never ended up implementing this, it's much easier to modify particles via the BlockState - @Deprecated(forRemoval = true) - default @NotNull Sprite getParticleSprite() { - return getSprite(Direction.NORTH); - } } diff --git a/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearanceManager.java b/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearanceManager.java index ea80ee5..815ec05 100644 --- a/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearanceManager.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearanceManager.java @@ -53,7 +53,7 @@ public class TemplateAppearanceManager { //TODO ABI: Shouldn't have been made public. Noticed this in 2.2. @ApiStatus.Internal - public static final SpriteIdentifier DEFAULT_SPRITE_ID = new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, new Identifier("minecraft:block/scaffolding_top")); + public static final SpriteIdentifier DEFAULT_SPRITE_ID = new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, new Identifier("reframedtemplates:block/framed_block")); private static final SpriteIdentifier BARRIER_SPRITE_ID = new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, new Identifier("minecraft:item/barrier")); private final TemplateAppearance defaultAppearance; diff --git a/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedAutoRetexturedModel.java b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedAutoRetexturedModel.java index f8296b9..037aa68 100644 --- a/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedAutoRetexturedModel.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedAutoRetexturedModel.java @@ -100,11 +100,4 @@ public class UnbakedAutoRetexturedModel implements UnbakedModel, TemplatesClient } }; } - - //TODO ABI: (2.2) use TemplatesClientApi.getInstance.auto, and use the builder properties to set this field - @Deprecated(forRemoval = true) - public UnbakedAutoRetexturedModel(Identifier parent, BlockState itemModelState) { - this(parent); - itemModelState(itemModelState); - } } diff --git a/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedJsonRetexturedModel.java b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedJsonRetexturedModel.java index 03a1eef..a75738e 100644 --- a/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedJsonRetexturedModel.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedJsonRetexturedModel.java @@ -2,17 +2,14 @@ package fr.adrien1106.reframedtemplates.model; import fr.adrien1106.reframedtemplates.Templates; import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; +import fr.adrien1106.reframedtemplates.mixin.model.WeightedBakedModelAccessor; import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; import net.fabricmc.fabric.api.renderer.v1.mesh.MeshBuilder; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; import net.minecraft.block.BlockState; -import net.minecraft.client.render.model.BakedModel; -import net.minecraft.client.render.model.BakedQuad; -import net.minecraft.client.render.model.Baker; -import net.minecraft.client.render.model.ModelBakeSettings; -import net.minecraft.client.render.model.UnbakedModel; +import net.minecraft.client.render.model.*; import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.screen.PlayerScreenHandler; @@ -73,9 +70,15 @@ public class UnbakedJsonRetexturedModel implements UnbakedModel, TemplatesClient SpriteIdentifier id = new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, Templates.id("templates_special/" + DIRECTIONS[i].getName())); specialSprites[i] = Objects.requireNonNull(spriteLookup.apply(id), () -> "Couldn't find sprite " + id + " !"); } - + + BakedModel model = baker.bake(parent, modelBakeSettings); + if (model instanceof WeightedBakedModel weighted_model) { + System.out.println("weighted model"); + ((WeightedBakedModelAccessor) weighted_model).getModels(); + } + return new RetexturingBakedModel( - baker.bake(parent, modelBakeSettings), + model, TemplatesClientApi.getInstance().getOrCreateTemplateApperanceManager(spriteLookup), modelBakeSettings, itemModelState, @@ -85,7 +88,7 @@ public class UnbakedJsonRetexturedModel implements UnbakedModel, TemplatesClient @Override protected Mesh getBaseMesh(BlockState state) { - //Convert models to retexturable Meshes lazily, the first time we encounter each blockstate + //Convert models to re-texturable Meshes lazily, the first time we encounter each blockstate return jsonToMesh.computeIfAbsent(state, this::convertModel); } @@ -96,7 +99,7 @@ public class UnbakedJsonRetexturedModel implements UnbakedModel, TemplatesClient RenderMaterial mat = tam.getCachedMaterial(state, false); Random rand = Random.create(42); - + for(Direction cullFace : DIRECTIONS_AND_NULL) { for(BakedQuad quad : wrapped.getQuads(state, cullFace, rand)) { emitter.fromVanilla(quad, mat, cullFace); @@ -118,11 +121,4 @@ public class UnbakedJsonRetexturedModel implements UnbakedModel, TemplatesClient } }; } - - //TODO ABI: (2.2) use TemplatesClientApi.getInstance.json, and use the builder properties to set this field - @Deprecated(forRemoval = true) - public UnbakedJsonRetexturedModel(Identifier parent, BlockState itemModelState) { - this(parent); - itemModelState(itemModelState); - } } diff --git a/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedMeshRetexturedModel.java b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedMeshRetexturedModel.java index 8c033e7..8fb5958 100644 --- a/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedMeshRetexturedModel.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedMeshRetexturedModel.java @@ -69,10 +69,4 @@ public class UnbakedMeshRetexturedModel implements UnbakedModel, TemplatesClient } }; } - - //TODO ABI: (2.2) use TemplatesClientApi.getInstance.mesh - @Deprecated(forRemoval = true) - public UnbakedMeshRetexturedModel(Identifier parent, Supplier baseMeshFactory) { - this(parent, __ -> baseMeshFactory.get()); - } } diff --git a/src/main/resources/assets/templates/blockstates/button.json b/src/main/resources/assets/reframedtemplates/blockstates/button.json similarity index 58% rename from src/main/resources/assets/templates/blockstates/button.json rename to src/main/resources/assets/reframedtemplates/blockstates/button.json index 28c5d0d..e460e2f 100644 --- a/src/main/resources/assets/templates/blockstates/button.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/button.json @@ -1,115 +1,115 @@ { "variants": { "face=ceiling,facing=east,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "x": 180, "y": 270 }, "face=ceiling,facing=east,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "x": 180, "y": 270 }, "face=ceiling,facing=north,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "x": 180, "y": 180 }, "face=ceiling,facing=north,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "x": 180, "y": 180 }, "face=ceiling,facing=south,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "x": 180 }, "face=ceiling,facing=south,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "x": 180 }, "face=ceiling,facing=west,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "x": 180, "y": 90 }, "face=ceiling,facing=west,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "x": 180, "y": 90 }, "face=floor,facing=east,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "y": 90 }, "face=floor,facing=east,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "y": 90 }, "face=floor,facing=north,powered=false": { - "model": "templates:button_special" + "model": "reframedtemplates:button_special" }, "face=floor,facing=north,powered=true": { - "model": "templates:button_pressed_special" + "model": "reframedtemplates:button_pressed_special" }, "face=floor,facing=south,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "y": 180 }, "face=floor,facing=south,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "y": 180 }, "face=floor,facing=west,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "y": 270 }, "face=floor,facing=west,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "y": 270 }, "face=wall,facing=east,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "uvlock": true, "x": 90, "y": 90 }, "face=wall,facing=east,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "uvlock": true, "x": 90, "y": 90 }, "face=wall,facing=north,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "uvlock": true, "x": 90 }, "face=wall,facing=north,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "uvlock": true, "x": 90 }, "face=wall,facing=south,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "uvlock": true, "x": 90, "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "uvlock": true, "x": 90, "y": 180 }, "face=wall,facing=west,powered=false": { - "model": "templates:button_special", + "model": "reframedtemplates:button_special", "uvlock": true, "x": 90, "y": 270 }, "face=wall,facing=west,powered=true": { - "model": "templates:button_pressed_special", + "model": "reframedtemplates:button_pressed_special", "uvlock": true, "x": 90, "y": 270 diff --git a/src/main/resources/assets/reframedtemplates/blockstates/candle.json b/src/main/resources/assets/reframedtemplates/blockstates/candle.json new file mode 100644 index 0000000..fedfd9c --- /dev/null +++ b/src/main/resources/assets/reframedtemplates/blockstates/candle.json @@ -0,0 +1,16 @@ +{ + "variants": { + "candles=1": { + "model": "reframedtemplates:one_candle_special" + }, + "candles=2": { + "model": "reframedtemplates:two_candles_special" + }, + "candles=3": { + "model": "reframedtemplates:three_candles_special" + }, + "candles=4": { + "model": "reframedtemplates:four_candles_special" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/reframedtemplates/blockstates/carpet.json b/src/main/resources/assets/reframedtemplates/blockstates/carpet.json new file mode 100644 index 0000000..1e93c1d --- /dev/null +++ b/src/main/resources/assets/reframedtemplates/blockstates/carpet.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "reframedtemplates:carpet_special" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/reframedtemplates/blockstates/cube.json b/src/main/resources/assets/reframedtemplates/blockstates/cube.json new file mode 100644 index 0000000..91da698 --- /dev/null +++ b/src/main/resources/assets/reframedtemplates/blockstates/cube.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "reframedtemplates:cube_special" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/templates/blockstates/door.json b/src/main/resources/assets/reframedtemplates/blockstates/door.json similarity index 52% rename from src/main/resources/assets/templates/blockstates/door.json rename to src/main/resources/assets/reframedtemplates/blockstates/door.json index ceb150a..ca062aa 100644 --- a/src/main/resources/assets/templates/blockstates/door.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/door.json @@ -1,123 +1,123 @@ { "variants": { "facing=east,half=lower,hinge=left,open=false": { - "model": "templates:door_bottom_left_special" + "model": "reframedtemplates:door_bottom_left_special" }, "facing=east,half=lower,hinge=left,open=true": { - "model": "templates:door_bottom_left_open_special", + "model": "reframedtemplates:door_bottom_left_open_special", "y": 90 }, "facing=east,half=lower,hinge=right,open=false": { - "model": "templates:door_bottom_right_special" + "model": "reframedtemplates:door_bottom_right_special" }, "facing=east,half=lower,hinge=right,open=true": { - "model": "templates:door_bottom_right_open_special", + "model": "reframedtemplates:door_bottom_right_open_special", "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "templates:door_top_left_special" + "model": "reframedtemplates:door_top_left_special" }, "facing=east,half=upper,hinge=left,open=true": { - "model": "templates:door_top_left_open_special", + "model": "reframedtemplates:door_top_left_open_special", "y": 90 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "templates:door_top_right_special" + "model": "reframedtemplates:door_top_right_special" }, "facing=east,half=upper,hinge=right,open=true": { - "model": "templates:door_top_right_open_special", + "model": "reframedtemplates:door_top_right_open_special", "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "templates:door_bottom_left_special", + "model": "reframedtemplates:door_bottom_left_special", "y": 270 }, "facing=north,half=lower,hinge=left,open=true": { - "model": "templates:door_bottom_left_open_special" + "model": "reframedtemplates:door_bottom_left_open_special" }, "facing=north,half=lower,hinge=right,open=false": { - "model": "templates:door_bottom_right_special", + "model": "reframedtemplates:door_bottom_right_special", "y": 270 }, "facing=north,half=lower,hinge=right,open=true": { - "model": "templates:door_bottom_right_open_special", + "model": "reframedtemplates:door_bottom_right_open_special", "y": 180 }, "facing=north,half=upper,hinge=left,open=false": { - "model": "templates:door_top_left_special", + "model": "reframedtemplates:door_top_left_special", "y": 270 }, "facing=north,half=upper,hinge=left,open=true": { - "model": "templates:door_top_left_open_special" + "model": "reframedtemplates:door_top_left_open_special" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "templates:door_top_right_special", + "model": "reframedtemplates:door_top_right_special", "y": 270 }, "facing=north,half=upper,hinge=right,open=true": { - "model": "templates:door_top_right_open_special", + "model": "reframedtemplates:door_top_right_open_special", "y": 180 }, "facing=south,half=lower,hinge=left,open=false": { - "model": "templates:door_bottom_left_special", + "model": "reframedtemplates:door_bottom_left_special", "y": 90 }, "facing=south,half=lower,hinge=left,open=true": { - "model": "templates:door_bottom_left_open_special", + "model": "reframedtemplates:door_bottom_left_open_special", "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "templates:door_bottom_right_special", + "model": "reframedtemplates:door_bottom_right_special", "y": 90 }, "facing=south,half=lower,hinge=right,open=true": { - "model": "templates:door_bottom_right_open_special" + "model": "reframedtemplates:door_bottom_right_open_special" }, "facing=south,half=upper,hinge=left,open=false": { - "model": "templates:door_top_left_special", + "model": "reframedtemplates:door_top_left_special", "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "templates:door_top_left_open_special", + "model": "reframedtemplates:door_top_left_open_special", "y": 180 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "templates:door_top_right_special", + "model": "reframedtemplates:door_top_right_special", "y": 90 }, "facing=south,half=upper,hinge=right,open=true": { - "model": "templates:door_top_right_open_special" + "model": "reframedtemplates:door_top_right_open_special" }, "facing=west,half=lower,hinge=left,open=false": { - "model": "templates:door_bottom_left_special", + "model": "reframedtemplates:door_bottom_left_special", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "templates:door_bottom_left_open_special", + "model": "reframedtemplates:door_bottom_left_open_special", "y": 270 }, "facing=west,half=lower,hinge=right,open=false": { - "model": "templates:door_bottom_right_special", + "model": "reframedtemplates:door_bottom_right_special", "y": 180 }, "facing=west,half=lower,hinge=right,open=true": { - "model": "templates:door_bottom_right_open_special", + "model": "reframedtemplates:door_bottom_right_open_special", "y": 90 }, "facing=west,half=upper,hinge=left,open=false": { - "model": "templates:door_top_left_special", + "model": "reframedtemplates:door_top_left_special", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "templates:door_top_left_open_special", + "model": "reframedtemplates:door_top_left_open_special", "y": 270 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "templates:door_top_right_special", + "model": "reframedtemplates:door_top_right_special", "y": 180 }, "facing=west,half=upper,hinge=right,open=true": { - "model": "templates:door_top_right_open_special", + "model": "reframedtemplates:door_top_right_open_special", "y": 90 } } diff --git a/src/main/resources/assets/templates/blockstates/fence.json b/src/main/resources/assets/reframedtemplates/blockstates/fence.json similarity index 61% rename from src/main/resources/assets/templates/blockstates/fence.json rename to src/main/resources/assets/reframedtemplates/blockstates/fence.json index f320179..6dec5a3 100644 --- a/src/main/resources/assets/templates/blockstates/fence.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/fence.json @@ -2,12 +2,12 @@ "multipart": [ { "apply": { - "model": "templates:fence_post_special" + "model": "reframedtemplates:fence_post_special" } }, { "apply": { - "model": "templates:fence_side_special", + "model": "reframedtemplates:fence_side_special", "uvlock": true }, "when": { @@ -16,7 +16,7 @@ }, { "apply": { - "model": "templates:fence_side_special", + "model": "reframedtemplates:fence_side_special", "uvlock": true, "y": 90 }, @@ -26,7 +26,7 @@ }, { "apply": { - "model": "templates:fence_side_special", + "model": "reframedtemplates:fence_side_special", "uvlock": true, "y": 180 }, @@ -36,7 +36,7 @@ }, { "apply": { - "model": "templates:fence_side_special", + "model": "reframedtemplates:fence_side_special", "uvlock": true, "y": 270 }, diff --git a/src/main/resources/assets/templates/blockstates/fence_gate.json b/src/main/resources/assets/reframedtemplates/blockstates/fence_gate.json similarity index 57% rename from src/main/resources/assets/templates/blockstates/fence_gate.json rename to src/main/resources/assets/reframedtemplates/blockstates/fence_gate.json index c63acf5..c03f045 100644 --- a/src/main/resources/assets/templates/blockstates/fence_gate.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/fence_gate.json @@ -1,78 +1,78 @@ { "variants": { "facing=east,in_wall=false,open=false": { - "model": "templates:fence_gate_special", + "model": "reframedtemplates:fence_gate_special", "uvlock": true, "y": 270 }, "facing=east,in_wall=false,open=true": { - "model": "templates:fence_gate_open_special", + "model": "reframedtemplates:fence_gate_open_special", "uvlock": true, "y": 270 }, "facing=east,in_wall=true,open=false": { - "model": "templates:fence_gate_wall_special", + "model": "reframedtemplates:fence_gate_wall_special", "uvlock": true, "y": 270 }, "facing=east,in_wall=true,open=true": { - "model": "templates:fence_gate_wall_open_special", + "model": "reframedtemplates:fence_gate_wall_open_special", "uvlock": true, "y": 270 }, "facing=north,in_wall=false,open=false": { - "model": "templates:fence_gate_special", + "model": "reframedtemplates:fence_gate_special", "uvlock": true, "y": 180 }, "facing=north,in_wall=false,open=true": { - "model": "templates:fence_gate_open_special", + "model": "reframedtemplates:fence_gate_open_special", "uvlock": true, "y": 180 }, "facing=north,in_wall=true,open=false": { - "model": "templates:fence_gate_wall_special", + "model": "reframedtemplates:fence_gate_wall_special", "uvlock": true, "y": 180 }, "facing=north,in_wall=true,open=true": { - "model": "templates:fence_gate_wall_open_special", + "model": "reframedtemplates:fence_gate_wall_open_special", "uvlock": true, "y": 180 }, "facing=south,in_wall=false,open=false": { - "model": "templates:fence_gate_special", + "model": "reframedtemplates:fence_gate_special", "uvlock": true }, "facing=south,in_wall=false,open=true": { - "model": "templates:fence_gate_open_special", + "model": "reframedtemplates:fence_gate_open_special", "uvlock": true }, "facing=south,in_wall=true,open=false": { - "model": "templates:fence_gate_wall_special", + "model": "reframedtemplates:fence_gate_wall_special", "uvlock": true }, "facing=south,in_wall=true,open=true": { - "model": "templates:fence_gate_wall_open_special", + "model": "reframedtemplates:fence_gate_wall_open_special", "uvlock": true }, "facing=west,in_wall=false,open=false": { - "model": "templates:fence_gate_special", + "model": "reframedtemplates:fence_gate_special", "uvlock": true, "y": 90 }, "facing=west,in_wall=false,open=true": { - "model": "templates:fence_gate_open_special", + "model": "reframedtemplates:fence_gate_open_special", "uvlock": true, "y": 90 }, "facing=west,in_wall=true,open=false": { - "model": "templates:fence_gate_wall_special", + "model": "reframedtemplates:fence_gate_wall_special", "uvlock": true, "y": 90 }, "facing=west,in_wall=true,open=true": { - "model": "templates:fence_gate_wall_open_special", + "model": "reframedtemplates:fence_gate_wall_open_special", "uvlock": true, "y": 90 } diff --git a/src/main/resources/assets/templates/blockstates/iron_door.json b/src/main/resources/assets/reframedtemplates/blockstates/iron_door.json similarity index 52% rename from src/main/resources/assets/templates/blockstates/iron_door.json rename to src/main/resources/assets/reframedtemplates/blockstates/iron_door.json index ceb150a..ca062aa 100644 --- a/src/main/resources/assets/templates/blockstates/iron_door.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/iron_door.json @@ -1,123 +1,123 @@ { "variants": { "facing=east,half=lower,hinge=left,open=false": { - "model": "templates:door_bottom_left_special" + "model": "reframedtemplates:door_bottom_left_special" }, "facing=east,half=lower,hinge=left,open=true": { - "model": "templates:door_bottom_left_open_special", + "model": "reframedtemplates:door_bottom_left_open_special", "y": 90 }, "facing=east,half=lower,hinge=right,open=false": { - "model": "templates:door_bottom_right_special" + "model": "reframedtemplates:door_bottom_right_special" }, "facing=east,half=lower,hinge=right,open=true": { - "model": "templates:door_bottom_right_open_special", + "model": "reframedtemplates:door_bottom_right_open_special", "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "templates:door_top_left_special" + "model": "reframedtemplates:door_top_left_special" }, "facing=east,half=upper,hinge=left,open=true": { - "model": "templates:door_top_left_open_special", + "model": "reframedtemplates:door_top_left_open_special", "y": 90 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "templates:door_top_right_special" + "model": "reframedtemplates:door_top_right_special" }, "facing=east,half=upper,hinge=right,open=true": { - "model": "templates:door_top_right_open_special", + "model": "reframedtemplates:door_top_right_open_special", "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "templates:door_bottom_left_special", + "model": "reframedtemplates:door_bottom_left_special", "y": 270 }, "facing=north,half=lower,hinge=left,open=true": { - "model": "templates:door_bottom_left_open_special" + "model": "reframedtemplates:door_bottom_left_open_special" }, "facing=north,half=lower,hinge=right,open=false": { - "model": "templates:door_bottom_right_special", + "model": "reframedtemplates:door_bottom_right_special", "y": 270 }, "facing=north,half=lower,hinge=right,open=true": { - "model": "templates:door_bottom_right_open_special", + "model": "reframedtemplates:door_bottom_right_open_special", "y": 180 }, "facing=north,half=upper,hinge=left,open=false": { - "model": "templates:door_top_left_special", + "model": "reframedtemplates:door_top_left_special", "y": 270 }, "facing=north,half=upper,hinge=left,open=true": { - "model": "templates:door_top_left_open_special" + "model": "reframedtemplates:door_top_left_open_special" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "templates:door_top_right_special", + "model": "reframedtemplates:door_top_right_special", "y": 270 }, "facing=north,half=upper,hinge=right,open=true": { - "model": "templates:door_top_right_open_special", + "model": "reframedtemplates:door_top_right_open_special", "y": 180 }, "facing=south,half=lower,hinge=left,open=false": { - "model": "templates:door_bottom_left_special", + "model": "reframedtemplates:door_bottom_left_special", "y": 90 }, "facing=south,half=lower,hinge=left,open=true": { - "model": "templates:door_bottom_left_open_special", + "model": "reframedtemplates:door_bottom_left_open_special", "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "templates:door_bottom_right_special", + "model": "reframedtemplates:door_bottom_right_special", "y": 90 }, "facing=south,half=lower,hinge=right,open=true": { - "model": "templates:door_bottom_right_open_special" + "model": "reframedtemplates:door_bottom_right_open_special" }, "facing=south,half=upper,hinge=left,open=false": { - "model": "templates:door_top_left_special", + "model": "reframedtemplates:door_top_left_special", "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "templates:door_top_left_open_special", + "model": "reframedtemplates:door_top_left_open_special", "y": 180 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "templates:door_top_right_special", + "model": "reframedtemplates:door_top_right_special", "y": 90 }, "facing=south,half=upper,hinge=right,open=true": { - "model": "templates:door_top_right_open_special" + "model": "reframedtemplates:door_top_right_open_special" }, "facing=west,half=lower,hinge=left,open=false": { - "model": "templates:door_bottom_left_special", + "model": "reframedtemplates:door_bottom_left_special", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "templates:door_bottom_left_open_special", + "model": "reframedtemplates:door_bottom_left_open_special", "y": 270 }, "facing=west,half=lower,hinge=right,open=false": { - "model": "templates:door_bottom_right_special", + "model": "reframedtemplates:door_bottom_right_special", "y": 180 }, "facing=west,half=lower,hinge=right,open=true": { - "model": "templates:door_bottom_right_open_special", + "model": "reframedtemplates:door_bottom_right_open_special", "y": 90 }, "facing=west,half=upper,hinge=left,open=false": { - "model": "templates:door_top_left_special", + "model": "reframedtemplates:door_top_left_special", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "templates:door_top_left_open_special", + "model": "reframedtemplates:door_top_left_open_special", "y": 270 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "templates:door_top_right_special", + "model": "reframedtemplates:door_top_right_special", "y": 180 }, "facing=west,half=upper,hinge=right,open=true": { - "model": "templates:door_top_right_open_special", + "model": "reframedtemplates:door_top_right_open_special", "y": 90 } } diff --git a/src/main/resources/assets/templates/blockstates/iron_trapdoor.json b/src/main/resources/assets/reframedtemplates/blockstates/iron_trapdoor.json similarity index 51% rename from src/main/resources/assets/templates/blockstates/iron_trapdoor.json rename to src/main/resources/assets/reframedtemplates/blockstates/iron_trapdoor.json index f7f5a6a..15b6d94 100644 --- a/src/main/resources/assets/templates/blockstates/iron_trapdoor.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/iron_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { "facing=east,half=bottom,open=false": { - "model": "templates:trapdoor_bottom_special", + "model": "reframedtemplates:trapdoor_bottom_special", "y": 90 }, "facing=east,half=bottom,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "y": 90 }, "facing=east,half=top,open=false": { - "model": "templates:trapdoor_top_special", + "model": "reframedtemplates:trapdoor_top_special", "y": 90 }, "facing=east,half=top,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "x": 180, "y": 270 }, "facing=north,half=bottom,open=false": { - "model": "templates:trapdoor_bottom_special" + "model": "reframedtemplates:trapdoor_bottom_special" }, "facing=north,half=bottom,open=true": { - "model": "templates:trapdoor_open_special" + "model": "reframedtemplates:trapdoor_open_special" }, "facing=north,half=top,open=false": { - "model": "templates:trapdoor_top_special" + "model": "reframedtemplates:trapdoor_top_special" }, "facing=north,half=top,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "x": 180, "y": 180 }, "facing=south,half=bottom,open=false": { - "model": "templates:trapdoor_bottom_special", + "model": "reframedtemplates:trapdoor_bottom_special", "y": 180 }, "facing=south,half=bottom,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "y": 180 }, "facing=south,half=top,open=false": { - "model": "templates:trapdoor_top_special", + "model": "reframedtemplates:trapdoor_top_special", "y": 180 }, "facing=south,half=top,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "x": 180, "y": 0 }, "facing=west,half=bottom,open=false": { - "model": "templates:trapdoor_bottom_special", + "model": "reframedtemplates:trapdoor_bottom_special", "y": 270 }, "facing=west,half=bottom,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "y": 270 }, "facing=west,half=top,open=false": { - "model": "templates:trapdoor_top_special", + "model": "reframedtemplates:trapdoor_top_special", "y": 270 }, "facing=west,half=top,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "x": 180, "y": 90 } diff --git a/src/main/resources/assets/templates/blockstates/lever.json b/src/main/resources/assets/reframedtemplates/blockstates/lever.json similarity index 58% rename from src/main/resources/assets/templates/blockstates/lever.json rename to src/main/resources/assets/reframedtemplates/blockstates/lever.json index 73ce953..a3f6ba5 100644 --- a/src/main/resources/assets/templates/blockstates/lever.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/lever.json @@ -1,108 +1,108 @@ { "variants": { "face=ceiling,facing=east,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "x": 180, "y": 270 }, "face=ceiling,facing=east,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "x": 180, "y": 270 }, "face=ceiling,facing=north,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "x": 180, "y": 180 }, "face=ceiling,facing=north,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "x": 180, "y": 180 }, "face=ceiling,facing=south,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "x": 180 }, "face=ceiling,facing=south,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "x": 180 }, "face=ceiling,facing=west,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "x": 180, "y": 90 }, "face=ceiling,facing=west,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "x": 180, "y": 90 }, "face=floor,facing=east,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "y": 90 }, "face=floor,facing=east,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "y": 90 }, "face=floor,facing=north,powered=false": { - "model": "templates:lever_on_special" + "model": "reframedtemplates:lever_on_special" }, "face=floor,facing=north,powered=true": { - "model": "templates:lever_special" + "model": "reframedtemplates:lever_special" }, "face=floor,facing=south,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "y": 180 }, "face=floor,facing=south,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "y": 180 }, "face=floor,facing=west,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "y": 270 }, "face=floor,facing=west,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "y": 270 }, "face=wall,facing=east,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "x": 90, "y": 90 }, "face=wall,facing=east,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "x": 90, "y": 90 }, "face=wall,facing=north,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "x": 90 }, "face=wall,facing=north,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "x": 90 }, "face=wall,facing=south,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "x": 90, "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "x": 90, "y": 180 }, "face=wall,facing=west,powered=false": { - "model": "templates:lever_on_special", + "model": "reframedtemplates:lever_on_special", "x": 90, "y": 270 }, "face=wall,facing=west,powered=true": { - "model": "templates:lever_special", + "model": "reframedtemplates:lever_special", "x": 90, "y": 270 } diff --git a/src/main/resources/assets/templates/blockstates/pane.json b/src/main/resources/assets/reframedtemplates/blockstates/pane.json similarity index 53% rename from src/main/resources/assets/templates/blockstates/pane.json rename to src/main/resources/assets/reframedtemplates/blockstates/pane.json index 463e918..4cb0ba3 100644 --- a/src/main/resources/assets/templates/blockstates/pane.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/pane.json @@ -2,12 +2,12 @@ "multipart": [ { "apply": { - "model": "templates:glass_pane_post_special" + "model": "reframedtemplates:glass_pane_post_special" } }, { "apply": { - "model": "templates:glass_pane_side_special" + "model": "reframedtemplates:glass_pane_side_special" }, "when": { "north": "true" @@ -15,7 +15,7 @@ }, { "apply": { - "model": "templates:glass_pane_side_special", + "model": "reframedtemplates:glass_pane_side_special", "y": 90 }, "when": { @@ -24,7 +24,7 @@ }, { "apply": { - "model": "templates:glass_pane_side_alt_special" + "model": "reframedtemplates:glass_pane_side_alt_special" }, "when": { "south": "true" @@ -32,7 +32,7 @@ }, { "apply": { - "model": "templates:glass_pane_side_alt_special", + "model": "reframedtemplates:glass_pane_side_alt_special", "y": 90 }, "when": { @@ -41,7 +41,7 @@ }, { "apply": { - "model": "templates:glass_pane_noside_special" + "model": "reframedtemplates:glass_pane_noside_special" }, "when": { "north": "false" @@ -49,7 +49,7 @@ }, { "apply": { - "model": "templates:glass_pane_noside_alt_special" + "model": "reframedtemplates:glass_pane_noside_alt_special" }, "when": { "east": "false" @@ -57,7 +57,7 @@ }, { "apply": { - "model": "templates:glass_pane_noside_alt_special", + "model": "reframedtemplates:glass_pane_noside_alt_special", "y": 90 }, "when": { @@ -66,7 +66,7 @@ }, { "apply": { - "model": "templates:glass_pane_noside_special", + "model": "reframedtemplates:glass_pane_noside_special", "y": 270 }, "when": { diff --git a/src/main/resources/assets/templates/blockstates/post.json b/src/main/resources/assets/reframedtemplates/blockstates/post.json similarity index 51% rename from src/main/resources/assets/templates/blockstates/post.json rename to src/main/resources/assets/reframedtemplates/blockstates/post.json index 7f1672a..9bc5208 100644 --- a/src/main/resources/assets/templates/blockstates/post.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/post.json @@ -1,17 +1,17 @@ { "variants": { "axis=x": { - "model": "templates:fence_post_special", + "model": "reframedtemplates:fence_post_special", "x": 90, "y": 90, "uvlock": true }, "axis=y": { - "model": "templates:fence_post_special", + "model": "reframedtemplates:fence_post_special", "uvlock": true }, "axis=z": { - "model": "templates:fence_post_special", + "model": "reframedtemplates:fence_post_special", "uvlock": true, "x": 90 } diff --git a/src/main/resources/assets/reframedtemplates/blockstates/pressure_plate.json b/src/main/resources/assets/reframedtemplates/blockstates/pressure_plate.json new file mode 100644 index 0000000..4e35b7b --- /dev/null +++ b/src/main/resources/assets/reframedtemplates/blockstates/pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "reframedtemplates:pressure_plate_up_special" + }, + "powered=true": { + "model": "reframedtemplates:pressure_plate_down_special" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/reframedtemplates/blockstates/slab.json b/src/main/resources/assets/reframedtemplates/blockstates/slab.json new file mode 100644 index 0000000..acf5d2a --- /dev/null +++ b/src/main/resources/assets/reframedtemplates/blockstates/slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "reframedtemplates:slab_bottom_special" + }, + "type=double": { + "model": "reframedtemplates:cube_special" + }, + "type=top": { + "model": "reframedtemplates:slab_top_special" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/templates/blockstates/slope.json b/src/main/resources/assets/reframedtemplates/blockstates/slope.json similarity index 54% rename from src/main/resources/assets/templates/blockstates/slope.json rename to src/main/resources/assets/reframedtemplates/blockstates/slope.json index 9967652..41bd313 100644 --- a/src/main/resources/assets/templates/blockstates/slope.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/slope.json @@ -1,62 +1,62 @@ { "variants": { "edge=down_east": { - "model": "templates:slope_special", + "model": "reframedtemplates:slope_special", "uvlock": true, "y": 270 }, "edge=down_north": { - "model": "templates:slope_special", + "model": "reframedtemplates:slope_special", "uvlock": true, "y": 180 }, "edge=down_south": { - "model": "templates:slope_special" + "model": "reframedtemplates:slope_special" }, "edge=down_west": { - "model": "templates:slope_special", + "model": "reframedtemplates:slope_special", "uvlock": true, "y": 90 }, "edge=up_east": { - "model": "templates:slope_special", + "model": "reframedtemplates:slope_special", "uvlock": true, "x": 180, "y": 90 }, "edge=up_north": { - "model": "templates:slope_special", + "model": "reframedtemplates:slope_special", "uvlock": true, "x": 180 }, "edge=up_south": { - "model": "templates:slope_special", + "model": "reframedtemplates:slope_special", "uvlock": true, "x": 180, "y": 180 }, "edge=up_west": { - "model": "templates:slope_special", + "model": "reframedtemplates:slope_special", "uvlock": true, "x": 180, "y": 270 }, "edge=north_east": { - "model": "templates:slope_side_special", + "model": "reframedtemplates:slope_side_special", "uvlock": true, "y": 270 }, "edge=north_west": { - "model": "templates:slope_side_special", + "model": "reframedtemplates:slope_side_special", "uvlock": true, "y": 180 }, "edge=south_east": { - "model": "templates:slope_side_special", + "model": "reframedtemplates:slope_side_special", "uvlock": true }, "edge=south_west": { - "model": "templates:slope_side_special", + "model": "reframedtemplates:slope_side_special", "uvlock": true, "y": 90 } diff --git a/src/main/resources/assets/templates/blockstates/stairs.json b/src/main/resources/assets/reframedtemplates/blockstates/stairs.json similarity index 61% rename from src/main/resources/assets/templates/blockstates/stairs.json rename to src/main/resources/assets/reframedtemplates/blockstates/stairs.json index 75ccd35..bc3a5d0 100644 --- a/src/main/resources/assets/templates/blockstates/stairs.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "templates:inner_stairs_special" + "model": "reframedtemplates:inner_stairs_special" }, "facing=east,half=bottom,shape=outer_left": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "templates:outer_stairs_special" + "model": "reframedtemplates:outer_stairs_special" }, "facing=east,half=bottom,shape=straight": { - "model": "templates:stairs_special" + "model": "reframedtemplates:stairs_special" }, "facing=east,half=top,shape=inner_left": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "templates:stairs_special", + "model": "reframedtemplates:stairs_special", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "templates:stairs_special", + "model": "reframedtemplates:stairs_special", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "templates:stairs_special", + "model": "reframedtemplates:stairs_special", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "templates:inner_stairs_special" + "model": "reframedtemplates:inner_stairs_special" }, "facing=south,half=bottom,shape=inner_right": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "templates:outer_stairs_special" + "model": "reframedtemplates:outer_stairs_special" }, "facing=south,half=bottom,shape=outer_right": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "templates:stairs_special", + "model": "reframedtemplates:stairs_special", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "templates:stairs_special", + "model": "reframedtemplates:stairs_special", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "templates:stairs_special", + "model": "reframedtemplates:stairs_special", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "templates:inner_stairs_special", + "model": "reframedtemplates:inner_stairs_special", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "templates:outer_stairs_special", + "model": "reframedtemplates:outer_stairs_special", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "templates:stairs_special", + "model": "reframedtemplates:stairs_special", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/resources/assets/templates/blockstates/tiny_slope.json b/src/main/resources/assets/reframedtemplates/blockstates/tiny_slope.json similarity index 52% rename from src/main/resources/assets/templates/blockstates/tiny_slope.json rename to src/main/resources/assets/reframedtemplates/blockstates/tiny_slope.json index 71f4b26..3dc42cc 100644 --- a/src/main/resources/assets/templates/blockstates/tiny_slope.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/tiny_slope.json @@ -1,62 +1,62 @@ { "variants": { "edge=down_east": { - "model": "templates:tiny_slope_special", + "model": "reframedtemplates:tiny_slope_special", "uvlock": true, "y": 270 }, "edge=down_north": { - "model": "templates:tiny_slope_special", + "model": "reframedtemplates:tiny_slope_special", "uvlock": true, "y": 180 }, "edge=down_south": { - "model": "templates:tiny_slope_special" + "model": "reframedtemplates:tiny_slope_special" }, "edge=down_west": { - "model": "templates:tiny_slope_special", + "model": "reframedtemplates:tiny_slope_special", "uvlock": true, "y": 90 }, "edge=up_east": { - "model": "templates:tiny_slope_special", + "model": "reframedtemplates:tiny_slope_special", "uvlock": true, "x": 180, "y": 90 }, "edge=up_north": { - "model": "templates:tiny_slope_special", + "model": "reframedtemplates:tiny_slope_special", "uvlock": true, "x": 180 }, "edge=up_south": { - "model": "templates:tiny_slope_special", + "model": "reframedtemplates:tiny_slope_special", "uvlock": true, "x": 180, "y": 180 }, "edge=up_west": { - "model": "templates:tiny_slope_special", + "model": "reframedtemplates:tiny_slope_special", "uvlock": true, "x": 180, "y": 270 }, "edge=north_east": { - "model": "templates:tiny_slope_side_special", + "model": "reframedtemplates:tiny_slope_side_special", "uvlock": true, "y": 270 }, "edge=north_west": { - "model": "templates:tiny_slope_side_special", + "model": "reframedtemplates:tiny_slope_side_special", "uvlock": true, "y": 180 }, "edge=south_east": { - "model": "templates:tiny_slope_side_special", + "model": "reframedtemplates:tiny_slope_side_special", "uvlock": true }, "edge=south_west": { - "model": "templates:tiny_slope_side_special", + "model": "reframedtemplates:tiny_slope_side_special", "uvlock": true, "y": 90 } diff --git a/src/main/resources/assets/templates/blockstates/trapdoor.json b/src/main/resources/assets/reframedtemplates/blockstates/trapdoor.json similarity index 51% rename from src/main/resources/assets/templates/blockstates/trapdoor.json rename to src/main/resources/assets/reframedtemplates/blockstates/trapdoor.json index f7f5a6a..15b6d94 100644 --- a/src/main/resources/assets/templates/blockstates/trapdoor.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/trapdoor.json @@ -1,67 +1,67 @@ { "variants": { "facing=east,half=bottom,open=false": { - "model": "templates:trapdoor_bottom_special", + "model": "reframedtemplates:trapdoor_bottom_special", "y": 90 }, "facing=east,half=bottom,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "y": 90 }, "facing=east,half=top,open=false": { - "model": "templates:trapdoor_top_special", + "model": "reframedtemplates:trapdoor_top_special", "y": 90 }, "facing=east,half=top,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "x": 180, "y": 270 }, "facing=north,half=bottom,open=false": { - "model": "templates:trapdoor_bottom_special" + "model": "reframedtemplates:trapdoor_bottom_special" }, "facing=north,half=bottom,open=true": { - "model": "templates:trapdoor_open_special" + "model": "reframedtemplates:trapdoor_open_special" }, "facing=north,half=top,open=false": { - "model": "templates:trapdoor_top_special" + "model": "reframedtemplates:trapdoor_top_special" }, "facing=north,half=top,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "x": 180, "y": 180 }, "facing=south,half=bottom,open=false": { - "model": "templates:trapdoor_bottom_special", + "model": "reframedtemplates:trapdoor_bottom_special", "y": 180 }, "facing=south,half=bottom,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "y": 180 }, "facing=south,half=top,open=false": { - "model": "templates:trapdoor_top_special", + "model": "reframedtemplates:trapdoor_top_special", "y": 180 }, "facing=south,half=top,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "x": 180, "y": 0 }, "facing=west,half=bottom,open=false": { - "model": "templates:trapdoor_bottom_special", + "model": "reframedtemplates:trapdoor_bottom_special", "y": 270 }, "facing=west,half=bottom,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "y": 270 }, "facing=west,half=top,open=false": { - "model": "templates:trapdoor_top_special", + "model": "reframedtemplates:trapdoor_top_special", "y": 270 }, "facing=west,half=top,open=true": { - "model": "templates:trapdoor_open_special", + "model": "reframedtemplates:trapdoor_open_special", "x": 180, "y": 90 } diff --git a/src/main/resources/assets/reframedtemplates/blockstates/vertical_slab.json b/src/main/resources/assets/reframedtemplates/blockstates/vertical_slab.json new file mode 100644 index 0000000..7757bb8 --- /dev/null +++ b/src/main/resources/assets/reframedtemplates/blockstates/vertical_slab.json @@ -0,0 +1,25 @@ +{ + "variants": { + "type=bottom,affinity=x": { + "model": "reframedtemplates:vertical_slab_special", + "y": 270 + }, + "type=double,affinity=x": { + "model": "reframedtemplates:cube_special" + }, + "type=top,affinity=x": { + "model": "reframedtemplates:vertical_slab_special", + "y": 90 + }, + "type=bottom,affinity=z": { + "model": "reframedtemplates:vertical_slab_special" + }, + "type=double,affinity=z": { + "model": "reframedtemplates:cube_special" + }, + "type=top,affinity=z": { + "model": "reframedtemplates:vertical_slab_special", + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/templates/blockstates/wall.json b/src/main/resources/assets/reframedtemplates/blockstates/wall.json similarity index 63% rename from src/main/resources/assets/templates/blockstates/wall.json rename to src/main/resources/assets/reframedtemplates/blockstates/wall.json index d0fd5ac..7e77704 100644 --- a/src/main/resources/assets/templates/blockstates/wall.json +++ b/src/main/resources/assets/reframedtemplates/blockstates/wall.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "templates:wall_post_special" + "model": "reframedtemplates:wall_post_special" }, "when": { "up": "true" @@ -10,7 +10,7 @@ }, { "apply": { - "model": "templates:wall_side_special", + "model": "reframedtemplates:wall_side_special", "uvlock": true }, "when": { @@ -19,7 +19,7 @@ }, { "apply": { - "model": "templates:wall_side_special", + "model": "reframedtemplates:wall_side_special", "uvlock": true, "y": 90 }, @@ -29,7 +29,7 @@ }, { "apply": { - "model": "templates:wall_side_special", + "model": "reframedtemplates:wall_side_special", "uvlock": true, "y": 180 }, @@ -39,7 +39,7 @@ }, { "apply": { - "model": "templates:wall_side_special", + "model": "reframedtemplates:wall_side_special", "uvlock": true, "y": 270 }, @@ -49,7 +49,7 @@ }, { "apply": { - "model": "templates:wall_side_tall_special", + "model": "reframedtemplates:wall_side_tall_special", "uvlock": true }, "when": { @@ -58,7 +58,7 @@ }, { "apply": { - "model": "templates:wall_side_tall_special", + "model": "reframedtemplates:wall_side_tall_special", "uvlock": true, "y": 90 }, @@ -68,7 +68,7 @@ }, { "apply": { - "model": "templates:wall_side_tall_special", + "model": "reframedtemplates:wall_side_tall_special", "uvlock": true, "y": 180 }, @@ -78,7 +78,7 @@ }, { "apply": { - "model": "templates:wall_side_tall_special", + "model": "reframedtemplates:wall_side_tall_special", "uvlock": true, "y": 270 }, diff --git a/src/main/resources/assets/reframedtemplates/lang/en_us.json b/src/main/resources/assets/reframedtemplates/lang/en_us.json new file mode 100644 index 0000000..436be51 --- /dev/null +++ b/src/main/resources/assets/reframedtemplates/lang/en_us.json @@ -0,0 +1,25 @@ +{ + "itemGroup.reframedtemplates.tab": "Frames", + + "block.reframedtemplates.button": "Button Frame", + "block.reframedtemplates.candle": "Candle Frame", + "block.reframedtemplates.carpet": "Carpet Frame", + "block.reframedtemplates.cube": "Cube Frame", + "block.reframedtemplates.door": "Door Frame", + "block.reframedtemplates.fence": "Fence Frame", + "block.reframedtemplates.fence_gate": "Fence Gate Frame", + "block.reframedtemplates.iron_door": "Iron Door Frame", + "block.reframedtemplates.iron_trapdoor": "Iron Trapdoor Frame", + "block.reframedtemplates.lever": "Lever Frame", + "block.reframedtemplates.pane": "Pane Frame", + "block.reframedtemplates.post": "Post Frame", + "block.reframedtemplates.pressure_plate": "Pressure Plate Frame", + "block.reframedtemplates.slope": "Slope Frame", + "block.reframedtemplates.tiny_slope": "Tiny Slope Frame", + "block.reframedtemplates.slab": "Slab Frame", + "block.reframedtemplates.stairs": "Stairs Frame", + "block.reframedtemplates.trapdoor": "Trapdoor Frame", + "block.reframedtemplates.vertical_slab": "Vertical Slab Frame", + "block.reframedtemplates.wall": "Wall Frame" + +} \ No newline at end of file diff --git a/src/main/resources/assets/templates/models/block/fence_post_inventory.json b/src/main/resources/assets/reframedtemplates/models/block/fence_post_inventory.json similarity index 100% rename from src/main/resources/assets/templates/models/block/fence_post_inventory.json rename to src/main/resources/assets/reframedtemplates/models/block/fence_post_inventory.json diff --git a/src/main/resources/assets/templates/models/block/fence_side.json b/src/main/resources/assets/reframedtemplates/models/block/fence_side.json similarity index 75% rename from src/main/resources/assets/templates/models/block/fence_side.json rename to src/main/resources/assets/reframedtemplates/models/block/fence_side.json index 9d76779..cb05c78 100644 --- a/src/main/resources/assets/templates/models/block/fence_side.json +++ b/src/main/resources/assets/reframedtemplates/models/block/fence_side.json @@ -1,11 +1,11 @@ { "textures": { - "down": "templates:templates_special/down", - "up": "templates:templates_special/up", - "north": "templates:templates_special/north", - "south": "templates:templates_special/south", - "west": "templates:templates_special/west", - "east": "templates:templates_special/east" + "down": "reframedtemplates:templates_special/down", + "up": "reframedtemplates:templates_special/up", + "north": "reframedtemplates:templates_special/north", + "south": "reframedtemplates:templates_special/south", + "west": "reframedtemplates:templates_special/west", + "east": "reframedtemplates:templates_special/east" }, "elements": [ { diff --git a/src/main/resources/assets/templates/models/block/glass_pane_side.json b/src/main/resources/assets/reframedtemplates/models/block/glass_pane_side.json similarity index 61% rename from src/main/resources/assets/templates/models/block/glass_pane_side.json rename to src/main/resources/assets/reframedtemplates/models/block/glass_pane_side.json index 34b0926..0a05ca7 100644 --- a/src/main/resources/assets/templates/models/block/glass_pane_side.json +++ b/src/main/resources/assets/reframedtemplates/models/block/glass_pane_side.json @@ -1,12 +1,12 @@ { "ambientocclusion": false, "textures": { - "down": "templates:templates_special/down", - "up": "templates:templates_special/up", - "north": "templates:templates_special/north", - "south": "templates:templates_special/south", - "west": "templates:templates_special/west", - "east": "templates:templates_special/east" + "down": "reframedtemplates:templates_special/down", + "up": "reframedtemplates:templates_special/up", + "north": "reframedtemplates:templates_special/north", + "south": "reframedtemplates:templates_special/south", + "west": "reframedtemplates:templates_special/west", + "east": "reframedtemplates:templates_special/east" }, "elements": [ { diff --git a/src/main/resources/assets/templates/models/block/glass_pane_side_alt.json b/src/main/resources/assets/reframedtemplates/models/block/glass_pane_side_alt.json similarity index 61% rename from src/main/resources/assets/templates/models/block/glass_pane_side_alt.json rename to src/main/resources/assets/reframedtemplates/models/block/glass_pane_side_alt.json index ed1337b..fe2a4ed 100644 --- a/src/main/resources/assets/templates/models/block/glass_pane_side_alt.json +++ b/src/main/resources/assets/reframedtemplates/models/block/glass_pane_side_alt.json @@ -1,12 +1,12 @@ { "ambientocclusion": false, "textures": { - "down": "templates:templates_special/down", - "up": "templates:templates_special/up", - "north": "templates:templates_special/north", - "south": "templates:templates_special/south", - "west": "templates:templates_special/west", - "east": "templates:templates_special/east" + "down": "reframedtemplates:templates_special/down", + "up": "reframedtemplates:templates_special/up", + "north": "reframedtemplates:templates_special/north", + "south": "reframedtemplates:templates_special/south", + "west": "reframedtemplates:templates_special/west", + "east": "reframedtemplates:templates_special/east" }, "elements": [ { diff --git a/src/main/resources/assets/templates/models/block/lever.json b/src/main/resources/assets/reframedtemplates/models/block/lever.json similarity index 78% rename from src/main/resources/assets/templates/models/block/lever.json rename to src/main/resources/assets/reframedtemplates/models/block/lever.json index 37b4fcf..7b75bfd 100644 --- a/src/main/resources/assets/templates/models/block/lever.json +++ b/src/main/resources/assets/reframedtemplates/models/block/lever.json @@ -2,12 +2,12 @@ "parent": "block/block", "ambientocclusion": false, "textures": { - "down": "templates:templates_special/down", - "up": "templates:templates_special/up", - "north": "templates:templates_special/north", - "south": "templates:templates_special/south", - "west": "templates:templates_special/west", - "east": "templates:templates_special/east", + "down": "reframedtemplates:templates_special/down", + "up": "reframedtemplates:templates_special/up", + "north": "reframedtemplates:templates_special/north", + "south": "reframedtemplates:templates_special/south", + "west": "reframedtemplates:templates_special/west", + "east": "reframedtemplates:templates_special/east", "lever": "block/lever" }, "elements": [ diff --git a/src/main/resources/assets/templates/models/block/lever_on.json b/src/main/resources/assets/reframedtemplates/models/block/lever_on.json similarity index 78% rename from src/main/resources/assets/templates/models/block/lever_on.json rename to src/main/resources/assets/reframedtemplates/models/block/lever_on.json index 0ca3d97..89c2a59 100644 --- a/src/main/resources/assets/templates/models/block/lever_on.json +++ b/src/main/resources/assets/reframedtemplates/models/block/lever_on.json @@ -2,12 +2,12 @@ "parent": "block/block", "ambientocclusion": false, "textures": { - "down": "templates:templates_special/down", - "up": "templates:templates_special/up", - "north": "templates:templates_special/north", - "south": "templates:templates_special/south", - "west": "templates:templates_special/west", - "east": "templates:templates_special/east", + "down": "reframedtemplates:templates_special/down", + "up": "reframedtemplates:templates_special/up", + "north": "reframedtemplates:templates_special/north", + "south": "reframedtemplates:templates_special/south", + "west": "reframedtemplates:templates_special/west", + "east": "reframedtemplates:templates_special/east", "lever": "block/lever" }, "elements": [ diff --git a/src/main/resources/assets/templates/models/block/slope_base.json b/src/main/resources/assets/reframedtemplates/models/block/slope_base.json similarity index 100% rename from src/main/resources/assets/templates/models/block/slope_base.json rename to src/main/resources/assets/reframedtemplates/models/block/slope_base.json diff --git a/src/main/resources/assets/templates/models/block/tiny_slope_base.json b/src/main/resources/assets/reframedtemplates/models/block/tiny_slope_base.json similarity index 75% rename from src/main/resources/assets/templates/models/block/tiny_slope_base.json rename to src/main/resources/assets/reframedtemplates/models/block/tiny_slope_base.json index 2913dd9..5dcf4f4 100644 --- a/src/main/resources/assets/templates/models/block/tiny_slope_base.json +++ b/src/main/resources/assets/reframedtemplates/models/block/tiny_slope_base.json @@ -1,5 +1,5 @@ { - "parent": "templates:block/slope_base", + "parent": "reframedtemplates:block/slope_base", "gui_light": "front", "display": { "gui": { diff --git a/src/main/resources/assets/templates/models/block/trapdoor_open.json b/src/main/resources/assets/reframedtemplates/models/block/trapdoor_open.json similarity index 70% rename from src/main/resources/assets/templates/models/block/trapdoor_open.json rename to src/main/resources/assets/reframedtemplates/models/block/trapdoor_open.json index 8c4fb31..113c9f4 100644 --- a/src/main/resources/assets/templates/models/block/trapdoor_open.json +++ b/src/main/resources/assets/reframedtemplates/models/block/trapdoor_open.json @@ -1,12 +1,12 @@ { "parent": "block/block", "textures": { - "down": "templates:templates_special/down", - "up": "templates:templates_special/up", - "north": "templates:templates_special/north", - "south": "templates:templates_special/south", - "west": "templates:templates_special/west", - "east": "templates:templates_special/east" + "down": "reframedtemplates:templates_special/down", + "up": "reframedtemplates:templates_special/up", + "north": "reframedtemplates:templates_special/north", + "south": "reframedtemplates:templates_special/south", + "west": "reframedtemplates:templates_special/west", + "east": "reframedtemplates:templates_special/east" }, "elements": [ { diff --git a/src/main/resources/assets/templates/models/block/vertical_slab.json b/src/main/resources/assets/reframedtemplates/models/block/vertical_slab.json similarity index 79% rename from src/main/resources/assets/templates/models/block/vertical_slab.json rename to src/main/resources/assets/reframedtemplates/models/block/vertical_slab.json index 176f83d..3851ea5 100644 --- a/src/main/resources/assets/templates/models/block/vertical_slab.json +++ b/src/main/resources/assets/reframedtemplates/models/block/vertical_slab.json @@ -1,12 +1,12 @@ { "parent": "minecraft:block/block", "textures": { - "down": "templates:templates_special/down", - "up": "templates:templates_special/up", - "north": "templates:templates_special/north", - "south": "templates:templates_special/south", - "west": "templates:templates_special/west", - "east": "templates:templates_special/east" + "down": "reframedtemplates:templates_special/down", + "up": "reframedtemplates:templates_special/up", + "north": "reframedtemplates:templates_special/north", + "south": "reframedtemplates:templates_special/south", + "west": "reframedtemplates:templates_special/west", + "east": "reframedtemplates:templates_special/east" }, "elements": [ { diff --git a/src/main/resources/assets/templates/models/block/wall_side.json b/src/main/resources/assets/reframedtemplates/models/block/wall_side.json similarity index 55% rename from src/main/resources/assets/templates/models/block/wall_side.json rename to src/main/resources/assets/reframedtemplates/models/block/wall_side.json index b54d85d..dff3eb5 100644 --- a/src/main/resources/assets/templates/models/block/wall_side.json +++ b/src/main/resources/assets/reframedtemplates/models/block/wall_side.json @@ -1,11 +1,11 @@ { "textures": { - "down": "templates:templates_special/down", - "up": "templates:templates_special/up", - "north": "templates:templates_special/north", - "south": "templates:templates_special/south", - "west": "templates:templates_special/west", - "east": "templates:templates_special/east" + "down": "reframedtemplates:templates_special/down", + "up": "reframedtemplates:templates_special/up", + "north": "reframedtemplates:templates_special/north", + "south": "reframedtemplates:templates_special/south", + "west": "reframedtemplates:templates_special/west", + "east": "reframedtemplates:templates_special/east" }, "elements": [ { diff --git a/src/main/resources/assets/templates/models/block/wall_side_tall.json b/src/main/resources/assets/reframedtemplates/models/block/wall_side_tall.json similarity index 55% rename from src/main/resources/assets/templates/models/block/wall_side_tall.json rename to src/main/resources/assets/reframedtemplates/models/block/wall_side_tall.json index e9b63b1..a47c485 100644 --- a/src/main/resources/assets/templates/models/block/wall_side_tall.json +++ b/src/main/resources/assets/reframedtemplates/models/block/wall_side_tall.json @@ -1,11 +1,11 @@ { "textures": { - "down": "templates:templates_special/down", - "up": "templates:templates_special/up", - "north": "templates:templates_special/north", - "south": "templates:templates_special/south", - "west": "templates:templates_special/west", - "east": "templates:templates_special/east" + "down": "reframedtemplates:templates_special/down", + "up": "reframedtemplates:templates_special/up", + "north": "reframedtemplates:templates_special/north", + "south": "reframedtemplates:templates_special/south", + "west": "reframedtemplates:templates_special/west", + "east": "reframedtemplates:templates_special/east" }, "elements": [ { diff --git a/src/main/resources/assets/templates/models/item/candle.json b/src/main/resources/assets/reframedtemplates/models/item/candle.json similarity index 56% rename from src/main/resources/assets/templates/models/item/candle.json rename to src/main/resources/assets/reframedtemplates/models/item/candle.json index caf69ce..0d039fb 100644 --- a/src/main/resources/assets/templates/models/item/candle.json +++ b/src/main/resources/assets/reframedtemplates/models/item/candle.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "templates:item/candle" + "layer0": "reframedtemplates:item/candle" } } \ No newline at end of file diff --git a/src/main/resources/assets/templates/models/item/door.json b/src/main/resources/assets/reframedtemplates/models/item/door.json similarity index 57% rename from src/main/resources/assets/templates/models/item/door.json rename to src/main/resources/assets/reframedtemplates/models/item/door.json index f5985bf..f32b972 100644 --- a/src/main/resources/assets/templates/models/item/door.json +++ b/src/main/resources/assets/reframedtemplates/models/item/door.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "templates:item/door" + "layer0": "reframedtemplates:item/door" } } \ No newline at end of file diff --git a/src/main/resources/assets/templates/models/item/iron_door.json b/src/main/resources/assets/reframedtemplates/models/item/iron_door.json similarity index 57% rename from src/main/resources/assets/templates/models/item/iron_door.json rename to src/main/resources/assets/reframedtemplates/models/item/iron_door.json index f5985bf..f32b972 100644 --- a/src/main/resources/assets/templates/models/item/iron_door.json +++ b/src/main/resources/assets/reframedtemplates/models/item/iron_door.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "templates:item/door" + "layer0": "reframedtemplates:item/door" } } \ No newline at end of file diff --git a/src/main/resources/assets/templates/models/item/lever.json b/src/main/resources/assets/reframedtemplates/models/item/lever.json similarity index 57% rename from src/main/resources/assets/templates/models/item/lever.json rename to src/main/resources/assets/reframedtemplates/models/item/lever.json index 605bf93..189a51b 100644 --- a/src/main/resources/assets/templates/models/item/lever.json +++ b/src/main/resources/assets/reframedtemplates/models/item/lever.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "templates:item/lever" + "layer0": "reframedtemplates:item/lever" } } \ No newline at end of file diff --git a/src/main/resources/assets/templates/models/item/pane.json b/src/main/resources/assets/reframedtemplates/models/item/pane.json similarity index 53% rename from src/main/resources/assets/templates/models/item/pane.json rename to src/main/resources/assets/reframedtemplates/models/item/pane.json index bed7282..b97941a 100644 --- a/src/main/resources/assets/templates/models/item/pane.json +++ b/src/main/resources/assets/reframedtemplates/models/item/pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "minecraft:block/scaffolding_top" + "layer0": "reframedtemplates:block/framed_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/templates/textures/block/framed_accent_block.png b/src/main/resources/assets/reframedtemplates/textures/block/framed_accent_block.png similarity index 100% rename from src/main/resources/assets/templates/textures/block/framed_accent_block.png rename to src/main/resources/assets/reframedtemplates/textures/block/framed_accent_block.png diff --git a/src/main/resources/assets/templates/textures/block/framed_block.png b/src/main/resources/assets/reframedtemplates/textures/block/framed_block.png similarity index 100% rename from src/main/resources/assets/templates/textures/block/framed_block.png rename to src/main/resources/assets/reframedtemplates/textures/block/framed_block.png diff --git a/src/main/resources/assets/templates/textures/item/candle.png b/src/main/resources/assets/reframedtemplates/textures/item/candle.png similarity index 100% rename from src/main/resources/assets/templates/textures/item/candle.png rename to src/main/resources/assets/reframedtemplates/textures/item/candle.png diff --git a/src/main/resources/assets/templates/textures/item/door.png b/src/main/resources/assets/reframedtemplates/textures/item/door.png similarity index 100% rename from src/main/resources/assets/templates/textures/item/door.png rename to src/main/resources/assets/reframedtemplates/textures/item/door.png diff --git a/src/main/resources/assets/templates/textures/item/lever.png b/src/main/resources/assets/reframedtemplates/textures/item/lever.png similarity index 100% rename from src/main/resources/assets/templates/textures/item/lever.png rename to src/main/resources/assets/reframedtemplates/textures/item/lever.png diff --git a/src/main/resources/assets/templates/textures/templates_special/down.png b/src/main/resources/assets/reframedtemplates/textures/templates_special/down.png similarity index 100% rename from src/main/resources/assets/templates/textures/templates_special/down.png rename to src/main/resources/assets/reframedtemplates/textures/templates_special/down.png diff --git a/src/main/resources/assets/templates/textures/templates_special/east.png b/src/main/resources/assets/reframedtemplates/textures/templates_special/east.png similarity index 100% rename from src/main/resources/assets/templates/textures/templates_special/east.png rename to src/main/resources/assets/reframedtemplates/textures/templates_special/east.png diff --git a/src/main/resources/assets/templates/textures/templates_special/north.png b/src/main/resources/assets/reframedtemplates/textures/templates_special/north.png similarity index 100% rename from src/main/resources/assets/templates/textures/templates_special/north.png rename to src/main/resources/assets/reframedtemplates/textures/templates_special/north.png diff --git a/src/main/resources/assets/templates/textures/templates_special/south.png b/src/main/resources/assets/reframedtemplates/textures/templates_special/south.png similarity index 100% rename from src/main/resources/assets/templates/textures/templates_special/south.png rename to src/main/resources/assets/reframedtemplates/textures/templates_special/south.png diff --git a/src/main/resources/assets/templates/textures/templates_special/up.png b/src/main/resources/assets/reframedtemplates/textures/templates_special/up.png similarity index 100% rename from src/main/resources/assets/templates/textures/templates_special/up.png rename to src/main/resources/assets/reframedtemplates/textures/templates_special/up.png diff --git a/src/main/resources/assets/templates/textures/templates_special/west.png b/src/main/resources/assets/reframedtemplates/textures/templates_special/west.png similarity index 100% rename from src/main/resources/assets/templates/textures/templates_special/west.png rename to src/main/resources/assets/reframedtemplates/textures/templates_special/west.png diff --git a/src/main/resources/assets/templates/blockstates/candle.json b/src/main/resources/assets/templates/blockstates/candle.json deleted file mode 100644 index dab7d87..0000000 --- a/src/main/resources/assets/templates/blockstates/candle.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "candles=1": { - "model": "templates:one_candle_special" - }, - "candles=2": { - "model": "templates:two_candles_special" - }, - "candles=3": { - "model": "templates:three_candles_special" - }, - "candles=4": { - "model": "templates:four_candles_special" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/templates/blockstates/carpet.json b/src/main/resources/assets/templates/blockstates/carpet.json deleted file mode 100644 index 47953bf..0000000 --- a/src/main/resources/assets/templates/blockstates/carpet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "templates:carpet_special" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/templates/blockstates/cool_rivulet.json b/src/main/resources/assets/templates/blockstates/cool_rivulet.json deleted file mode 100644 index 9081177..0000000 --- a/src/main/resources/assets/templates/blockstates/cool_rivulet.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=east": { - "model": "templates:block/cool_rivulet", - "y": 270 - }, - "facing=north": { - "model": "templates:block/cool_rivulet", - "y": 180 - }, - "facing=south": { - "model": "templates:block/cool_rivulet" - }, - "facing=west": { - "model": "templates:block/cool_rivulet", - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/templates/blockstates/cube.json b/src/main/resources/assets/templates/blockstates/cube.json deleted file mode 100644 index d97fee7..0000000 --- a/src/main/resources/assets/templates/blockstates/cube.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "templates:cube_special" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/templates/blockstates/pressure_plate.json b/src/main/resources/assets/templates/blockstates/pressure_plate.json deleted file mode 100644 index cd28919..0000000 --- a/src/main/resources/assets/templates/blockstates/pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "templates:pressure_plate_up_special" - }, - "powered=true": { - "model": "templates:pressure_plate_down_special" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/templates/blockstates/slab.json b/src/main/resources/assets/templates/blockstates/slab.json deleted file mode 100644 index 4823b1f..0000000 --- a/src/main/resources/assets/templates/blockstates/slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "templates:slab_bottom_special" - }, - "type=double": { - "model": "templates:cube_special" - }, - "type=top": { - "model": "templates:slab_top_special" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/templates/blockstates/vertical_slab.json b/src/main/resources/assets/templates/blockstates/vertical_slab.json deleted file mode 100644 index dca471a..0000000 --- a/src/main/resources/assets/templates/blockstates/vertical_slab.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "variants": { - "type=bottom,affinity=x": { - "model": "templates:vertical_slab_special", - "y": 270 - }, - "type=double,affinity=x": { - "model": "templates:cube_special" - }, - "type=top,affinity=x": { - "model": "templates:vertical_slab_special", - "y": 90 - }, - "type=bottom,affinity=z": { - "model": "templates:vertical_slab_special" - }, - "type=double,affinity=z": { - "model": "templates:cube_special" - }, - "type=top,affinity=z": { - "model": "templates:vertical_slab_special", - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/templates/lang/en_us.json b/src/main/resources/assets/templates/lang/en_us.json deleted file mode 100644 index b5282b1..0000000 --- a/src/main/resources/assets/templates/lang/en_us.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "itemGroup.templates.tab": "Templates", - - "block.templates.button": "Button Template", - "block.templates.candle": "Candle Template", - "block.templates.carpet": "Carpet Template", - "block.templates.cube": "Cube Template", - "block.templates.door": "Door Template", - "block.templates.fence": "Fence Template", - "block.templates.fence_gate": "Fence Gate Template", - "block.templates.iron_door": "Iron Door Template", - "block.templates.iron_trapdoor": "Iron Trapdoor Template", - "block.templates.lever": "Lever Template", - "block.templates.pane": "Pane Template", - "block.templates.post": "Post Template", - "block.templates.pressure_plate": "Pressure Plate Template", - "block.templates.slope": "Slope Template", - "block.templates.tiny_slope": "Tiny Slope Template", - "block.templates.slab": "Slab Template", - "block.templates.stairs": "Stairs Template", - "block.templates.trapdoor": "Trapdoor Template", - "block.templates.vertical_slab": "Vertical Slab Template", - "block.templates.wall": "Wall Template", - - "block.templates.cool_rivulet": "cool rivulet" -} \ No newline at end of file diff --git a/src/main/resources/assets/templates/models/block/cool_rivulet.json b/src/main/resources/assets/templates/models/block/cool_rivulet.json deleted file mode 100644 index 774c143..0000000 --- a/src/main/resources/assets/templates/models/block/cool_rivulet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "templates:block/cool_rivulet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/templates/models/item/cool_rivulet.json b/src/main/resources/assets/templates/models/item/cool_rivulet.json deleted file mode 100644 index a6ef2fe..0000000 --- a/src/main/resources/assets/templates/models/item/cool_rivulet.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "templates:block/cool_rivulet" -} \ No newline at end of file diff --git a/src/main/resources/assets/templates/textures/block/cool_rivulet.png b/src/main/resources/assets/templates/textures/block/cool_rivulet.png deleted file mode 100644 index d29410dbbd3ee233a754e1d9a4f5c2fcace17928..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 752 zcmVeK~Z@;Kz>1s*Mif+kMprUgB zou`)_8VtHe6VUMB`!78Z*@Dka-~Tx9{m(-P-@{q4=3kbaM&3lUTklMr^0Id+{qCo#nW&8QOvAj@GE!yEzzi(XJY1Q>CZ zgy2vBNv%J{!1zTT(~&$6$?`GLi4bHt$Pw5qM-FbV8YE2BLW#Mj#d2A*FrGHB}es= z5FQH91j)zUkJAw#IqEwA%@LcyiI5IafU^z&Ib!WntWqFxVzVM6p*A7GN(f7WB&8g{ z>i}fSL5Y!&V{j!{inAfiU_us=${minecraft_version}", diff --git a/src/main/resources/templates.mixins.json b/src/main/resources/reframedtemplates.mixins.json similarity index 91% rename from src/main/resources/templates.mixins.json rename to src/main/resources/reframedtemplates.mixins.json index a7cd907..26045a3 100644 --- a/src/main/resources/templates.mixins.json +++ b/src/main/resources/reframedtemplates.mixins.json @@ -15,6 +15,5 @@ ], "injectors": { "defaultRequire": 1 - }, - "refmap": "templates.refmap.json" + } }