diff --git a/src/main/java/io/github/cottonmc/templates/TemplatesClient.java b/src/main/java/io/github/cottonmc/templates/TemplatesClient.java index fa2551b..76899ef 100644 --- a/src/main/java/io/github/cottonmc/templates/TemplatesClient.java +++ b/src/main/java/io/github/cottonmc/templates/TemplatesClient.java @@ -134,14 +134,11 @@ public class TemplatesClient implements ClientModInitializer { //item model assignments (in lieu of models/item/___.json) provider.assignItemModel(Templates.id("button_inventory_special") , Templates.BUTTON); - provider.assignItemModel(Templates.id("one_candle_special") , Templates.CANDLE); //TODO vanilla uses its own item model provider.assignItemModel(Templates.id("carpet_special") , Templates.CARPET); provider.assignItemModel(Templates.id("cube_special") , Templates.CUBE); provider.assignItemModel(Templates.id("fence_inventory_special") , Templates.FENCE); provider.assignItemModel(Templates.id("fence_gate_special") , Templates.FENCE_GATE); provider.assignItemModel(Templates.id("trapdoor_bottom_special") , Templates.IRON_TRAPDOOR); - provider.assignItemModel(Templates.id("lever_special") , Templates.LEVER); //TODO vanilla uses its own item model - //provider.assignItemModel(Templates.id("glass_pane_side_special"), Templates.PANE); //Done with a regular json model actually provider.assignItemModel(Templates.id("fence_post_inventory_special") , Templates.POST); provider.assignItemModel(Templates.id("pressure_plate_up_special") , Templates.PRESSURE_PLATE); provider.assignItemModel(Templates.id("slab_bottom_special") , Templates.SLAB); diff --git a/src/main/resources/assets/templates/models/item/candle.json b/src/main/resources/assets/templates/models/item/candle.json new file mode 100644 index 0000000..caf69ce --- /dev/null +++ b/src/main/resources/assets/templates/models/item/candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "templates: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/templates/models/item/door.json new file mode 100644 index 0000000..f5985bf --- /dev/null +++ b/src/main/resources/assets/templates/models/item/door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "templates: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/templates/models/item/lever.json new file mode 100644 index 0000000..605bf93 --- /dev/null +++ b/src/main/resources/assets/templates/models/item/lever.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "templates: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/templates/models/item/pane.json index d51ecf4..bed7282 100644 --- a/src/main/resources/assets/templates/models/item/pane.json +++ b/src/main/resources/assets/templates/models/item/pane.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "minecraft:block/scaffolding_top" } diff --git a/src/main/resources/assets/templates/textures/item/candle.png b/src/main/resources/assets/templates/textures/item/candle.png new file mode 100644 index 0000000..c76d54c Binary files /dev/null and b/src/main/resources/assets/templates/textures/item/candle.png differ diff --git a/src/main/resources/assets/templates/textures/item/door.png b/src/main/resources/assets/templates/textures/item/door.png new file mode 100644 index 0000000..39af823 Binary files /dev/null and b/src/main/resources/assets/templates/textures/item/door.png differ diff --git a/src/main/resources/assets/templates/textures/item/lever.png b/src/main/resources/assets/templates/textures/item/lever.png new file mode 100644 index 0000000..a9a49b4 Binary files /dev/null and b/src/main/resources/assets/templates/textures/item/lever.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json index d476aea..83d36fc 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -5,6 +5,7 @@ "templates:candle", "templates:carpet", "templates:cube", + "templates:door", "templates:fence", "templates:fence_gate", "templates:lever", diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json b/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json new file mode 100644 index 0000000..2e27c35 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "templates:door" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/templates/advancements/recipes/decorations/templates.json b/src/main/resources/data/templates/advancements/recipes/decorations/templates.json index e933f3a..0e6eb3d 100644 --- a/src/main/resources/data/templates/advancements/recipes/decorations/templates.json +++ b/src/main/resources/data/templates/advancements/recipes/decorations/templates.json @@ -6,6 +6,7 @@ "templates:candle", "templates:carpet", "templates:cube", + "templates:door", "templates:fence", "templates:fence_gate", "templates:iron_trapdoor", diff --git a/src/main/resources/data/templates/loot_tables/blocks/door.json b/src/main/resources/data/templates/loot_tables/blocks/door.json new file mode 100644 index 0000000..50dee74 --- /dev/null +++ b/src/main/resources/data/templates/loot_tables/blocks/door.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "templates:door", + "conditions": [ + { + "block": "templates:door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ] + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/templates/recipes/door.json b/src/main/resources/data/templates/recipes/door.json new file mode 100644 index 0000000..d729514 --- /dev/null +++ b/src/main/resources/data/templates/recipes/door.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "II ", + "II~", + "II " + ], + "key": { + "I": { + "item": "minecraft:bamboo" + }, + "~": { + "item": "minecraft:string" + } + }, + "result": { + "item": "templates:door", + "count": 2 + }, + "group": "templates" +} \ No newline at end of file