diff --git a/changelog.md b/changelog.md index 9fed2d7..eb89771 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ # Changelog +## [Fix] 1.13.2 - 03.09.2022 - 1 + +* Fixed wrong ressources ## [Update] 01.31.2022 - 1 diff --git a/src/main/resources/assets/gircredstone/blockstates/acceptor.json b/src/main/resources/assets/gircredstone/blockstates/acceptor.json index 8c30378..1800e68 100644 --- a/src/main/resources/assets/gircredstone/blockstates/acceptor.json +++ b/src/main/resources/assets/gircredstone/blockstates/acceptor.json @@ -1 +1,10 @@ -{"variants": {"power=false": {"model": "gircredstone:acceptor_off"}, "power=true": {"model": "gircredstone:acceptor_on"}}} \ No newline at end of file +{ + "variants": { + "power=false": { + "model": "gircredstone:block/acceptor_off" + }, + "power=true": { + "model": "gircredstone:block/acceptor_on" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gircredstone/blockstates/emitter.json b/src/main/resources/assets/gircredstone/blockstates/emitter.json index 3c9fb64..5e82308 100644 --- a/src/main/resources/assets/gircredstone/blockstates/emitter.json +++ b/src/main/resources/assets/gircredstone/blockstates/emitter.json @@ -1 +1,7 @@ -{"variants": {"normal": {"model": "gircredstone:emitter"}}} \ No newline at end of file +{ + "variants": { + "": { + "model": "gircredstone:block/emitter" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gircredstone/recipes/acceptor.json b/src/main/resources/assets/gircredstone/recipes/acceptor.json deleted file mode 100644 index 0ac39a6..0000000 --- a/src/main/resources/assets/gircredstone/recipes/acceptor.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "minecraft:crafting_shaped", "pattern": ["IiI", "XYX", "IZI"], "key": {"I": {"item": "minecraft:redstone_block"}, "i": {"item": "minecraft:redstone_torch"}, "X": {"item": "minecraft:concrete", "data": 0}, "Y": {"item": "minecraft:obsidian"}, "Z": {"item": "minecraft:diamond"}}, "result": {"item": "gircredstone:acceptor"}} \ No newline at end of file diff --git a/src/main/resources/assets/gircredstone/recipes/emitter.json b/src/main/resources/assets/gircredstone/recipes/emitter.json deleted file mode 100644 index 51ad201..0000000 --- a/src/main/resources/assets/gircredstone/recipes/emitter.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "minecraft:crafting_shaped", "pattern": ["IiI", "XYX", "IZI"], "key": {"I": {"item": "minecraft:redstone_block"}, "i": {"item": "minecraft:redstone"}, "X": {"item": "minecraft:concrete", "data": 0}, "Y": {"item": "minecraft:obsidian"}, "Z": {"item": "minecraft:diamond"}}, "result": {"item": "gircredstone:emitter"}} \ No newline at end of file diff --git a/src/main/resources/assets/gircredstone/recipes/linker.json b/src/main/resources/assets/gircredstone/recipes/linker.json deleted file mode 100644 index 70d218c..0000000 --- a/src/main/resources/assets/gircredstone/recipes/linker.json +++ /dev/null @@ -1 +0,0 @@ -{"type": "minecraft:crafting_shaped", "pattern": [" ", " I ", " i "], "key": {"I": {"item": "minecraft:quartz"}, "i": {"item": "minecraft:redstone_torch"}}, "result": {"item": "gircredstone:linker"}} \ No newline at end of file diff --git a/src/main/resources/data/gircredstone/recipes/acceptor.json b/src/main/resources/data/gircredstone/recipes/acceptor.json new file mode 100644 index 0000000..199ab25 --- /dev/null +++ b/src/main/resources/data/gircredstone/recipes/acceptor.json @@ -0,0 +1,28 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "IiI", + "XYX", + "IZI" + ], + "key": { + "I": { + "item": "minecraft:redstone_block" + }, + "i": { + "item": "minecraft:redstone_torch" + }, + "X": { + "item": "minecraft:white_concrete" + }, + "Y": { + "item": "minecraft:obsidian" + }, + "Z": { + "item": "minecraft:diamond" + } + }, + "result": { + "item": "gircredstone:acceptor" + } +} \ No newline at end of file diff --git a/src/main/resources/data/gircredstone/recipes/emitter.json b/src/main/resources/data/gircredstone/recipes/emitter.json new file mode 100644 index 0000000..ce7f2dc --- /dev/null +++ b/src/main/resources/data/gircredstone/recipes/emitter.json @@ -0,0 +1,28 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "IiI", + "XYX", + "IZI" + ], + "key": { + "I": { + "item": "minecraft:redstone_block" + }, + "i": { + "item": "minecraft:redstone" + }, + "X": { + "item": "minecraft:white_concrete" + }, + "Y": { + "item": "minecraft:obsidian" + }, + "Z": { + "item": "minecraft:diamond" + } + }, + "result": { + "item": "gircredstone:emitter" + } +} \ No newline at end of file diff --git a/src/main/resources/data/gircredstone/recipes/linker.json b/src/main/resources/data/gircredstone/recipes/linker.json new file mode 100644 index 0000000..3307d4f --- /dev/null +++ b/src/main/resources/data/gircredstone/recipes/linker.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " I ", + " i " + ], + "key": { + "I": { + "item": "minecraft:quartz" + }, + "i": { + "item": "minecraft:redstone_torch" + } + }, + "result": { + "item": "gircredstone:linker" + } +} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 4018267..6ef67fe 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,6 @@ { "pack": { "description": "examplemod resources", - "pack_format": 3, - "_comment": "A pack_format of 3 should be used starting with Minecraft 1.11. All resources, including language files, should be lowercase (eg: en_us.lang). A pack_format of 2 will load your mod resources with LegacyV2Adapter, which requires language files to have uppercase letters (eg: en_US.lang)." - } + "pack_format": 4 + } }