diff --git a/original_sounds/angel/angel_1.ogg b/original_sounds/angel/angel_1.ogg new file mode 100644 index 0000000..0e9ae2a Binary files /dev/null and b/original_sounds/angel/angel_1.ogg differ diff --git a/original_sounds/angel/angel_10.ogg b/original_sounds/angel/angel_10.ogg new file mode 100644 index 0000000..201af69 Binary files /dev/null and b/original_sounds/angel/angel_10.ogg differ diff --git a/original_sounds/angel/angel_11.ogg b/original_sounds/angel/angel_11.ogg new file mode 100644 index 0000000..2643fd8 Binary files /dev/null and b/original_sounds/angel/angel_11.ogg differ diff --git a/original_sounds/angel/angel_12.ogg b/original_sounds/angel/angel_12.ogg new file mode 100644 index 0000000..9054d4a Binary files /dev/null and b/original_sounds/angel/angel_12.ogg differ diff --git a/original_sounds/angel/angel_13.ogg b/original_sounds/angel/angel_13.ogg new file mode 100644 index 0000000..eaae3d0 Binary files /dev/null and b/original_sounds/angel/angel_13.ogg differ diff --git a/original_sounds/angel/angel_14.ogg b/original_sounds/angel/angel_14.ogg new file mode 100644 index 0000000..809482e Binary files /dev/null and b/original_sounds/angel/angel_14.ogg differ diff --git a/original_sounds/angel/angel_15.ogg b/original_sounds/angel/angel_15.ogg new file mode 100644 index 0000000..0257a49 Binary files /dev/null and b/original_sounds/angel/angel_15.ogg differ diff --git a/original_sounds/angel/angel_16.ogg b/original_sounds/angel/angel_16.ogg new file mode 100644 index 0000000..ed95db8 Binary files /dev/null and b/original_sounds/angel/angel_16.ogg differ diff --git a/original_sounds/angel/angel_17.ogg b/original_sounds/angel/angel_17.ogg new file mode 100644 index 0000000..d88fba4 Binary files /dev/null and b/original_sounds/angel/angel_17.ogg differ diff --git a/original_sounds/angel/angel_18.ogg b/original_sounds/angel/angel_18.ogg new file mode 100644 index 0000000..213b043 Binary files /dev/null and b/original_sounds/angel/angel_18.ogg differ diff --git a/original_sounds/angel/angel_19.ogg b/original_sounds/angel/angel_19.ogg new file mode 100644 index 0000000..f561298 Binary files /dev/null and b/original_sounds/angel/angel_19.ogg differ diff --git a/original_sounds/angel/angel_2.ogg b/original_sounds/angel/angel_2.ogg new file mode 100644 index 0000000..bb430f4 Binary files /dev/null and b/original_sounds/angel/angel_2.ogg differ diff --git a/original_sounds/angel/angel_20.ogg b/original_sounds/angel/angel_20.ogg new file mode 100644 index 0000000..cc4c903 Binary files /dev/null and b/original_sounds/angel/angel_20.ogg differ diff --git a/original_sounds/angel/angel_3.ogg b/original_sounds/angel/angel_3.ogg new file mode 100644 index 0000000..f6b8168 Binary files /dev/null and b/original_sounds/angel/angel_3.ogg differ diff --git a/original_sounds/angel/angel_4.ogg b/original_sounds/angel/angel_4.ogg new file mode 100644 index 0000000..ff9b36c Binary files /dev/null and b/original_sounds/angel/angel_4.ogg differ diff --git a/original_sounds/angel/angel_5.ogg b/original_sounds/angel/angel_5.ogg new file mode 100644 index 0000000..7942508 Binary files /dev/null and b/original_sounds/angel/angel_5.ogg differ diff --git a/original_sounds/angel/angel_6.ogg b/original_sounds/angel/angel_6.ogg new file mode 100644 index 0000000..947895a Binary files /dev/null and b/original_sounds/angel/angel_6.ogg differ diff --git a/original_sounds/angel/angel_7.ogg b/original_sounds/angel/angel_7.ogg new file mode 100644 index 0000000..3b7a393 Binary files /dev/null and b/original_sounds/angel/angel_7.ogg differ diff --git a/original_sounds/angel/angel_8.ogg b/original_sounds/angel/angel_8.ogg new file mode 100644 index 0000000..54799f9 Binary files /dev/null and b/original_sounds/angel/angel_8.ogg differ diff --git a/original_sounds/angel/angel_9.ogg b/original_sounds/angel/angel_9.ogg new file mode 100644 index 0000000..baebf13 Binary files /dev/null and b/original_sounds/angel/angel_9.ogg differ diff --git a/original_sounds/songs/a_crandle_in_bethlemheleme.ogg b/original_sounds/songs/a_crandle_in_bethlemheleme.ogg new file mode 100644 index 0000000..b590a35 Binary files /dev/null and b/original_sounds/songs/a_crandle_in_bethlemheleme.ogg differ diff --git a/resourcepack/assets/event/sounds/bell/bell-1.ogg b/original_sounds/songs/bell-1.ogg similarity index 100% rename from resourcepack/assets/event/sounds/bell/bell-1.ogg rename to original_sounds/songs/bell-1.ogg diff --git a/resourcepack/assets/event/sounds/einstieg/einstieg.ogg b/original_sounds/songs/einstieg.ogg similarity index 100% rename from resourcepack/assets/event/sounds/einstieg/einstieg.ogg rename to original_sounds/songs/einstieg.ogg diff --git a/original_sounds/songs/freue_dich_welt.ogg b/original_sounds/songs/freue_dich_welt.ogg new file mode 100644 index 0000000..638ba54 Binary files /dev/null and b/original_sounds/songs/freue_dich_welt.ogg differ diff --git a/original_sounds/songs/fuerchte_dich_nicht.ogg b/original_sounds/songs/fuerchte_dich_nicht.ogg new file mode 100644 index 0000000..88dde06 Binary files /dev/null and b/original_sounds/songs/fuerchte_dich_nicht.ogg differ diff --git a/original_sounds/songs/immanuel.ogg b/original_sounds/songs/immanuel.ogg new file mode 100644 index 0000000..00a7fe9 Binary files /dev/null and b/original_sounds/songs/immanuel.ogg differ diff --git a/original_sounds/songs/jingle_bell_rock.ogg b/original_sounds/songs/jingle_bell_rock.ogg new file mode 100644 index 0000000..937adcb Binary files /dev/null and b/original_sounds/songs/jingle_bell_rock.ogg differ diff --git a/original_sounds/songs/joy_to_the_world.ogg b/original_sounds/songs/joy_to_the_world.ogg new file mode 100644 index 0000000..6323ed7 Binary files /dev/null and b/original_sounds/songs/joy_to_the_world.ogg differ diff --git a/original_sounds/songs/let_it_snow.ogg b/original_sounds/songs/let_it_snow.ogg new file mode 100644 index 0000000..05fb649 Binary files /dev/null and b/original_sounds/songs/let_it_snow.ogg differ diff --git a/original_sounds/songs/manger_throne.ogg b/original_sounds/songs/manger_throne.ogg new file mode 100644 index 0000000..8b57498 Binary files /dev/null and b/original_sounds/songs/manger_throne.ogg differ diff --git a/original_sounds/songs/merry_crsitmas_everyone.ogg b/original_sounds/songs/merry_crsitmas_everyone.ogg new file mode 100644 index 0000000..c3442e0 Binary files /dev/null and b/original_sounds/songs/merry_crsitmas_everyone.ogg differ diff --git a/resourcepack/assets/event/sounds/oh-du-froehliche/oh-du-froehliche.ogg b/original_sounds/songs/oh-du-froehliche.ogg similarity index 100% rename from resourcepack/assets/event/sounds/oh-du-froehliche/oh-du-froehliche.ogg rename to original_sounds/songs/oh-du-froehliche.ogg diff --git a/resourcepack/assets/event/sounds/praise/praise.ogg b/original_sounds/songs/praise.ogg similarity index 100% rename from resourcepack/assets/event/sounds/praise/praise.ogg rename to original_sounds/songs/praise.ogg diff --git a/resourcepack/assets/event/sounds/waymaker/waymaker.ogg b/original_sounds/songs/waymaker.ogg similarity index 100% rename from resourcepack/assets/event/sounds/waymaker/waymaker.ogg rename to original_sounds/songs/waymaker.ogg diff --git a/resourcepack/assets/event/sounds/zweifel/zweifel.ogg b/original_sounds/songs/zweifel.ogg similarity index 100% rename from resourcepack/assets/event/sounds/zweifel/zweifel.ogg rename to original_sounds/songs/zweifel.ogg diff --git a/resourcepack/assets/event/sounds.json b/resourcepack/assets/event/sounds.json index ecaba96..2669f2a 100644 --- a/resourcepack/assets/event/sounds.json +++ b/resourcepack/assets/event/sounds.json @@ -1,32 +1,192 @@ { + "a_crandle_in_bethlehem": { + "sounds": [ + "event:songs/a_crandle_in_bethlemheleme" + ] + }, "bell": { "sounds": [ - "event:bell/bell-1" + "event:songs/bell-1" ] }, "einstieg": { "sounds": [ - "event:einstieg/einstieg" + "event:songs/einstieg" ] }, "oh-du-froehliche": { "sounds": [ - "event:oh-du-froehliche/oh-du-froehliche" + "event:songs/oh-du-froehliche" ] }, "praise": { "sounds": [ - "event:praise/praise" + "event:songs/praise" ] }, "waymaker": { "sounds": [ - "event:waymaker/waymaker" + "event:songs/waymaker" ] }, "zweifel": { "sounds": [ - "event:zweifel/zweifel" + "event:songs/zweifel" + ] + }, + "freue_dich_welt": { + "sounds": [ + "event:songs/freue_dich_welt" + ] + }, + "fuerchte_dich_nicht": { + "sounds": [ + "event:songs/fuerchte_dich_nicht" + ] + }, + "immanuel": { + "sounds": [ + "event:songs/immanuel" + ] + }, + "jingle_bell_rock": { + "sounds": [ + "event:songs/jingle_bell_rock" + ] + }, + "joy_to_the_world": { + "sounds": [ + "event:songs/joy_to_the_worldt" + ] + }, + "let_it_snow": { + "sounds": [ + "event:songs/let_it_snow" + ] + }, + "manger_throne": { + "sounds": [ + "event:songs/manger_throne" + ] + }, + "merry_crsitmas_everyone": { + "sounds": [ + "event:songs/merry_crsitmas_everyone" + ] + }, + "angel_1": { + "sounds": [ + "event:w25_angel/angel_1" + ] + }, + "angel_2": { + "sounds": [ + "event:w25_angel/angel_2" + ] + }, + "angel_3": { + "sounds": [ + "event:w25_angel/angel_3" + ] + }, + "angel_4": { + "sounds": [ + "event:w25_angel/angel_4" + ] + }, + "angel_5": { + "sounds": [ + "event:w25_angel/angel_5" + ] + }, + "angel_6": { + "sounds": [ + "event:w25_angel/angel_6" + ] + }, + "angel_7": { + "sounds": [ + "event:w25_angel/angel_7" + ] + }, + "angel_8": { + "sounds": [ + "event:w25_angel/angel_8" + ] + }, + "angel_9": { + "sounds": [ + "event:w25_angel/angel_9" + ] + }, + "angel_10": { + "sounds": [ + "event:w25_angel/angel_10" + ] + }, + "angel_11": { + "sounds": [ + "event:w25_angel/angel_11" + ] + }, + "angel_12": { + "sounds": [ + "event:w25_angel/angel_12" + ] + }, + "angel_13": { + "sounds": [ + "event:w25_angel/angel_13" + ] + }, + "angel_14": { + "sounds": [ + "event:w25_angel/angel_14" + ] + }, + "angel_15": { + "sounds": [ + "event:w25_angel/angel_15" + ] + }, + "angel_16": { + "sounds": [ + "event:w25_angel/angel_16" + ] + }, + "angel_17": { + "sounds": [ + "event:w25_angel/angel_17" + ] + }, + "angel_18": { + "sounds": [ + "event:w25_angel/angel_18" + ] + }, + "angel_19": { + "sounds": [ + "event:w25_angel/angel_19" + ] + }, + "angel_20": { + "sounds": [ + "event:w25_angel/angel_20" + ] + }, + "angel_21": { + "sounds": [ + "event:w25_angel/angel_21" + ] + }, + "angel_22": { + "sounds": [ + "event:w25_angel/angel_22" + ] + }, + "angel_23": { + "sounds": [ + "event:w25_angel/angel_23" ] } -} +} \ No newline at end of file diff --git a/resourcepack/assets/event/sounds/songs/a_crandle_in_bethlemheleme.ogg b/resourcepack/assets/event/sounds/songs/a_crandle_in_bethlemheleme.ogg new file mode 100644 index 0000000..556a4cc Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/a_crandle_in_bethlemheleme.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/bell-1.ogg b/resourcepack/assets/event/sounds/songs/bell-1.ogg new file mode 100644 index 0000000..d2fd865 Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/bell-1.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/einstieg.ogg b/resourcepack/assets/event/sounds/songs/einstieg.ogg new file mode 100644 index 0000000..8212b62 Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/einstieg.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/freue_dich_welt.ogg b/resourcepack/assets/event/sounds/songs/freue_dich_welt.ogg new file mode 100644 index 0000000..9fe5b1a Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/freue_dich_welt.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/fuerchte_dich_nicht.ogg b/resourcepack/assets/event/sounds/songs/fuerchte_dich_nicht.ogg new file mode 100644 index 0000000..40b22f0 Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/fuerchte_dich_nicht.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/immanuel.ogg b/resourcepack/assets/event/sounds/songs/immanuel.ogg new file mode 100644 index 0000000..c6bb5ef Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/immanuel.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/jingle_bell_rock.ogg b/resourcepack/assets/event/sounds/songs/jingle_bell_rock.ogg new file mode 100644 index 0000000..032ab50 Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/jingle_bell_rock.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/joy_to_the_world.ogg b/resourcepack/assets/event/sounds/songs/joy_to_the_world.ogg new file mode 100644 index 0000000..8e7e070 Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/joy_to_the_world.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/let_it_snow.ogg b/resourcepack/assets/event/sounds/songs/let_it_snow.ogg new file mode 100644 index 0000000..2b29cbd Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/let_it_snow.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/manger_throne.ogg b/resourcepack/assets/event/sounds/songs/manger_throne.ogg new file mode 100644 index 0000000..6e1a7a4 Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/manger_throne.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/merry_crsitmas_everyone.ogg b/resourcepack/assets/event/sounds/songs/merry_crsitmas_everyone.ogg new file mode 100644 index 0000000..e131f46 Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/merry_crsitmas_everyone.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/oh-du-froehliche.ogg b/resourcepack/assets/event/sounds/songs/oh-du-froehliche.ogg new file mode 100644 index 0000000..e9d5c6d Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/oh-du-froehliche.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/praise.ogg b/resourcepack/assets/event/sounds/songs/praise.ogg new file mode 100644 index 0000000..b359cde Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/praise.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/waymaker.ogg b/resourcepack/assets/event/sounds/songs/waymaker.ogg new file mode 100644 index 0000000..98921f1 Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/waymaker.ogg differ diff --git a/resourcepack/assets/event/sounds/songs/zweifel.ogg b/resourcepack/assets/event/sounds/songs/zweifel.ogg new file mode 100644 index 0000000..9e67f68 Binary files /dev/null and b/resourcepack/assets/event/sounds/songs/zweifel.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_1.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_1.ogg new file mode 100644 index 0000000..d5344d9 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_1.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_10.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_10.ogg new file mode 100644 index 0000000..e8aa580 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_10.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_11.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_11.ogg new file mode 100644 index 0000000..6a99326 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_11.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_12.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_12.ogg new file mode 100644 index 0000000..49de5f3 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_12.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_13.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_13.ogg new file mode 100644 index 0000000..6728a88 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_13.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_14.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_14.ogg new file mode 100644 index 0000000..96000f9 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_14.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_15.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_15.ogg new file mode 100644 index 0000000..8e379dc Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_15.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_16.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_16.ogg new file mode 100644 index 0000000..e66df2d Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_16.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_17.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_17.ogg new file mode 100644 index 0000000..4eaaae4 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_17.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_18.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_18.ogg new file mode 100644 index 0000000..db705b8 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_18.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_19.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_19.ogg new file mode 100644 index 0000000..2279546 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_19.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_2.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_2.ogg new file mode 100644 index 0000000..424451d Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_2.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_20.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_20.ogg new file mode 100644 index 0000000..beda840 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_20.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_21.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_21.ogg new file mode 100644 index 0000000..d293de6 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_21.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_22.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_22.ogg new file mode 100644 index 0000000..ebb1a5e Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_22.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_23.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_23.ogg new file mode 100644 index 0000000..5b370bb Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_23.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_3.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_3.ogg new file mode 100644 index 0000000..2c2db04 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_3.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_4.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_4.ogg new file mode 100644 index 0000000..8eee58a Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_4.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_5.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_5.ogg new file mode 100644 index 0000000..5e175f9 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_5.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_6.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_6.ogg new file mode 100644 index 0000000..570e095 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_6.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_7.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_7.ogg new file mode 100644 index 0000000..c150fca Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_7.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_8.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_8.ogg new file mode 100644 index 0000000..18397ad Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_8.ogg differ diff --git a/resourcepack/assets/event/sounds/w25_angel/angel_9.ogg b/resourcepack/assets/event/sounds/w25_angel/angel_9.ogg new file mode 100644 index 0000000..544d4b5 Binary files /dev/null and b/resourcepack/assets/event/sounds/w25_angel/angel_9.ogg differ diff --git a/resourcepack/assets/minecraft/items/apple.json b/resourcepack/assets/minecraft/items/apple.json new file mode 100644 index 0000000..743a529 --- /dev/null +++ b/resourcepack/assets/minecraft/items/apple.json @@ -0,0 +1,75 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/ox_tongue_powder" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "item/apple_stage0" + } + }, + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "item/apple_stage1" + } + }, + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "item/apple_stage2" + } + }, + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "item/apple_stage3" + } + }, + { + "threshold": 0, + "model": { + "type": "minecraft:model", + "model": "item/apple_stage4" + } + }, + { + "threshold": 7, + "model": { + "type": "minecraft:model", + "model": "item/apple_stage5" + } + }, + { + "threshold": 8, + "model": { + "type": "minecraft:model", + "model": "item/apple_stage6" + } + }, + { + "threshold": 9, + "model": { + "type": "minecraft:model", + "model": "item/apple_stage7" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/apple" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/barrier.json b/resourcepack/assets/minecraft/items/barrier.json new file mode 100644 index 0000000..3f90083 --- /dev/null +++ b/resourcepack/assets/minecraft/items/barrier.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "item/barrier/check" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/bucket.json b/resourcepack/assets/minecraft/items/bucket.json new file mode 100644 index 0000000..70ba7d9 --- /dev/null +++ b/resourcepack/assets/minecraft/items/bucket.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/bucket/empty_wine_bottle" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/bucket" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/carrot.json b/resourcepack/assets/minecraft/items/carrot.json new file mode 100644 index 0000000..56d8cc1 --- /dev/null +++ b/resourcepack/assets/minecraft/items/carrot.json @@ -0,0 +1,26 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/carrot/celery" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "item/carrot/celery_block" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/carrot" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/cooked_mutton.json b/resourcepack/assets/minecraft/items/cooked_mutton.json new file mode 100644 index 0000000..5341db5 --- /dev/null +++ b/resourcepack/assets/minecraft/items/cooked_mutton.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/cooked_mutton/cooked_lamb_gigot" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/cooked_mutton" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/dandelion.json b/resourcepack/assets/minecraft/items/dandelion.json new file mode 100644 index 0000000..be8ccaf --- /dev/null +++ b/resourcepack/assets/minecraft/items/dandelion.json @@ -0,0 +1,26 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/dandelion/ox_tongue" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "item/dandelion/ox_tongue_block" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/dandelion" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/diamond_sword.json b/resourcepack/assets/minecraft/items/diamond_sword.json new file mode 100644 index 0000000..963f002 --- /dev/null +++ b/resourcepack/assets/minecraft/items/diamond_sword.json @@ -0,0 +1,33 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "item/diamond_sword/roemerspeeer" + } + }, + { + "threshold": 5, + "model": { + "type": "minecraft:model", + "model": "item/diamond_sword/ninjasword1" + } + }, + { + "threshold": 6, + "model": { + "type": "minecraft:model", + "model": "item/diamond_sword/ninjasword2" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/diamond_sword" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/iron_sword.json b/resourcepack/assets/minecraft/items/iron_sword.json new file mode 100644 index 0000000..5cffc96 --- /dev/null +++ b/resourcepack/assets/minecraft/items/iron_sword.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/iron_sword/epic_sword" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/iron_sword" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/milk_bucket.json b/resourcepack/assets/minecraft/items/milk_bucket.json new file mode 100644 index 0000000..b08ee70 --- /dev/null +++ b/resourcepack/assets/minecraft/items/milk_bucket.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/milk_bucket/wine" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/milk_bucket" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/mutton.json b/resourcepack/assets/minecraft/items/mutton.json new file mode 100644 index 0000000..000c552 --- /dev/null +++ b/resourcepack/assets/minecraft/items/mutton.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/mutton/lamb_gigot" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/mutton" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/paper.json b/resourcepack/assets/minecraft/items/paper.json new file mode 100644 index 0000000..61a149f --- /dev/null +++ b/resourcepack/assets/minecraft/items/paper.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/paper/crank" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/paper" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/pitcher_plant.json b/resourcepack/assets/minecraft/items/pitcher_plant.json new file mode 100644 index 0000000..0063ab6 --- /dev/null +++ b/resourcepack/assets/minecraft/items/pitcher_plant.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "item/fern_icon" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/sugar.json b/resourcepack/assets/minecraft/items/sugar.json new file mode 100644 index 0000000..19816e1 --- /dev/null +++ b/resourcepack/assets/minecraft/items/sugar.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/sugar/flour" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/sugar" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/sweet_berries.json b/resourcepack/assets/minecraft/items/sweet_berries.json new file mode 100644 index 0000000..1b5405b --- /dev/null +++ b/resourcepack/assets/minecraft/items/sweet_berries.json @@ -0,0 +1,33 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/sweet_berries/grapes" + } + }, + { + "threshold": 2, + "model": { + "type": "minecraft:model", + "model": "item/sweet_berries/grapes_block" + } + }, + { + "threshold": 3, + "model": { + "type": "minecraft:model", + "model": "item/sweet_berries/empty_grapes_block" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/sweet_berries" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/items/wooden_hoe.json b/resourcepack/assets/minecraft/items/wooden_hoe.json new file mode 100644 index 0000000..3523a40 --- /dev/null +++ b/resourcepack/assets/minecraft/items/wooden_hoe.json @@ -0,0 +1,19 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "property": "minecraft:custom_model_data", + "entries": [ + { + "threshold": 1, + "model": { + "type": "minecraft:model", + "model": "item/cannon" + } + } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/wooden_hoe" + } + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/lang/de_de.json b/resourcepack/assets/minecraft/lang/de_de.json deleted file mode 100644 index a3fdb10..0000000 --- a/resourcepack/assets/minecraft/lang/de_de.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "block.minecraft.pitcher_plant": "Weißer Fern - custom" -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/lang/en_us.json b/resourcepack/assets/minecraft/lang/en_us.json deleted file mode 100644 index d768c07..0000000 --- a/resourcepack/assets/minecraft/lang/en_us.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "block.minecraft.pitcher_plant": "White Fern - custom" -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/copper_grate.json b/resourcepack/assets/minecraft/models/block/copper_grate.json new file mode 100644 index 0000000..334210a --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/copper_grate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "minecraft:block/al" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/block/weathered_copper_grate.json b/resourcepack/assets/minecraft/models/block/weathered_copper_grate.json new file mode 100644 index 0000000..7edd5c8 --- /dev/null +++ b/resourcepack/assets/minecraft/models/block/weathered_copper_grate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "minecraft:block/fal" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/apple.json b/resourcepack/assets/minecraft/models/item/apple.json index 44d32a5..3a710b6 100644 --- a/resourcepack/assets/minecraft/models/item/apple.json +++ b/resourcepack/assets/minecraft/models/item/apple.json @@ -8,47 +8,47 @@ "predicate": { "custom_model_data": 1 }, - "model": "item/apple/ox_tongue_powder" + "model": "item/ox_tongue_powder" },{ "predicate": { "custom_model_data": 2 }, - "model": "item/apple/apple_stage0" + "model": "item/apple_stage0" },{ "predicate": { "custom_model_data": 3 }, - "model": "item/apple/apple_stage1" + "model": "item/apple_stage1" },{ "predicate": { "custom_model_data": 4 }, - "model": "item/apple/apple_stage2" + "model": "item/apple_stage2" },{ "predicate": { "custom_model_data": 5 }, - "model": "item/apple/apple_stage3" + "model": "item/apple_stage3" },{ "predicate": { "custom_model_data": 6 }, - "model": "item/apple/apple_stage4" + "model": "item/apple_stage4" },{ "predicate": { "custom_model_data": 7 }, - "model": "item/apple/apple_stage5" + "model": "item/apple_stage5" },{ "predicate": { "custom_model_data": 8 }, - "model": "item/apple/apple_stage6" + "model": "item/apple_stage6" },{ "predicate": { "custom_model_data": 9 }, - "model": "item/apple/apple_stage7" + "model": "item/apple_stage7" } ] } diff --git a/resourcepack/assets/minecraft/models/item/apple_stage0.json b/resourcepack/assets/minecraft/models/item/apple_stage0.json new file mode 100644 index 0000000..c42a2f7 --- /dev/null +++ b/resourcepack/assets/minecraft/models/item/apple_stage0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/apple_stage0" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/apple_stage1.json b/resourcepack/assets/minecraft/models/item/apple_stage1.json new file mode 100644 index 0000000..295ce39 --- /dev/null +++ b/resourcepack/assets/minecraft/models/item/apple_stage1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/apple_stage1" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/apple_stage2.json b/resourcepack/assets/minecraft/models/item/apple_stage2.json new file mode 100644 index 0000000..d5e3c3d --- /dev/null +++ b/resourcepack/assets/minecraft/models/item/apple_stage2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/apple_stage2" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/apple_stage3.json b/resourcepack/assets/minecraft/models/item/apple_stage3.json new file mode 100644 index 0000000..f5d728a --- /dev/null +++ b/resourcepack/assets/minecraft/models/item/apple_stage3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/apple_stage3" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/apple_stage4.json b/resourcepack/assets/minecraft/models/item/apple_stage4.json new file mode 100644 index 0000000..d080d36 --- /dev/null +++ b/resourcepack/assets/minecraft/models/item/apple_stage4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/apple_stage4" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/apple_stage5.json b/resourcepack/assets/minecraft/models/item/apple_stage5.json new file mode 100644 index 0000000..0bdefc1 --- /dev/null +++ b/resourcepack/assets/minecraft/models/item/apple_stage5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/apple_stage5" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/apple_stage6.json b/resourcepack/assets/minecraft/models/item/apple_stage6.json new file mode 100644 index 0000000..b17fd68 --- /dev/null +++ b/resourcepack/assets/minecraft/models/item/apple_stage6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/apple_stage6" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/apple_stage7.json b/resourcepack/assets/minecraft/models/item/apple_stage7.json new file mode 100644 index 0000000..3c75766 --- /dev/null +++ b/resourcepack/assets/minecraft/models/item/apple_stage7.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/apple_stage7" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/ox_tongue_powder.json b/resourcepack/assets/minecraft/models/item/ox_tongue_powder.json new file mode 100644 index 0000000..396bdc4 --- /dev/null +++ b/resourcepack/assets/minecraft/models/item/ox_tongue_powder.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "item/apple/ox_tongue_powder" + } +} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/textures/block/al.png b/resourcepack/assets/minecraft/textures/block/al.png new file mode 100644 index 0000000..c63448b Binary files /dev/null and b/resourcepack/assets/minecraft/textures/block/al.png differ diff --git a/resourcepack/assets/minecraft/textures/block/fal.png b/resourcepack/assets/minecraft/textures/block/fal.png new file mode 100644 index 0000000..a176e16 Binary files /dev/null and b/resourcepack/assets/minecraft/textures/block/fal.png differ diff --git a/resourcepack/assets/minecraft/textures/godi/fern_item.png b/resourcepack/assets/minecraft/textures/block/fern_item.png similarity index 100% rename from resourcepack/assets/minecraft/textures/godi/fern_item.png rename to resourcepack/assets/minecraft/textures/block/fern_item.png diff --git a/resourcepack/assets/minecraft/textures/block/sweet_berry_bush_stage3.png b/resourcepack/assets/minecraft/textures/block/sweet_berry_bush_stage3.png index 8b93067..518e6de 100644 Binary files a/resourcepack/assets/minecraft/textures/block/sweet_berry_bush_stage3.png and b/resourcepack/assets/minecraft/textures/block/sweet_berry_bush_stage3.png differ diff --git a/resourcepack/assets/minecraft/textures/godi/large_fern_bottom.png b/resourcepack/assets/minecraft/textures/godi/large_fern_bottom.png deleted file mode 100644 index f23a222..0000000 Binary files a/resourcepack/assets/minecraft/textures/godi/large_fern_bottom.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/godi/large_fern_top.png b/resourcepack/assets/minecraft/textures/godi/large_fern_top.png deleted file mode 100644 index 240ab15..0000000 Binary files a/resourcepack/assets/minecraft/textures/godi/large_fern_top.png and /dev/null differ diff --git a/resourcepack/pack.mcmeta b/resourcepack/pack.mcmeta index 522b6d8..a553eb0 100644 --- a/resourcepack/pack.mcmeta +++ b/resourcepack/pack.mcmeta @@ -1,6 +1,8 @@ { - "pack": { - "pack_format": 34, - "description": "Canstein Event Resourcepack (v. 2024-0.2)" - } -} + "pack": { + "description": "Canstein Event Resourcepack (v. 2025-0.2-dev)", + "pack_format": 34, + "min_format": 34, + "max_format": 75 + } +} \ No newline at end of file