From 2812334d5e0a0d47e90dc2df3487c8c730917c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SulpherSt=C3=A6r?= Date: Tue, 29 Oct 2024 04:40:06 +0100 Subject: [PATCH 1/9] removed optifine support --- .../assets/minecraft/optifine/emissive.properties | 1 - 1 file changed, 1 deletion(-) delete mode 100644 packs/0-complementary-resources/assets/minecraft/optifine/emissive.properties diff --git a/packs/0-complementary-resources/assets/minecraft/optifine/emissive.properties b/packs/0-complementary-resources/assets/minecraft/optifine/emissive.properties deleted file mode 100644 index 3ce7dca..0000000 --- a/packs/0-complementary-resources/assets/minecraft/optifine/emissive.properties +++ /dev/null @@ -1 +0,0 @@ -suffix.emissive=_e \ No newline at end of file From 4d645d96965555b8c3cc80c2caf4a6776f0805c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SulpherSt=C3=A6r?= Date: Tue, 29 Oct 2024 04:40:34 +0100 Subject: [PATCH 2/9] Delete packs/0-complementary-resources/assets/minecraft/models/item/snowball.json --- .../assets/minecraft/models/item/snowball.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 packs/0-complementary-resources/assets/minecraft/models/item/snowball.json diff --git a/packs/0-complementary-resources/assets/minecraft/models/item/snowball.json b/packs/0-complementary-resources/assets/minecraft/models/item/snowball.json deleted file mode 100644 index 121fc59..0000000 --- a/packs/0-complementary-resources/assets/minecraft/models/item/snowball.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/snowball" - }, -"overrides": [ - { "predicate": { "custom_model_data": 710777 }, "model": "compsmp:item/memo/ombee"} - ] -} \ No newline at end of file From 95e8a4a29590aa0a0547c20cbdcbf67f4e79d2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SulpherSt=C3=A6r?= Date: Tue, 29 Oct 2024 04:40:47 +0100 Subject: [PATCH 3/9] Update mace.json --- .../assets/minecraft/models/item/mace.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packs/0-complementary-resources/assets/minecraft/models/item/mace.json b/packs/0-complementary-resources/assets/minecraft/models/item/mace.json index be35723..b2816d1 100644 --- a/packs/0-complementary-resources/assets/minecraft/models/item/mace.json +++ b/packs/0-complementary-resources/assets/minecraft/models/item/mace.json @@ -4,7 +4,6 @@ "layer0": "minecraft:item/mace" }, "overrides": [ - { "predicate": { "custom_model_data": 413473 }, "model": "compsmp:item/xander/smith_hammer"}, { "predicate": { "custom_model_data": 710426 }, "model": "compsmp:item/memo/galactic_bat"} ] -} \ No newline at end of file +} From 6be015e9430a9d26a476bbf7439ca8e06a0221eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SulpherSt=C3=A6r?= Date: Tue, 29 Oct 2024 04:41:16 +0100 Subject: [PATCH 4/9] Delete packs/0-complementary-resources/assets/minecraft/models/item/iron_pickaxe.json --- .../assets/minecraft/models/item/iron_pickaxe.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 packs/0-complementary-resources/assets/minecraft/models/item/iron_pickaxe.json diff --git a/packs/0-complementary-resources/assets/minecraft/models/item/iron_pickaxe.json b/packs/0-complementary-resources/assets/minecraft/models/item/iron_pickaxe.json deleted file mode 100644 index 339fe13..0000000 --- a/packs/0-complementary-resources/assets/minecraft/models/item/iron_pickaxe.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "minecraft:item/iron_pickaxe" - }, - "overrides": [ - { "predicate": { "custom_model_data": 413480 }, "model": "compsmp:item/xander/smith_hammer"} - ] -} \ No newline at end of file From 7c35ee3e8cfb72bc5f7d16eb425a7e79ac9da95f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SulpherSt=C3=A6r?= Date: Tue, 29 Oct 2024 04:42:41 +0100 Subject: [PATCH 5/9] Delete packs/0-complementary-resources/assets/compsmp/textures/item/memo/ombee.png --- .../assets/compsmp/textures/item/memo/ombee.png | Bin 312 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packs/0-complementary-resources/assets/compsmp/textures/item/memo/ombee.png diff --git a/packs/0-complementary-resources/assets/compsmp/textures/item/memo/ombee.png b/packs/0-complementary-resources/assets/compsmp/textures/item/memo/ombee.png deleted file mode 100644 index 3284b26363a8558208738b8d86951bbb03787b0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFw*`O zZfw{6>m?-qeKy>5gfs79V#0&el!?ha7D>eirWk&ie@O9mGtZiyi9JGZ`2XMgc}n7I z^t8ujhb_b0uDRO!Ez^Fw-Eh+{yFV!f;f_5MRpm0|PPcoweVfC~6Tip&2&1o9!i2jI t%$g@Q9(~Ez+#SNK%*^c0% Date: Tue, 29 Oct 2024 04:42:51 +0100 Subject: [PATCH 6/9] Delete packs/0-complementary-resources/assets/compsmp/textures/item/xander/hammer.png --- .../compsmp/textures/item/xander/hammer.png | Bin 343 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packs/0-complementary-resources/assets/compsmp/textures/item/xander/hammer.png diff --git a/packs/0-complementary-resources/assets/compsmp/textures/item/xander/hammer.png b/packs/0-complementary-resources/assets/compsmp/textures/item/xander/hammer.png deleted file mode 100644 index 6b1704ab8135b002942a4e05e62f0337432b1ff9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!8e{Rjv*HQM4>#&24*Mpi+n{e`Ag z$;%6$6-r+{v|teu&X)M$xxm7A6@%+v>0h2S_uyFrg&zN(kqxqCyKizle=T}ULSt#b^{r Date: Tue, 29 Oct 2024 04:42:59 +0100 Subject: [PATCH 7/9] Delete packs/0-complementary-resources/assets/compsmp/textures/item/xander/hammer_s.png --- .../compsmp/textures/item/xander/hammer_s.png | Bin 308 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packs/0-complementary-resources/assets/compsmp/textures/item/xander/hammer_s.png diff --git a/packs/0-complementary-resources/assets/compsmp/textures/item/xander/hammer_s.png b/packs/0-complementary-resources/assets/compsmp/textures/item/xander/hammer_s.png deleted file mode 100644 index 3310cf22564f9eaf5aa077b1391515563c868291..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!IPdYjv*HQMCh`4{^b-dEp%qnqot!dt^!zIn(H`cBW zZ&&qnJ8`h*bmEr$jZt-XTCaZ0Uc_X%yt~7O;bfLi_R?K^ra(_Ic)I$ztaD0e0s!=2 Bcw_(o From 48696882b1ecd4238880edcfb282863d15ae778d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SulpherSt=C3=A6r?= Date: Tue, 29 Oct 2024 04:43:12 +0100 Subject: [PATCH 8/9] Delete packs/0-complementary-resources/assets/compsmp/models/item/xander/smith_hammer.json --- .../models/item/xander/smith_hammer.json | 95 ------------------- 1 file changed, 95 deletions(-) delete mode 100644 packs/0-complementary-resources/assets/compsmp/models/item/xander/smith_hammer.json diff --git a/packs/0-complementary-resources/assets/compsmp/models/item/xander/smith_hammer.json b/packs/0-complementary-resources/assets/compsmp/models/item/xander/smith_hammer.json deleted file mode 100644 index a3701a8..0000000 --- a/packs/0-complementary-resources/assets/compsmp/models/item/xander/smith_hammer.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "1": "compsmp:item/xander/hammer", - "particle": "compsmp:item/xander/hammer" - }, - "elements": [ - { - "from": [7.5, 0, 7.5], - "to": [8.5, 11, 8.5], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 6.5, 8]}, - "faces": { - "north": {"uv": [1, 2, 2, 13], "texture": "#1"}, - "east": {"uv": [0, 2, 1, 13], "texture": "#1"}, - "south": {"uv": [3, 2, 4, 13], "texture": "#1"}, - "west": {"uv": [2, 2, 3, 13], "texture": "#1"}, - "up": {"uv": [2, 3, 1, 2], "rotation": 270, "texture": "#1"}, - "down": {"uv": [2, 12, 1, 13], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [7.425, 1.825, 7.425], - "to": [8.575, 4.975, 8.575], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 6.5, 8]}, - "faces": { - "north": {"uv": [1, 13, 2, 16], "texture": "#1"}, - "east": {"uv": [1, 13, 0, 16], "texture": "#1"}, - "south": {"uv": [3, 13, 4, 16], "texture": "#1"}, - "west": {"uv": [2, 13, 3, 16], "texture": "#1"}, - "up": {"uv": [5, 14, 4, 13], "texture": "#1"}, - "down": {"uv": [5, 14, 4, 15], "texture": "#1"} - } - }, - { - "from": [6.5, 7.5, 5.5], - "to": [9.5, 10.5, 10.5], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 6.5, 8]}, - "faces": { - "north": {"uv": [4, 2, 7, 5], "texture": "#1"}, - "east": {"uv": [4, 8, 9, 11], "texture": "#1"}, - "south": {"uv": [7, 2, 10, 5], "texture": "#1"}, - "west": {"uv": [4, 5, 9, 8], "texture": "#1"}, - "up": {"uv": [14, 11, 9, 8], "rotation": 90, "texture": "#1"}, - "down": {"uv": [14, 5, 9, 8], "rotation": 90, "texture": "#1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 5, 1.25], - "scale": [1.5, 1.5, 1.5] - }, - "thirdperson_lefthand": { - "translation": [0, 5, 1.25], - "scale": [1.5, 1.5, 1.5] - }, - "firstperson_righthand": { - "translation": [0, 3.25, 1.25], - "scale": [1.5, 1.5, 1.5] - }, - "firstperson_lefthand": { - "translation": [0, 3.25, 1.25], - "scale": [1.5, 1.5, 1.5] - }, - "ground": { - "rotation": [90, 0, 0], - "translation": [0, 0, 4], - "scale": [1.5, 1.5, 1.5] - }, - "gui": { - "rotation": [60, -135, 60], - "translation": [2, 2.25, 0], - "scale": [1.5, 1.5, 1.5] - }, - "head": { - "rotation": [90, 0, -90], - "translation": [0, 8, 0], - "scale": [2, 2, 2] - }, - "fixed": { - "rotation": [90, -45, 90], - "translation": [-2.25, 3, 0], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "axe", - "origin": [5.8, 13.8, -6.3], - "rotation": [0, 10, -90], - "color": 0, - "children": [0, 1, 2] - } - ] -} \ No newline at end of file From 7f0ecf14d6d37c915998c5932ad465e7ae106bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SulpherSt=C3=A6r?= Date: Tue, 29 Oct 2024 04:43:22 +0100 Subject: [PATCH 9/9] Delete packs/0-complementary-resources/assets/compsmp/models/item/memo/ombee.json --- .../assets/compsmp/models/item/memo/ombee.json | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 packs/0-complementary-resources/assets/compsmp/models/item/memo/ombee.json diff --git a/packs/0-complementary-resources/assets/compsmp/models/item/memo/ombee.json b/packs/0-complementary-resources/assets/compsmp/models/item/memo/ombee.json deleted file mode 100644 index 48c9a92..0000000 --- a/packs/0-complementary-resources/assets/compsmp/models/item/memo/ombee.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "item/generated", - "textures": { - "layer0": "compsmp:item/memo/ombee" - }, - "display": { - "head": { - "rotation": [0, 180, 0], - "translation": [0, 0, -7.75] - } - } -} \ No newline at end of file