diff --git a/src/main/java/eu/midnightdust/betterbeds/BetterBedsClient.java b/src/main/java/eu/midnightdust/betterbeds/BetterBedsClient.java index 51634ff..f4493ca 100755 --- a/src/main/java/eu/midnightdust/betterbeds/BetterBedsClient.java +++ b/src/main/java/eu/midnightdust/betterbeds/BetterBedsClient.java @@ -12,6 +12,7 @@ public class BetterBedsClient implements ClientModInitializer { FabricLoader.getInstance().getModContainer("betterbeds").ifPresent(modContainer -> { ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("betterbeds:fancybeds"), modContainer, ResourcePackActivationType.NORMAL); ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("betterbeds:connectedbeds"), modContainer, ResourcePackActivationType.NORMAL); + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("betterbeds:fancyconnectedbeds"), modContainer, ResourcePackActivationType.NORMAL); }); } } diff --git a/src/main/resources/assets/minecraft/models/block/template_bed_foot.json b/src/main/resources/assets/minecraft/models/block/template_bed_foot.json index 13d829f..ba56e28 100755 --- a/src/main/resources/assets/minecraft/models/block/template_bed_foot.json +++ b/src/main/resources/assets/minecraft/models/block/template_bed_foot.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "ambientocclusion": false, "texture_size": [64, 64], "textures": { "particle": "block/oak_planks" @@ -42,4 +41,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/minecraft/models/block/template_bed_head.json b/src/main/resources/assets/minecraft/models/block/template_bed_head.json index 7d032a4..c58f67a 100755 --- a/src/main/resources/assets/minecraft/models/block/template_bed_head.json +++ b/src/main/resources/assets/minecraft/models/block/template_bed_head.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "ambientocclusion": false, "texture_size": [64, 64], "textures": { "particle": "block/oak_planks" @@ -43,4 +42,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/block/template_bed_foot.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/block/template_bed_foot.json deleted file mode 100644 index 5abafb6..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/block/template_bed_foot.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "credit": "made by Motschen", - "texture_size": [64, 64], - "textures": { - "0": "entity/bed/lime", - "particle": "block/oak_planks" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [3, 3, 3], - "faces": { - "north": {"uv": [12.5, 3.75, 13.25, 4.5], "texture": "#0", "cullface": "west"}, - "east": {"uv": [14.75, 3.75, 15.5, 4.5], "texture": "#0", "cullface": "west"}, - "south": {"uv": [14, 3.75, 14.75, 4.5], "texture": "#0", "cullface": "west"}, - "west": {"uv": [13.25, 3.75, 14, 4.5], "texture": "#0", "cullface": "west"}, - "down": {"uv": [14, 3, 14.75, 3.75], "texture": "#0", "cullface": "west"} - } - }, - { - "from": [13, 0, 0], - "to": [16, 3, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 8]}, - "faces": { - "north": {"uv": [12.5, 0.75, 13.25, 1.5], "texture": "#0", "cullface": "east"}, - "east": {"uv": [14.75, 0.75, 15.5, 1.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [14, 0.75, 14.75, 1.5], "texture": "#0", "cullface": "east"}, - "west": {"uv": [13.25, 0.75, 14, 1.5], "texture": "#0", "cullface": "east"}, - "down": {"uv": [14, 0, 14.75, 0.75], "texture": "#0", "cullface": "east"} - } - }, - { - "from": [0, 3, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [5.5, 5.5, 9.5, 7], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 7, 1.5, 11], "rotation": 270, "texture": "#0"}, - "west": {"uv": [5.5, 7, 7, 11], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 7, 5.5, 11], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json deleted file mode 100644 index 950c4da..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "credit": "made by Motschen", - "texture_size": [64, 64], - "textures": { - "0": "entity/bed/lime", - "particle": "block/oak_planks" - }, - "elements": [ - { - "from": [0, 0, 13], - "to": [3, 3, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 21]}, - "faces": { - "north": {"uv": [12.5, 5.25, 13.25, 6], "texture": "#0", "cullface": "west"}, - "east": {"uv": [14.75, 5.25, 15.5, 6], "texture": "#0", "cullface": "west"}, - "south": {"uv": [14, 5.25, 14.75, 6], "texture": "#0", "cullface": "west"}, - "west": {"uv": [13.25, 5.25, 14, 6], "texture": "#0", "cullface": "west"}, - "down": {"uv": [14, 4.5, 14.75, 5.25], "texture": "#0", "cullface": "west"} - } - }, - { - "from": [13, 0, 13], - "to": [16, 3, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 21]}, - "faces": { - "north": {"uv": [12.5, 2.25, 13.25, 3], "texture": "#0", "cullface": "east"}, - "east": {"uv": [14.75, 2.25, 15.5, 3], "texture": "#0", "cullface": "east"}, - "south": {"uv": [14, 2.25, 14.75, 3], "texture": "#0", "cullface": "east"}, - "west": {"uv": [13.25, 2.25, 14, 3], "texture": "#0", "cullface": "east"}, - "down": {"uv": [14, 1.5, 14.75, 2.25], "texture": "#0", "cullface": "east"} - } - }, - { - "from": [0, 3, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "east": {"uv": [0, 1.5, 1.5, 5.5], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1.5, 0, 5.5, 1.5], "rotation": 180, "texture": "#0"}, - "west": {"uv": [5.5, 1.5, 7, 5.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 1.5, 5.5, 5.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/bed.json deleted file mode 100644 index c41de41..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/bed.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "credit": "made by Motschen", - "texture_size": [64, 64], - "textures": { - "0": "entity/bed/lime", - "particle": "block/oak_planks" - }, - "elements": [ - { - "from": [0, 0, -8], - "to": [3, 3, -5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0]}, - "faces": { - "north": {"uv": [12.5, 3.75, 13.25, 4.5], "texture": "#0"}, - "east": {"uv": [14.75, 3.75, 15.5, 4.5], "texture": "#0"}, - "south": {"uv": [14, 3.75, 14.75, 4.5], "texture": "#0"}, - "west": {"uv": [13.25, 3.75, 14, 4.5], "texture": "#0"}, - "down": {"uv": [14, 3, 14.75, 3.75], "texture": "#0"} - } - }, - { - "from": [13, 0, -8], - "to": [16, 3, -5], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 0]}, - "faces": { - "north": {"uv": [12.5, 0.75, 13.25, 1.5], "texture": "#0"}, - "east": {"uv": [14.75, 0.75, 15.5, 1.5], "texture": "#0"}, - "south": {"uv": [14, 0.75, 14.75, 1.5], "texture": "#0"}, - "west": {"uv": [13.25, 0.75, 14, 1.5], "texture": "#0"}, - "down": {"uv": [14, 0, 14.75, 0.75], "texture": "#0"} - } - }, - { - "from": [0, 3, -8], - "to": [16, 9, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 0]}, - "faces": { - "north": {"uv": [5.5, 5.5, 9.5, 7], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 7, 1.5, 11], "rotation": 270, "texture": "#0"}, - "west": {"uv": [5.5, 7, 7, 11], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 7, 5.5, 11], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} - } - }, - { - "from": [0, 0, 21], - "to": [3, 3, 24], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 29]}, - "faces": { - "north": {"uv": [12.5, 5.25, 13.25, 6], "texture": "#0"}, - "east": {"uv": [14.75, 5.25, 15.5, 6], "texture": "#0"}, - "south": {"uv": [14, 5.25, 14.75, 6], "texture": "#0"}, - "west": {"uv": [13.25, 5.25, 14, 6], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "down": {"uv": [14, 4.5, 14.75, 5.25], "texture": "#0"} - } - }, - { - "from": [13, 0, 21], - "to": [16, 3, 24], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 29]}, - "faces": { - "north": {"uv": [12.5, 2.25, 13.25, 3], "texture": "#0"}, - "east": {"uv": [14.75, 2.25, 15.5, 3], "texture": "#0"}, - "south": {"uv": [14, 2.25, 14.75, 3], "texture": "#0"}, - "west": {"uv": [13.25, 2.25, 14, 3], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "down": {"uv": [14, 1.5, 14.75, 2.25], "texture": "#0"} - } - }, - { - "from": [0, 3, 8], - "to": [16, 9, 24], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 16]}, - "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "east": {"uv": [0, 1.5, 1.5, 5.5], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1.5, 0, 5.5, 1.5], "rotation": 180, "texture": "#0"}, - "west": {"uv": [5.5, 1.5, 7, 5.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 1.5, 5.5, 5.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [30, 160, 0], - "translation": [0, 3, -2], - "scale": [0.23, 0.23, 0.23] - }, - "firstperson_righthand": { - "rotation": [30, 160, 0], - "translation": [0, 3, 0], - "scale": [0.375, 0.375, 0.375] - }, - "ground": { - "translation": [0, 1, 2], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 160, 0], - "translation": [0.25, 1.5, 0], - "scale": [0.5325, 0.5325, 0.5325] - }, - "head": { - "rotation": [0, 180, 0], - "translation": [0, 10, -8] - }, - "fixed": { - "rotation": [270, 0, 0], - "translation": [0, 4, -2], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, 2, - { - "name": "bed_head", - "origin": [8, 8, 8], - "children": [3, 4, 5] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/black_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/black_bed.json deleted file mode 100644 index 467ae43..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/black_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/black" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/blue_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/blue_bed.json deleted file mode 100644 index 4a92940..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/blue_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/blue" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/brown_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/brown_bed.json deleted file mode 100644 index 19c4064..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/brown_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/brown" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/cyan_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/cyan_bed.json deleted file mode 100644 index fa61dfa..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/cyan_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/cyan" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/gray_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/gray_bed.json deleted file mode 100644 index dd14d31..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/gray_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/gray" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/green_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/green_bed.json deleted file mode 100644 index b6827c0..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/green_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/green" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/light_blue_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/light_blue_bed.json deleted file mode 100644 index ec1259e..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/light_blue_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/light_blue" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/light_gray_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/light_gray_bed.json deleted file mode 100644 index bc4cd46..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/light_gray_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/light_gray" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/lime_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/lime_bed.json deleted file mode 100644 index aa55b5f..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/lime_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/lime" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/magenta_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/magenta_bed.json deleted file mode 100644 index 13c2098..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/magenta_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/magenta" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/orange_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/orange_bed.json deleted file mode 100644 index e5106de..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/orange_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/orange" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/pink_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/pink_bed.json deleted file mode 100644 index 0e1fcb9..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/pink_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/pink" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/purple_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/purple_bed.json deleted file mode 100644 index 7dbd513..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/purple_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/purple" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/red_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/red_bed.json deleted file mode 100644 index 6a7b1ae..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/red_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/red" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/white_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/white_bed.json deleted file mode 100644 index 1eb3819..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/white_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/white" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/yellow_bed.json b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/yellow_bed.json deleted file mode 100644 index c5bf97d..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/assets/minecraft/models/item/yellow_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/bed", - "textures": { - "0": "entity/bed/yellow" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/license.txt b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/license.txt deleted file mode 100644 index 6968976..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/license.txt +++ /dev/null @@ -1,10 +0,0 @@ -The MIT License -Copyright © 2019 Motschen - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/pack.mcmeta b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/pack.mcmeta deleted file mode 100644 index 4b95870..0000000 --- a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 7, - "description": "§2Changes the renderer of the bed to use block models instead of a block entity renderer ! (with smooth lightning))" - } -} diff --git a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/pack.png b/src/main/resources/resourcepacks/betterbedswithsmoothlightning/pack.png deleted file mode 100644 index f0d916e..0000000 Binary files a/src/main/resources/resourcepacks/betterbedswithsmoothlightning/pack.png and /dev/null differ diff --git a/src/main/resources/resourcepacks/connectedbeds/assets/minecraft/models/block/template_bed_foot.json b/src/main/resources/resourcepacks/connectedbeds/assets/minecraft/models/block/template_bed_foot.json index 1bbf650..5b355d4 100755 --- a/src/main/resources/resourcepacks/connectedbeds/assets/minecraft/models/block/template_bed_foot.json +++ b/src/main/resources/resourcepacks/connectedbeds/assets/minecraft/models/block/template_bed_foot.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "ambientocclusion": false, "texture_size": [64, 64], "textures": { "particle": "block/oak_planks" @@ -42,4 +41,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/resourcepacks/connectedbeds/assets/minecraft/models/block/template_bed_head.json b/src/main/resources/resourcepacks/connectedbeds/assets/minecraft/models/block/template_bed_head.json index 0cbf073..01712cf 100755 --- a/src/main/resources/resourcepacks/connectedbeds/assets/minecraft/models/block/template_bed_head.json +++ b/src/main/resources/resourcepacks/connectedbeds/assets/minecraft/models/block/template_bed_head.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "ambientocclusion": false, "texture_size": [64, 64], "textures": { "particle": "block/oak_planks" @@ -43,4 +42,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/resourcepacks/connectedbeds/license.txt b/src/main/resources/resourcepacks/connectedbeds/license.txt deleted file mode 100755 index 7ee5eac..0000000 --- a/src/main/resources/resourcepacks/connectedbeds/license.txt +++ /dev/null @@ -1,10 +0,0 @@ -The MIT License -Copyright © 2019 Motschen - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_foot.json b/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_foot.json deleted file mode 100644 index 5abafb6..0000000 --- a/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_foot.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "credit": "made by Motschen", - "texture_size": [64, 64], - "textures": { - "0": "entity/bed/lime", - "particle": "block/oak_planks" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [3, 3, 3], - "faces": { - "north": {"uv": [12.5, 3.75, 13.25, 4.5], "texture": "#0", "cullface": "west"}, - "east": {"uv": [14.75, 3.75, 15.5, 4.5], "texture": "#0", "cullface": "west"}, - "south": {"uv": [14, 3.75, 14.75, 4.5], "texture": "#0", "cullface": "west"}, - "west": {"uv": [13.25, 3.75, 14, 4.5], "texture": "#0", "cullface": "west"}, - "down": {"uv": [14, 3, 14.75, 3.75], "texture": "#0", "cullface": "west"} - } - }, - { - "from": [13, 0, 0], - "to": [16, 3, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 8]}, - "faces": { - "north": {"uv": [12.5, 0.75, 13.25, 1.5], "texture": "#0", "cullface": "east"}, - "east": {"uv": [14.75, 0.75, 15.5, 1.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [14, 0.75, 14.75, 1.5], "texture": "#0", "cullface": "east"}, - "west": {"uv": [13.25, 0.75, 14, 1.5], "texture": "#0", "cullface": "east"}, - "down": {"uv": [14, 0, 14.75, 0.75], "texture": "#0", "cullface": "east"} - } - }, - { - "from": [0, 3, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [5.5, 5.5, 9.5, 7], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 7, 1.5, 11], "rotation": 270, "texture": "#0"}, - "west": {"uv": [5.5, 7, 7, 11], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 7, 5.5, 11], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json b/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json deleted file mode 100644 index 950c4da..0000000 --- a/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "credit": "made by Motschen", - "texture_size": [64, 64], - "textures": { - "0": "entity/bed/lime", - "particle": "block/oak_planks" - }, - "elements": [ - { - "from": [0, 0, 13], - "to": [3, 3, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 21]}, - "faces": { - "north": {"uv": [12.5, 5.25, 13.25, 6], "texture": "#0", "cullface": "west"}, - "east": {"uv": [14.75, 5.25, 15.5, 6], "texture": "#0", "cullface": "west"}, - "south": {"uv": [14, 5.25, 14.75, 6], "texture": "#0", "cullface": "west"}, - "west": {"uv": [13.25, 5.25, 14, 6], "texture": "#0", "cullface": "west"}, - "down": {"uv": [14, 4.5, 14.75, 5.25], "texture": "#0", "cullface": "west"} - } - }, - { - "from": [13, 0, 13], - "to": [16, 3, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 21]}, - "faces": { - "north": {"uv": [12.5, 2.25, 13.25, 3], "texture": "#0", "cullface": "east"}, - "east": {"uv": [14.75, 2.25, 15.5, 3], "texture": "#0", "cullface": "east"}, - "south": {"uv": [14, 2.25, 14.75, 3], "texture": "#0", "cullface": "east"}, - "west": {"uv": [13.25, 2.25, 14, 3], "texture": "#0", "cullface": "east"}, - "down": {"uv": [14, 1.5, 14.75, 2.25], "texture": "#0", "cullface": "east"} - } - }, - { - "from": [0, 3, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "east": {"uv": [0, 1.5, 1.5, 5.5], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1.5, 0, 5.5, 1.5], "rotation": 180, "texture": "#0"}, - "west": {"uv": [5.5, 1.5, 7, 5.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 1.5, 5.5, 5.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/license.txt b/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/license.txt deleted file mode 100644 index 6968976..0000000 --- a/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/license.txt +++ /dev/null @@ -1,10 +0,0 @@ -The MIT License -Copyright © 2019 Motschen - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/pack.mcmeta b/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/pack.mcmeta deleted file mode 100644 index 721f830..0000000 --- a/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 7, - "description": "§2Allows beds to connect <3 (with smooth lightning)" - } -} diff --git a/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/pack.png b/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/pack.png deleted file mode 100644 index cdd926c..0000000 Binary files a/src/main/resources/resourcepacks/connectedbedswithsmoothlightning/pack.png and /dev/null differ diff --git a/src/main/resources/resourcepacks/fancybeds/assets/minecraft/models/block/template_bed_head.json b/src/main/resources/resourcepacks/fancybeds/assets/minecraft/models/block/template_bed_head.json index 5434cb7..00e13f7 100755 --- a/src/main/resources/resourcepacks/fancybeds/assets/minecraft/models/block/template_bed_head.json +++ b/src/main/resources/resourcepacks/fancybeds/assets/minecraft/models/block/template_bed_head.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "ambientocclusion": false, "texture_size": [64, 64], "textures": { "particle": "block/oak_planks" @@ -67,4 +66,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/resourcepacks/fancybeds/license.txt b/src/main/resources/resourcepacks/fancybeds/license.txt deleted file mode 100755 index 7ee5eac..0000000 --- a/src/main/resources/resourcepacks/fancybeds/license.txt +++ /dev/null @@ -1,10 +0,0 @@ -The MIT License -Copyright © 2019 Motschen - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/src/main/resources/resourcepacks/fancybeds/pack.mcmeta b/src/main/resources/resourcepacks/fancybeds/pack.mcmeta index 48a0d42..5377d8d 100755 --- a/src/main/resources/resourcepacks/fancybeds/pack.mcmeta +++ b/src/main/resources/resourcepacks/fancybeds/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 12, - "description": "§2Makes beds look more fancy" + "description": "§2Makes beds look fancier" } } diff --git a/src/main/resources/resourcepacks/fancybedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json b/src/main/resources/resourcepacks/fancybedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json deleted file mode 100644 index 7792fa3..0000000 --- a/src/main/resources/resourcepacks/fancybedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "credit": "made by Motschen", - "texture_size": [64, 64], - "textures": { - "0": "entity/bed/lime", - "particle": "block/oak_planks" - }, - "elements": [ - { - "from": [0, 0, 13], - "to": [3, 3, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 21]}, - "faces": { - "north": {"uv": [12.5, 5.25, 13.25, 6], "texture": "#0"}, - "east": {"uv": [14.75, 5.25, 15.5, 6], "texture": "#0"}, - "south": {"uv": [14, 5.25, 14.75, 6], "texture": "#0"}, - "west": {"uv": [13.25, 5.25, 14, 6], "texture": "#0"}, - "down": {"uv": [14, 4.5, 14.75, 5.25], "texture": "#0"} - } - }, - { - "from": [13, 0, 13], - "to": [16, 3, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 21]}, - "faces": { - "north": {"uv": [12.5, 2.25, 13.25, 3], "texture": "#0"}, - "east": {"uv": [14.75, 2.25, 15.5, 3], "texture": "#0"}, - "south": {"uv": [14, 2.25, 14.75, 3], "texture": "#0"}, - "west": {"uv": [13.25, 2.25, 14, 3], "texture": "#0"}, - "down": {"uv": [14, 1.5, 14.75, 2.25], "texture": "#0"} - } - }, - { - "from": [0, 3, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "east": {"uv": [0, 1.5, 1.5, 5.5], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1.5, 0, 5.5, 1.5], "rotation": 180, "texture": "#0"}, - "west": {"uv": [5.5, 1.5, 7, 5.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 1.5, 5.5, 5.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} - } - }, - { - "from": [0, 9, 8], - "to": [16, 10, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 16]}, - "faces": { - "north": {"uv": [1.5, 3.25, 5.5, 3.5], "texture": "#0"}, - "east": {"uv": [1.5, 1.5, 1.75, 3.5], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1.5, 1.5, 5.5, 1.75], "texture": "#0"}, - "west": {"uv": [5.25, 1.5, 5.5, 3.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 1.5, 5.5, 3.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 4, 2], "texture": "#0"} - } - }, - { - "from": [1, 10, 9], - "to": [15, 11, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 16]}, - "faces": { - "north": {"uv": [1.75, 3.25, 5.25, 3.5], "texture": "#0"}, - "east": {"uv": [1.75, 1.75, 2, 3.25], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1.75, 0.5, 5.25, 0.75], "texture": "#0"}, - "west": {"uv": [5, 1.75, 5.25, 3.25], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.75, 1.75, 5.25, 3.25], "texture": "#0"}, - "down": {"uv": [0, 0, 3.5, 1.5], "texture": "#0"} - } - } - ] -} diff --git a/src/main/resources/resourcepacks/fancybedswithsmoothlightning/license.txt b/src/main/resources/resourcepacks/fancybedswithsmoothlightning/license.txt deleted file mode 100644 index 6968976..0000000 --- a/src/main/resources/resourcepacks/fancybedswithsmoothlightning/license.txt +++ /dev/null @@ -1,10 +0,0 @@ -The MIT License -Copyright © 2019 Motschen - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/src/main/resources/resourcepacks/fancybedswithsmoothlightning/pack.mcmeta b/src/main/resources/resourcepacks/fancybedswithsmoothlightning/pack.mcmeta deleted file mode 100644 index abef578..0000000 --- a/src/main/resources/resourcepacks/fancybedswithsmoothlightning/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 7, - "description": "§2Makes beds look more fancy (with smooth lightning)" - } -} diff --git a/src/main/resources/resourcepacks/fancybedswithsmoothlightning/pack.png b/src/main/resources/resourcepacks/fancybedswithsmoothlightning/pack.png deleted file mode 100644 index ddb8653..0000000 Binary files a/src/main/resources/resourcepacks/fancybedswithsmoothlightning/pack.png and /dev/null differ diff --git a/src/main/resources/resourcepacks/fancyconnectedbeds/assets/minecraft/models/block/template_bed_foot.json b/src/main/resources/resourcepacks/fancyconnectedbeds/assets/minecraft/models/block/template_bed_foot.json index 720d1cd..07fc59d 100644 --- a/src/main/resources/resourcepacks/fancyconnectedbeds/assets/minecraft/models/block/template_bed_foot.json +++ b/src/main/resources/resourcepacks/fancyconnectedbeds/assets/minecraft/models/block/template_bed_foot.json @@ -1,9 +1,7 @@ { "credit": "made by Motschen", - "ambientocclusion": false, "texture_size": [64, 64], "textures": { - "0": "entity/bed/lime", "particle": "block/oak_planks" }, "elements": [ @@ -11,11 +9,11 @@ "from": [0, 0, 0], "to": [3, 3, 3], "faces": { - "north": {"uv": [12.5, 3.75, 13.25, 4.5], "texture": "#0", "cullface": "west"}, - "east": {"uv": [14.75, 3.75, 15.5, 4.5], "texture": "#0", "cullface": "west"}, - "south": {"uv": [14, 3.75, 14.75, 4.5], "texture": "#0", "cullface": "west"}, - "west": {"uv": [13.25, 3.75, 14, 4.5], "texture": "#0", "cullface": "west"}, - "down": {"uv": [14, 3, 14.75, 3.75], "texture": "#0", "cullface": "west"} + "north": {"uv": [12.5, 3.75, 13.25, 4.5], "texture": "#bed", "cullface": "west"}, + "east": {"uv": [14.75, 3.75, 15.5, 4.5], "texture": "#bed", "cullface": "west"}, + "south": {"uv": [14, 3.75, 14.75, 4.5], "texture": "#bed", "cullface": "west"}, + "west": {"uv": [13.25, 3.75, 14, 4.5], "texture": "#bed", "cullface": "west"}, + "down": {"uv": [14, 3, 14.75, 3.75], "texture": "#bed", "cullface": "west"} } }, { @@ -23,11 +21,11 @@ "to": [16, 3, 3], "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 8]}, "faces": { - "north": {"uv": [12.5, 0.75, 13.25, 1.5], "texture": "#0", "cullface": "east"}, - "east": {"uv": [14.75, 0.75, 15.5, 1.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [14, 0.75, 14.75, 1.5], "texture": "#0", "cullface": "east"}, - "west": {"uv": [13.25, 0.75, 14, 1.5], "texture": "#0", "cullface": "east"}, - "down": {"uv": [14, 0, 14.75, 0.75], "texture": "#0", "cullface": "east"} + "north": {"uv": [12.5, 0.75, 13.25, 1.5], "texture": "#bed", "cullface": "east"}, + "east": {"uv": [14.75, 0.75, 15.5, 1.5], "texture": "#bed", "cullface": "east"}, + "south": {"uv": [14, 0.75, 14.75, 1.5], "texture": "#bed", "cullface": "east"}, + "west": {"uv": [13.25, 0.75, 14, 1.5], "texture": "#bed", "cullface": "east"}, + "down": {"uv": [14, 0, 14.75, 0.75], "texture": "#bed", "cullface": "east"} } }, { @@ -35,12 +33,12 @@ "to": [16, 9, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { - "north": {"uv": [5.5, 5.5, 9.5, 7], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 7, 1.5, 11], "rotation": 270, "texture": "#0"}, - "west": {"uv": [5.5, 7, 7, 11], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 7, 5.5, 11], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} + "north": {"uv": [5.5, 5.5, 9.5, 7], "rotation": 180, "texture": "#bed"}, + "east": {"uv": [0, 7, 1.5, 11], "rotation": 270, "texture": "#bed"}, + "west": {"uv": [5.5, 7, 7, 11], "rotation": 90, "texture": "#bed"}, + "up": {"uv": [1.5, 7, 5.5, 11], "rotation": 180, "texture": "#bed"}, + "down": {"uv": [7, 7, 11, 11], "texture": "#bed"} } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/resourcepacks/fancyconnectedbeds/assets/minecraft/models/block/template_bed_head.json b/src/main/resources/resourcepacks/fancyconnectedbeds/assets/minecraft/models/block/template_bed_head.json index b3c8285..b458ca1 100644 --- a/src/main/resources/resourcepacks/fancyconnectedbeds/assets/minecraft/models/block/template_bed_head.json +++ b/src/main/resources/resourcepacks/fancyconnectedbeds/assets/minecraft/models/block/template_bed_head.json @@ -1,9 +1,7 @@ { "credit": "made by Motschen", - "ambientocclusion": false, "texture_size": [64, 64], "textures": { - "0": "entity/bed/lime", "particle": "block/oak_planks" }, "elements": [ @@ -12,11 +10,11 @@ "to": [3, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 21]}, "faces": { - "north": {"uv": [12.5, 5.25, 13.25, 6], "texture": "#0", "cullface": "west"}, - "east": {"uv": [14.75, 5.25, 15.5, 6], "texture": "#0", "cullface": "west"}, - "south": {"uv": [14, 5.25, 14.75, 6], "texture": "#0", "cullface": "west"}, - "west": {"uv": [13.25, 5.25, 14, 6], "texture": "#0", "cullface": "west"}, - "down": {"uv": [14, 4.5, 14.75, 5.25], "texture": "#0", "cullface": "west"} + "north": {"uv": [12.5, 5.25, 13.25, 6], "texture": "#bed", "cullface": "west"}, + "east": {"uv": [14.75, 5.25, 15.5, 6], "texture": "#bed", "cullface": "west"}, + "south": {"uv": [14, 5.25, 14.75, 6], "texture": "#bed", "cullface": "west"}, + "west": {"uv": [13.25, 5.25, 14, 6], "texture": "#bed", "cullface": "west"}, + "down": {"uv": [14, 4.5, 14.75, 5.25], "texture": "#bed", "cullface": "west"} } }, { @@ -24,11 +22,11 @@ "to": [16, 3, 16], "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 21]}, "faces": { - "north": {"uv": [12.5, 2.25, 13.25, 3], "texture": "#0", "cullface": "east"}, - "east": {"uv": [14.75, 2.25, 15.5, 3], "texture": "#0", "cullface": "east"}, - "south": {"uv": [14, 2.25, 14.75, 3], "texture": "#0", "cullface": "east"}, - "west": {"uv": [13.25, 2.25, 14, 3], "texture": "#0", "cullface": "east"}, - "down": {"uv": [14, 1.5, 14.75, 2.25], "texture": "#0", "cullface": "east"} + "north": {"uv": [12.5, 2.25, 13.25, 3], "texture": "#bed", "cullface": "east"}, + "east": {"uv": [14.75, 2.25, 15.5, 3], "texture": "#bed", "cullface": "east"}, + "south": {"uv": [14, 2.25, 14.75, 3], "texture": "#bed", "cullface": "east"}, + "west": {"uv": [13.25, 2.25, 14, 3], "texture": "#bed", "cullface": "east"}, + "down": {"uv": [14, 1.5, 14.75, 2.25], "texture": "#bed", "cullface": "east"} } }, { @@ -36,11 +34,11 @@ "to": [16, 9, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { - "east": {"uv": [0, 1.5, 1.5, 5.5], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1.5, 0, 5.5, 1.5], "rotation": 180, "texture": "#0"}, - "west": {"uv": [5.5, 1.5, 7, 5.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 1.5, 5.5, 5.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} + "east": {"uv": [0, 1.5, 1.5, 5.5], "rotation": 270, "texture": "#bed"}, + "south": {"uv": [1.5, 0, 5.5, 1.5], "rotation": 180, "texture": "#bed"}, + "west": {"uv": [5.5, 1.5, 7, 5.5], "rotation": 90, "texture": "#bed"}, + "up": {"uv": [1.5, 1.5, 5.5, 5.5], "rotation": 180, "texture": "#bed"}, + "down": {"uv": [7, 7, 11, 11], "texture": "#bed"} } }, { @@ -48,12 +46,12 @@ "to": [16, 10, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 16]}, "faces": { - "north": {"uv": [1.5, 3.25, 5.5, 3.5], "texture": "#0"}, - "east": {"uv": [1.5, 1.5, 1.75, 3.5], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1.5, 1.5, 5.5, 1.75], "texture": "#0"}, - "west": {"uv": [5.25, 1.5, 5.5, 3.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 1.5, 5.5, 3.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 4, 2], "texture": "#0"} + "north": {"uv": [1.5, 3.25, 5.5, 3.5], "texture": "#bed"}, + "east": {"uv": [1.5, 1.5, 1.75, 3.5], "rotation": 270, "texture": "#bed"}, + "south": {"uv": [1.5, 1.5, 5.5, 1.75], "texture": "#bed"}, + "west": {"uv": [5.25, 1.5, 5.5, 3.5], "rotation": 90, "texture": "#bed"}, + "up": {"uv": [1.5, 1.5, 5.5, 3.5], "rotation": 180, "texture": "#bed"}, + "down": {"uv": [0, 0, 4, 2], "texture": "#bed"} } }, { @@ -61,12 +59,12 @@ "to": [15, 11, 15], "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 16]}, "faces": { - "north": {"uv": [1.75, 3.25, 5.25, 3.5], "texture": "#0"}, - "east": {"uv": [1.75, 1.75, 2, 3.25], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1.75, 0.5, 5.25, 0.75], "texture": "#0"}, - "west": {"uv": [5, 1.75, 5.25, 3.25], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.75, 1.75, 5.25, 3.25], "texture": "#0"}, - "down": {"uv": [0, 0, 3.5, 1.5], "texture": "#0"} + "north": {"uv": [1.75, 3.25, 5.25, 3.5], "texture": "#bed"}, + "east": {"uv": [1.75, 1.75, 2, 3.25], "rotation": 90, "texture": "#bed"}, + "south": {"uv": [1.75, 0.5, 5.25, 0.75], "texture": "#bed"}, + "west": {"uv": [5, 1.75, 5.25, 3.25], "rotation": 90, "texture": "#bed"}, + "up": {"uv": [1.75, 1.75, 5.25, 3.25], "rotation": 180, "texture": "#bed"}, + "down": {"uv": [0, 0, 3.5, 1.5], "texture": "#bed"} } } ] diff --git a/src/main/resources/resourcepacks/fancyconnectedbeds/license.txt b/src/main/resources/resourcepacks/fancyconnectedbeds/license.txt deleted file mode 100644 index 6968976..0000000 --- a/src/main/resources/resourcepacks/fancyconnectedbeds/license.txt +++ /dev/null @@ -1,10 +0,0 @@ -The MIT License -Copyright © 2019 Motschen - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/src/main/resources/resourcepacks/fancyconnectedbeds/pack.mcmeta b/src/main/resources/resourcepacks/fancyconnectedbeds/pack.mcmeta index f2fa212..8a86866 100644 --- a/src/main/resources/resourcepacks/fancyconnectedbeds/pack.mcmeta +++ b/src/main/resources/resourcepacks/fancyconnectedbeds/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 7, - "description": "§2Makes beds look more fancy and allows beds to connect <3 (with smooth lightning)" + "pack_format": 12, + "description": "§2Makes beds look fancier and allows them to connect <3" } } diff --git a/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_foot.json b/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_foot.json deleted file mode 100644 index 5abafb6..0000000 --- a/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_foot.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "credit": "made by Motschen", - "texture_size": [64, 64], - "textures": { - "0": "entity/bed/lime", - "particle": "block/oak_planks" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [3, 3, 3], - "faces": { - "north": {"uv": [12.5, 3.75, 13.25, 4.5], "texture": "#0", "cullface": "west"}, - "east": {"uv": [14.75, 3.75, 15.5, 4.5], "texture": "#0", "cullface": "west"}, - "south": {"uv": [14, 3.75, 14.75, 4.5], "texture": "#0", "cullface": "west"}, - "west": {"uv": [13.25, 3.75, 14, 4.5], "texture": "#0", "cullface": "west"}, - "down": {"uv": [14, 3, 14.75, 3.75], "texture": "#0", "cullface": "west"} - } - }, - { - "from": [13, 0, 0], - "to": [16, 3, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 8]}, - "faces": { - "north": {"uv": [12.5, 0.75, 13.25, 1.5], "texture": "#0", "cullface": "east"}, - "east": {"uv": [14.75, 0.75, 15.5, 1.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [14, 0.75, 14.75, 1.5], "texture": "#0", "cullface": "east"}, - "west": {"uv": [13.25, 0.75, 14, 1.5], "texture": "#0", "cullface": "east"}, - "down": {"uv": [14, 0, 14.75, 0.75], "texture": "#0", "cullface": "east"} - } - }, - { - "from": [0, 3, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "north": {"uv": [5.5, 5.5, 9.5, 7], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 7, 1.5, 11], "rotation": 270, "texture": "#0"}, - "west": {"uv": [5.5, 7, 7, 11], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 7, 5.5, 11], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json b/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json deleted file mode 100644 index c4be863..0000000 --- a/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/assets/minecraft/models/block/template_bed_head.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "credit": "made by Motschen", - "texture_size": [64, 64], - "textures": { - "0": "entity/bed/lime", - "particle": "block/oak_planks" - }, - "elements": [ - { - "from": [0, 0, 13], - "to": [3, 3, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 21]}, - "faces": { - "north": {"uv": [12.5, 5.25, 13.25, 6], "texture": "#0", "cullface": "west"}, - "east": {"uv": [14.75, 5.25, 15.5, 6], "texture": "#0", "cullface": "west"}, - "south": {"uv": [14, 5.25, 14.75, 6], "texture": "#0", "cullface": "west"}, - "west": {"uv": [13.25, 5.25, 14, 6], "texture": "#0", "cullface": "west"}, - "down": {"uv": [14, 4.5, 14.75, 5.25], "texture": "#0", "cullface": "west"} - } - }, - { - "from": [13, 0, 13], - "to": [16, 3, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 8, 21]}, - "faces": { - "north": {"uv": [12.5, 2.25, 13.25, 3], "texture": "#0", "cullface": "east"}, - "east": {"uv": [14.75, 2.25, 15.5, 3], "texture": "#0", "cullface": "east"}, - "south": {"uv": [14, 2.25, 14.75, 3], "texture": "#0", "cullface": "east"}, - "west": {"uv": [13.25, 2.25, 14, 3], "texture": "#0", "cullface": "east"}, - "down": {"uv": [14, 1.5, 14.75, 2.25], "texture": "#0", "cullface": "east"} - } - }, - { - "from": [0, 3, 0], - "to": [16, 9, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, - "faces": { - "east": {"uv": [0, 1.5, 1.5, 5.5], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1.5, 0, 5.5, 1.5], "rotation": 180, "texture": "#0"}, - "west": {"uv": [5.5, 1.5, 7, 5.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 1.5, 5.5, 5.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 7, 11, 11], "texture": "#0"} - } - }, - { - "from": [0, 9, 8], - "to": [16, 10, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 16]}, - "faces": { - "north": {"uv": [1.5, 3.25, 5.5, 3.5], "texture": "#0"}, - "east": {"uv": [1.5, 1.5, 1.75, 3.5], "rotation": 270, "texture": "#0"}, - "south": {"uv": [1.5, 1.5, 5.5, 1.75], "texture": "#0"}, - "west": {"uv": [5.25, 1.5, 5.5, 3.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.5, 1.5, 5.5, 3.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 4, 2], "texture": "#0"} - } - }, - { - "from": [1, 10, 9], - "to": [15, 11, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 16]}, - "faces": { - "north": {"uv": [1.75, 3.25, 5.25, 3.5], "texture": "#0"}, - "east": {"uv": [1.75, 1.75, 2, 3.25], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1.75, 0.5, 5.25, 0.75], "texture": "#0"}, - "west": {"uv": [5, 1.75, 5.25, 3.25], "rotation": 90, "texture": "#0"}, - "up": {"uv": [1.75, 1.75, 5.25, 3.25], "texture": "#0"}, - "down": {"uv": [0, 0, 3.5, 1.5], "texture": "#0"} - } - } - ] -} diff --git a/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/license.txt b/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/license.txt deleted file mode 100644 index 6968976..0000000 --- a/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/license.txt +++ /dev/null @@ -1,10 +0,0 @@ -The MIT License -Copyright © 2019 Motschen - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/pack.mcmeta b/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/pack.mcmeta deleted file mode 100644 index f2fa212..0000000 --- a/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 7, - "description": "§2Makes beds look more fancy and allows beds to connect <3 (with smooth lightning)" - } -} diff --git a/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/pack.png b/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/pack.png deleted file mode 100644 index ddb8653..0000000 Binary files a/src/main/resources/resourcepacks/fancyconnectedbedswithsmoothlightning/pack.png and /dev/null differ