From 0ac7575bad8482696d2563e622879eba1cd7c383 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 14 Dec 2024 13:18:44 -0500 Subject: [PATCH] Re-add rpack support for 1.21.3 (#264) * Re-add support for 1.21.3 to resource pack * Add pack icon --- .../minecraft/models/item/crafting_table.json | 11 +++ .../assets/minecraft/models/item/dropper.json | 11 +++ .../minecraft/models/item/leather_boots.json | 75 ++++++++++++++++++ .../models/item/leather_chestplate.json | 75 ++++++++++++++++++ .../minecraft/models/item/leather_helmet.json | 75 ++++++++++++++++++ .../models/item/leather_leggings.json | 75 ++++++++++++++++++ .../assets/minecraft/models/item/shield.json | 58 ++++++++++++++ .../minecraft/models/item/white_banner.json | 11 +++ .../models/item/white_stained_glass_pane.json | 14 ++++ .../minecraft/items/crafting_table.json | 0 .../assets/minecraft/items/dropper.json | 0 .../assets/minecraft/items/leather_boots.json | 0 .../minecraft/items/leather_chestplate.json | 0 .../minecraft/items/leather_helmet.json | 0 .../minecraft/items/leather_leggings.json | 0 .../assets/minecraft/items/shield.json | 0 .../assets/minecraft/items/white_banner.json | 0 .../items/white_stained_glass_pane.json | 0 resource-pack/pack.mcmeta | 14 +++- resource-pack/pack.png | Bin 0 -> 2358 bytes 20 files changed, 418 insertions(+), 1 deletion(-) create mode 100644 resource-pack/openinv_34/assets/minecraft/models/item/crafting_table.json create mode 100644 resource-pack/openinv_34/assets/minecraft/models/item/dropper.json create mode 100644 resource-pack/openinv_34/assets/minecraft/models/item/leather_boots.json create mode 100644 resource-pack/openinv_34/assets/minecraft/models/item/leather_chestplate.json create mode 100644 resource-pack/openinv_34/assets/minecraft/models/item/leather_helmet.json create mode 100644 resource-pack/openinv_34/assets/minecraft/models/item/leather_leggings.json create mode 100644 resource-pack/openinv_34/assets/minecraft/models/item/shield.json create mode 100644 resource-pack/openinv_34/assets/minecraft/models/item/white_banner.json create mode 100644 resource-pack/openinv_34/assets/minecraft/models/item/white_stained_glass_pane.json rename resource-pack/{ => openinv_44}/assets/minecraft/items/crafting_table.json (100%) rename resource-pack/{ => openinv_44}/assets/minecraft/items/dropper.json (100%) rename resource-pack/{ => openinv_44}/assets/minecraft/items/leather_boots.json (100%) rename resource-pack/{ => openinv_44}/assets/minecraft/items/leather_chestplate.json (100%) rename resource-pack/{ => openinv_44}/assets/minecraft/items/leather_helmet.json (100%) rename resource-pack/{ => openinv_44}/assets/minecraft/items/leather_leggings.json (100%) rename resource-pack/{ => openinv_44}/assets/minecraft/items/shield.json (100%) rename resource-pack/{ => openinv_44}/assets/minecraft/items/white_banner.json (100%) rename resource-pack/{ => openinv_44}/assets/minecraft/items/white_stained_glass_pane.json (100%) create mode 100644 resource-pack/pack.png diff --git a/resource-pack/openinv_34/assets/minecraft/models/item/crafting_table.json b/resource-pack/openinv_34/assets/minecraft/models/item/crafting_table.json new file mode 100644 index 00000000..230469c5 --- /dev/null +++ b/resource-pack/openinv_34/assets/minecraft/models/item/crafting_table.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/crafting_table", + "overrides": [ + { + "model": "openinv:item/crafting_output", + "predicate": { + "custom_model_data": 9999 + } + } + ] +} diff --git a/resource-pack/openinv_34/assets/minecraft/models/item/dropper.json b/resource-pack/openinv_34/assets/minecraft/models/item/dropper.json new file mode 100644 index 00000000..0c8bb744 --- /dev/null +++ b/resource-pack/openinv_34/assets/minecraft/models/item/dropper.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/dropper", + "overrides": [ + { + "model": "openinv:item/drop", + "predicate": { + "custom_model_data": 9999 + } + } + ] +} diff --git a/resource-pack/openinv_34/assets/minecraft/models/item/leather_boots.json b/resource-pack/openinv_34/assets/minecraft/models/item/leather_boots.json new file mode 100644 index 00000000..f9cd4073 --- /dev/null +++ b/resource-pack/openinv_34/assets/minecraft/models/item/leather_boots.json @@ -0,0 +1,75 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "openinv:item/empty_boots", + "predicate": { + "custom_model_data": 9999 + } + }, + { + "model": "minecraft:item/leather_boots_quartz_trim", + "predicate": { + "trim_type": 0.1 + } + }, + { + "model": "minecraft:item/leather_boots_iron_trim", + "predicate": { + "trim_type": 0.2 + } + }, + { + "model": "minecraft:item/leather_boots_netherite_trim", + "predicate": { + "trim_type": 0.3 + } + }, + { + "model": "minecraft:item/leather_boots_redstone_trim", + "predicate": { + "trim_type": 0.4 + } + }, + { + "model": "minecraft:item/leather_boots_copper_trim", + "predicate": { + "trim_type": 0.5 + } + }, + { + "model": "minecraft:item/leather_boots_gold_trim", + "predicate": { + "trim_type": 0.6 + } + }, + { + "model": "minecraft:item/leather_boots_emerald_trim", + "predicate": { + "trim_type": 0.7 + } + }, + { + "model": "minecraft:item/leather_boots_diamond_trim", + "predicate": { + "trim_type": 0.8 + } + }, + { + "model": "minecraft:item/leather_boots_lapis_trim", + "predicate": { + "trim_type": 0.9 + } + }, + { + "model": "minecraft:item/leather_boots_amethyst_trim", + "predicate": { + "trim_type": 1.0 + } + } + ], + "textures": { + "layer0": "minecraft:item/leather_boots", + "layer1": "minecraft:item/leather_boots_overlay" + } +} diff --git a/resource-pack/openinv_34/assets/minecraft/models/item/leather_chestplate.json b/resource-pack/openinv_34/assets/minecraft/models/item/leather_chestplate.json new file mode 100644 index 00000000..d6dc8c5f --- /dev/null +++ b/resource-pack/openinv_34/assets/minecraft/models/item/leather_chestplate.json @@ -0,0 +1,75 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "openinv:item/empty_chestplate", + "predicate": { + "custom_model_data": 9999 + } + }, + { + "model": "minecraft:item/leather_chestplate_quartz_trim", + "predicate": { + "trim_type": 0.1 + } + }, + { + "model": "minecraft:item/leather_chestplate_iron_trim", + "predicate": { + "trim_type": 0.2 + } + }, + { + "model": "minecraft:item/leather_chestplate_netherite_trim", + "predicate": { + "trim_type": 0.3 + } + }, + { + "model": "minecraft:item/leather_chestplate_redstone_trim", + "predicate": { + "trim_type": 0.4 + } + }, + { + "model": "minecraft:item/leather_chestplate_copper_trim", + "predicate": { + "trim_type": 0.5 + } + }, + { + "model": "minecraft:item/leather_chestplate_gold_trim", + "predicate": { + "trim_type": 0.6 + } + }, + { + "model": "minecraft:item/leather_chestplate_emerald_trim", + "predicate": { + "trim_type": 0.7 + } + }, + { + "model": "minecraft:item/leather_chestplate_diamond_trim", + "predicate": { + "trim_type": 0.8 + } + }, + { + "model": "minecraft:item/leather_chestplate_lapis_trim", + "predicate": { + "trim_type": 0.9 + } + }, + { + "model": "minecraft:item/leather_chestplate_amethyst_trim", + "predicate": { + "trim_type": 1.0 + } + } + ], + "textures": { + "layer0": "minecraft:item/leather_chestplate", + "layer1": "minecraft:item/leather_chestplate_overlay" + } +} diff --git a/resource-pack/openinv_34/assets/minecraft/models/item/leather_helmet.json b/resource-pack/openinv_34/assets/minecraft/models/item/leather_helmet.json new file mode 100644 index 00000000..236ae610 --- /dev/null +++ b/resource-pack/openinv_34/assets/minecraft/models/item/leather_helmet.json @@ -0,0 +1,75 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "openinv:item/empty_helmet", + "predicate": { + "custom_model_data": 9999 + } + }, + { + "model": "minecraft:item/leather_helmet_quartz_trim", + "predicate": { + "trim_type": 0.1 + } + }, + { + "model": "minecraft:item/leather_helmet_iron_trim", + "predicate": { + "trim_type": 0.2 + } + }, + { + "model": "minecraft:item/leather_helmet_netherite_trim", + "predicate": { + "trim_type": 0.3 + } + }, + { + "model": "minecraft:item/leather_helmet_redstone_trim", + "predicate": { + "trim_type": 0.4 + } + }, + { + "model": "minecraft:item/leather_helmet_copper_trim", + "predicate": { + "trim_type": 0.5 + } + }, + { + "model": "minecraft:item/leather_helmet_gold_trim", + "predicate": { + "trim_type": 0.6 + } + }, + { + "model": "minecraft:item/leather_helmet_emerald_trim", + "predicate": { + "trim_type": 0.7 + } + }, + { + "model": "minecraft:item/leather_helmet_diamond_trim", + "predicate": { + "trim_type": 0.8 + } + }, + { + "model": "minecraft:item/leather_helmet_lapis_trim", + "predicate": { + "trim_type": 0.9 + } + }, + { + "model": "minecraft:item/leather_helmet_amethyst_trim", + "predicate": { + "trim_type": 1.0 + } + } + ], + "textures": { + "layer0": "minecraft:item/leather_helmet", + "layer1": "minecraft:item/leather_helmet_overlay" + } +} diff --git a/resource-pack/openinv_34/assets/minecraft/models/item/leather_leggings.json b/resource-pack/openinv_34/assets/minecraft/models/item/leather_leggings.json new file mode 100644 index 00000000..eb9ddc89 --- /dev/null +++ b/resource-pack/openinv_34/assets/minecraft/models/item/leather_leggings.json @@ -0,0 +1,75 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "openinv:item/empty_leggings", + "predicate": { + "custom_model_data": 9999 + } + }, + { + "model": "minecraft:item/leather_leggings_quartz_trim", + "predicate": { + "trim_type": 0.1 + } + }, + { + "model": "minecraft:item/leather_leggings_iron_trim", + "predicate": { + "trim_type": 0.2 + } + }, + { + "model": "minecraft:item/leather_leggings_netherite_trim", + "predicate": { + "trim_type": 0.3 + } + }, + { + "model": "minecraft:item/leather_leggings_redstone_trim", + "predicate": { + "trim_type": 0.4 + } + }, + { + "model": "minecraft:item/leather_leggings_copper_trim", + "predicate": { + "trim_type": 0.5 + } + }, + { + "model": "minecraft:item/leather_leggings_gold_trim", + "predicate": { + "trim_type": 0.6 + } + }, + { + "model": "minecraft:item/leather_leggings_emerald_trim", + "predicate": { + "trim_type": 0.7 + } + }, + { + "model": "minecraft:item/leather_leggings_diamond_trim", + "predicate": { + "trim_type": 0.8 + } + }, + { + "model": "minecraft:item/leather_leggings_lapis_trim", + "predicate": { + "trim_type": 0.9 + } + }, + { + "model": "minecraft:item/leather_leggings_amethyst_trim", + "predicate": { + "trim_type": 1.0 + } + } + ], + "textures": { + "layer0": "minecraft:item/leather_leggings", + "layer1": "minecraft:item/leather_leggings_overlay" + } +} diff --git a/resource-pack/openinv_34/assets/minecraft/models/item/shield.json b/resource-pack/openinv_34/assets/minecraft/models/item/shield.json new file mode 100644 index 00000000..5ea7eddd --- /dev/null +++ b/resource-pack/openinv_34/assets/minecraft/models/item/shield.json @@ -0,0 +1,58 @@ +{ + "parent": "builtin/entity", + "gui_light": "front", + "textures": { + "particle": "block/dark_oak_planks" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 10, 6, -4 ], + "scale": [ 1, 1, 1 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, 90, 0 ], + "translation": [ 10, 6, 12 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 180, 5 ], + "translation": [ -10, 2, -10 ], + "scale": [ 1.25, 1.25, 1.25 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 180, 5 ], + "translation": [ 10, 0, -10 ], + "scale": [ 1.25, 1.25, 1.25 ] + }, + "gui": { + "rotation": [ 15, -25, -5 ], + "translation": [ 2, 3, 0 ], + "scale": [ 0.65, 0.65, 0.65 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ -4.5, 4.5, -5], + "scale":[ 0.55, 0.55, 0.55] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 2, 4, 2], + "scale":[ 0.25, 0.25, 0.25] + } + }, + "overrides": [ + { + "model": "openinv:item/empty_shield", + "predicate": { + "custom_model_data": 9999 + } + }, + { + "predicate": { + "blocking": 1 + }, + "model": "item/shield_blocking" + } + ] +} diff --git a/resource-pack/openinv_34/assets/minecraft/models/item/white_banner.json b/resource-pack/openinv_34/assets/minecraft/models/item/white_banner.json new file mode 100644 index 00000000..bc6fadb8 --- /dev/null +++ b/resource-pack/openinv_34/assets/minecraft/models/item/white_banner.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:item/template_banner", + "overrides": [ + { + "model": "openinv:item/cursor", + "predicate": { + "custom_model_data": 9999 + } + } + ] +} diff --git a/resource-pack/openinv_34/assets/minecraft/models/item/white_stained_glass_pane.json b/resource-pack/openinv_34/assets/minecraft/models/item/white_stained_glass_pane.json new file mode 100644 index 00000000..e4edacdb --- /dev/null +++ b/resource-pack/openinv_34/assets/minecraft/models/item/white_stained_glass_pane.json @@ -0,0 +1,14 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "minecraft:block/white_stained_glass" + }, + "overrides": [ + { + "model": "openinv:item/not_a_slot", + "predicate": { + "custom_model_data": 9999 + } + } + ] +} diff --git a/resource-pack/assets/minecraft/items/crafting_table.json b/resource-pack/openinv_44/assets/minecraft/items/crafting_table.json similarity index 100% rename from resource-pack/assets/minecraft/items/crafting_table.json rename to resource-pack/openinv_44/assets/minecraft/items/crafting_table.json diff --git a/resource-pack/assets/minecraft/items/dropper.json b/resource-pack/openinv_44/assets/minecraft/items/dropper.json similarity index 100% rename from resource-pack/assets/minecraft/items/dropper.json rename to resource-pack/openinv_44/assets/minecraft/items/dropper.json diff --git a/resource-pack/assets/minecraft/items/leather_boots.json b/resource-pack/openinv_44/assets/minecraft/items/leather_boots.json similarity index 100% rename from resource-pack/assets/minecraft/items/leather_boots.json rename to resource-pack/openinv_44/assets/minecraft/items/leather_boots.json diff --git a/resource-pack/assets/minecraft/items/leather_chestplate.json b/resource-pack/openinv_44/assets/minecraft/items/leather_chestplate.json similarity index 100% rename from resource-pack/assets/minecraft/items/leather_chestplate.json rename to resource-pack/openinv_44/assets/minecraft/items/leather_chestplate.json diff --git a/resource-pack/assets/minecraft/items/leather_helmet.json b/resource-pack/openinv_44/assets/minecraft/items/leather_helmet.json similarity index 100% rename from resource-pack/assets/minecraft/items/leather_helmet.json rename to resource-pack/openinv_44/assets/minecraft/items/leather_helmet.json diff --git a/resource-pack/assets/minecraft/items/leather_leggings.json b/resource-pack/openinv_44/assets/minecraft/items/leather_leggings.json similarity index 100% rename from resource-pack/assets/minecraft/items/leather_leggings.json rename to resource-pack/openinv_44/assets/minecraft/items/leather_leggings.json diff --git a/resource-pack/assets/minecraft/items/shield.json b/resource-pack/openinv_44/assets/minecraft/items/shield.json similarity index 100% rename from resource-pack/assets/minecraft/items/shield.json rename to resource-pack/openinv_44/assets/minecraft/items/shield.json diff --git a/resource-pack/assets/minecraft/items/white_banner.json b/resource-pack/openinv_44/assets/minecraft/items/white_banner.json similarity index 100% rename from resource-pack/assets/minecraft/items/white_banner.json rename to resource-pack/openinv_44/assets/minecraft/items/white_banner.json diff --git a/resource-pack/assets/minecraft/items/white_stained_glass_pane.json b/resource-pack/openinv_44/assets/minecraft/items/white_stained_glass_pane.json similarity index 100% rename from resource-pack/assets/minecraft/items/white_stained_glass_pane.json rename to resource-pack/openinv_44/assets/minecraft/items/white_stained_glass_pane.json diff --git a/resource-pack/pack.mcmeta b/resource-pack/pack.mcmeta index 786f9616..89488360 100644 --- a/resource-pack/pack.mcmeta +++ b/resource-pack/pack.mcmeta @@ -2,6 +2,18 @@ "pack": { "description": "Improve OpenInv's legibility", "pack_format": 46, - "supported_formats": [ 46 ] + "supported_formats": [ 34, 46 ] + }, + "overlays": { + "entries": [ + { + "formats": [ 44, 46 ], + "directory": "openinv_44" + }, + { + "formats": [ 34, 43 ], + "directory": "openinv_34" + } + ] } } diff --git a/resource-pack/pack.png b/resource-pack/pack.png new file mode 100644 index 0000000000000000000000000000000000000000..536a28f670bfd864cc28e5895c3892cf03fbc057 GIT binary patch literal 2358 zcmV-63CZ?}P)VvEmJ~oNYgQ=?MRfQOB=hf;#Ao3-^kV;85Vl}uHK5kKxMi)U!(rN!NqWKf4cS=4X&6-M{yGmj=)ByQ5D16EBn4N~ zg_pAJi))x zQHEYfdav_zDiXQ3vN(W{$#+E0Rpe?-Bocu{qC_|Y$wHHI=2unKQbtp*W}CQB@UptiMT&k*8+#e7zIgC_W2-&k|PfZLdR(>i9fuf2Du**BbTW2ot-F=5G zk)qKki9`Y!w^FEegG4p_xJAKzU;Pb$y?Z+8bZfkS`pt)8A7JYNoo(c7?XE1Nd2 z=h}a70I;d`5uQ^w)9Jt?RtiqMpu4-fF1tgwuc3)eo7Xdzxnm6KirBPyJx#uKZ0iWH z%R9ozKTfWiC07zEcFVK-tuq%4i;K{?Z7XA=x0#t;bKFa7Q`A6^=JU_-%53CcR9 zfj_+cF)sHye%AX$LGa8S@WUBxlrK(yQg`O;+`E=Z(rmY?+?vQ1_5(|c4FCO8?qqWW zn-%_bB~6RJ(U{m8@H`ZUBUuRwz{X&JTN7C(Cg+)&o@XRAMPq{-n4`tt$l}r>)3bM1 zJ;tr(RGJ_~CAg=i=ZzO*6Vm|9%`X^Zi%W|D_>FWh^c&(&$x;L^wG; zw_*#67adM6UXJO4O3yl&-T#}>)rA*tg!Jd4lGr=vt`;HseGNtq$Yd8dc;skRg3G1! zav=8y$sS_&-tH)Ewii&Ic=j;7TdcKAcEM1<^z2;@9ywZY-DT|#$6{czwKThkEV`*R zxfHc(XVLqC#C8}l=AHHnnN_<*C72dPTLT{az6SOmdfC$IPOCFc-ClHOy<5!+#P{;t zA;A!#Sggb-p;(LqiNw7eAQS&#?@Js!a+LjtUM?b{yRq0hCx1wsQx1kGbdc!oY}Sfb zu4l;ZeL2PJW3GHYpVxbOdJ7ezqKU&okB=GX%**&9%^{PyBEHxTXEndqBrNnXu`Q;g zZ^?$Qd_IrT)zwwhJ0suL9#o)w7S)%nsijZ=|`rC}7^ z%H?)uc5|%Of3tQMJ3311X9QcCdGGKK7&uvQ^BtSox%8jw_ zk7fA`#bQQ7mEKn*x7WDh@p#2$@n|$kS67!2Yi0`Qb>M!{Xw=97AKiE#kH^jS$C?en zCnl!=3Q9Tm3E$ejfmVMb!IoxT|I;}pXJ+~3b3f(9S6`*OySwDy_zswq?t3Y2nW@Rm zkP{Co2Uk8HW!qyxMlR3dS?8tI-$-V94(+4s^gQ!8-`l;FU`sQDC(n{w$^kHbd&+kA zXVvT_)&pvGHC9dBi?D0w768s&yh^CEoqv8jPr&Cx{r+}*4Nd$$p)t2`mxWx8@!L~u z>1bn1N1J25tWJY9zZ5<7PZPL1re)=c8!=wsf>Hw@|1` zz4zfYdiU)DVBfxdRow}!DGvbf_`S3?1-NkOI!%u^;90IvZRuzux0Evy;7BUXkDvJt z(@IChMUge@0ndK>`9i$UWC?Y)6Y%*+T`O2#aVyNs%+cg&WF(d5x$sV=l@5Njckhad cqMD}hKd!rT*X}rD8UO$Q07*qoM6N<$g2-Ba0{{R3 literal 0 HcmV?d00001