6b87d85

src/net/bowmap/network/registry.clj modified (view file)

@@ -2,6 +2,8 @@   (:require    [net.bowmap.network.chunk :as chunk])) +(def null-sound {:sound_id "bowmap:null"})+ ;; Some way to keep track of order of these things and make that clear... ;; Probably a map of id -> order? ;; So maybe this needs to be a macro or something idk@@ -46,7 +48,7 @@                                     "resin" {:asset_name "null"                                              :description {:color "#000000" :translate "bowmap.null"}}} -                   "dimension_type" {"world" {:ambient_light 0.0+                   "dimension_type" {"world" {:ambient_light 1.0                                               :attributes {}                                               :coordinate_scale 1.0                                               :has_ceiling false@@ -59,42 +61,42 @@                                               :monster_spawn_block_light_limit 0                                               :monster_spawn_light_level 0}} -                   "cat_variant" {"cats" {:asset_id "cat"-                                          :baby_asset_id "cat"+                   "cat_variant" {"cats" {:asset_id "null"+                                          :baby_asset_id "null"                                           :spawn_conditions []}} -                   "chicken_variant" {"temperate" {:asset_id "chicken"-                                                   :baby_asset_id "chicken"+                   "chicken_variant" {"temperate" {:asset_id "null"+                                                   :baby_asset_id "null"                                                    :model "normal"                                                    :spawn_conditions []}-                                      "cold" {:asset_id "chicken"-                                              :baby_asset_id "chicken"+                                      "cold" {:asset_id "null"+                                              :baby_asset_id "null"                                               :model "normal"                                               :spawn_conditions []}-                                      "warm" {:asset_id "chicken"-                                              :baby_asset_id "chicken"+                                      "warm" {:asset_id "null"+                                              :baby_asset_id "null"                                               :model "normal"                                               :spawn_conditions []}} -                   "cow_variant" {"cow" {:asset_id "cow"-                                         :baby_asset_id "cow"+                   "cow_variant" {"cow" {:asset_id "null"+                                         :baby_asset_id "null"                                          :model "normal"                                          :spawn_conditions []}} -                   "frog_variant" {"frog" {:asset_id "frog"+                   "frog_variant" {"frog" {:asset_id "null"                                            :spawn_condition []}} -                   "pig_variant" {"pig" {:asset_id "pig"-                                         :baby_asset_id "pig"+                   "pig_variant" {"pig" {:asset_id "null"+                                         :baby_asset_id "null"                                          :model "normal"                                          :spawn_conditions []}} -                   "wolf_variant" {"wolf" {:assets {:angry "minecraft:angry"-                                                    :tame "minecraft:tame"-                                                    :wild "minecraft:wild"}-                                           :baby_assets {:angry "minecraft:angry"-                                                         :tame "minecraft:tame"-                                                         :wild "minecraft:wild"}+                   "wolf_variant" {"wolf" {:assets {:angry "null"+                                                    :tame "null"+                                                    :wild "null"}+                                           :baby_assets {:angry "null"+                                                         :tame "null"+                                                         :wild "null"}                                            :spawn_conditions []}}                     "painting_variant" {"painting" {:asset_id "painting"@@ -103,98 +105,100 @@                                                    :title "Fred"                                                    :author "Lucy"}} -                   "cat_sound_variant" {"cat" {:adult_sounds {:ambient_sound "minecraft:entity.cat.ambient"-                                                              :beg_for_food_sound "minecraft:entity.cat.ambient"-                                                              :death_sound "minecraft:entity.cat.ambient"-                                                              :eat_sound "minecraft:entity.cat.ambient"-                                                              :hiss_sound "minecraft:entity.cat.ambient"-                                                              :hurt_sound "minecraft:entity.cat.ambient"-                                                              :purr_sound "minecraft:entity.cat.ambient"-                                                              :purreow_sound "minecraft:entity.cat.ambient"-                                                              :stray_ambient_sound "minecraft:entity.cat.ambient"}-                                               :baby_sounds {:ambient_sound "minecraft:entity.cat.ambient"-                                                             :beg_for_food_sound "minecraft:entity.cat.ambient"-                                                             :death_sound "minecraft:entity.cat.ambient"-                                                             :eat_sound "minecraft:entity.cat.ambient"-                                                             :hiss_sound "minecraft:entity.cat.ambient"-                                                             :hurt_sound "minecraft:entity.cat.ambient"-                                                             :purr_sound "minecraft:entity.cat.ambient"-                                                             :purreow_sound "minecraft:entity.cat.ambient"-                                                             :stray_ambient_sound "minecraft:entity.cat.ambient"}}}+                   "cat_sound_variant" {"cat" {:adult_sounds {:ambient_sound null-sound+                                                              :beg_for_food_sound null-sound+                                                              :death_sound null-sound+                                                              :eat_sound null-sound+                                                              :hiss_sound null-sound+                                                              :hurt_sound null-sound+                                                              :purr_sound null-sound+                                                              :purreow_sound null-sound+                                                              :stray_ambient_sound null-sound}+                                               :baby_sounds {:ambient_sound null-sound+                                                             :beg_for_food_sound null-sound+                                                             :death_sound null-sound+                                                             :eat_sound null-sound+                                                             :hiss_sound null-sound+                                                             :hurt_sound null-sound+                                                             :purr_sound null-sound+                                                             :purreow_sound null-sound+                                                             :stray_ambient_sound null-sound}}} -                   "chicken_sound_variant" {"chicken" {:adult_sounds {:ambient_sound "minecraft:entity.chicken.ambient"-                                                                      :death_sound "minecraft:entity.chicken.ambient"-                                                                      :hurt_sound "minecraft:entity.chicken.ambient"-                                                                      :step_sound "minecraft:entity.chicken.ambient"}-                                                       :baby_sounds {:ambient_sound "minecraft:entity.chicken.ambient"-                                                                     :death_sound "minecraft:entity.chicken.ambient"-                                                                     :hurt_sound "minecraft:entity.chicken.ambient"-                                                                     :step_sound "minecraft:entity.chicken.ambient"}}}-                   "cow_sound_variant" {"cow" {:ambient_sound "minecraft:entity.cow.ambient"-                                               :death_sound "minecraft:entity.cow.ambient"-                                               :hurt_sound "minecraft:entity.cow.ambient"-                                               :step_sound "minecraft:entity.cow.ambient"}}-                   "pig_sound_variant" {"pig" {:adult_sounds {:ambient_sound "minecraft:entity.pig.ambient"-                                                              :death_sound "minecraft:entity.pig.ambient"-                                                              :eat_sound "minecraft:entity.pig.ambient"-                                                              :hurt_sound "minecraft:entity.pig.ambient"-                                                              :step_sound "minecraft:entity.pig.ambient"}-                                               :baby_sounds {:ambient_sound "minecraft:entity.pig.ambient"-                                                             :death_sound "minecraft:entity.pig.ambient"-                                                             :eat_sound "minecraft:entity.pig.ambient"-                                                             :hurt_sound "minecraft:entity.pig.ambient"-                                                             :step_sound "minecraft:entity.pig.ambient"}}}+                   "chicken_sound_variant" {"chicken" {:adult_sounds {:ambient_sound null-sound+                                                                      :death_sound null-sound+                                                                      :hurt_sound null-sound+                                                                      :step_sound null-sound}+                                                       :baby_sounds {:ambient_sound null-sound+                                                                     :death_sound null-sound+                                                                     :hurt_sound null-sound+                                                                     :step_sound null-sound}}}+                   "cow_sound_variant" {"cow" {:ambient_sound null-sound+                                               :death_sound null-sound+                                               :hurt_sound null-sound+                                               :step_sound null-sound}}+                   "pig_sound_variant" {"pig" {:adult_sounds {:ambient_sound null-sound+                                                              :death_sound null-sound+                                                              :eat_sound null-sound+                                                              :hurt_sound null-sound+                                                              :step_sound null-sound}+                                               :baby_sounds {:ambient_sound null-sound+                                                             :death_sound null-sound+                                                             :eat_sound null-sound+                                                             :hurt_sound null-sound+                                                             :step_sound null-sound}}}  -                   "zombie_nautilus_variant" {"warm" {:asset_id "minecraft:entity/nautilus/zombie_nautilus"+                   "zombie_nautilus_variant" {"warm" {:asset_id "null"                                                       :spawn_conditions []}} -                   "jukebox_song" {"5" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "creator_music_box" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "11" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "13" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "blocks" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "bounce" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "cat" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "chirp" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "creator" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "far" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "lava_chicken" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "mall" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "mellohi" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "otherside" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "pigstep" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "precipice" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "relic" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "stal" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "strad" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "tears" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "wait" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}-                                   "ward" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event "minecraft:music_disc.5"}}+                   "jukebox_song" {"5" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "creator_music_box" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "11" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "13" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "blocks" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "bounce" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "cat" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "chirp" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "creator" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "far" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "lava_chicken" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "mall" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "mellohi" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "otherside" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "pigstep" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "precipice" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "relic" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "stal" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "strad" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "tears" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "wait" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}+                                   "ward" {:comparator_output 1 :description {:translate "bowmap.null"} :length_in_seconds 1.0 :sound_event null-sound}}                     "instrument" {"ponder_goat_horn" {:description {:translate "bowmap.null"}                                                      :range 1.0,-                                                     :sound_event "minecraft:block.note_block.harp"+                                                     :sound_event null-sound                                                      :use_duration 1.0}}  -                   "wolf_sound_variant" {"angry" {:adult_sounds {:ambient_sound "minecraft:entity.wolf.ambient"-                                                                 :death_sound "minecraft:entity.wolf.ambient"-                                                                 :growl_sound "minecraft:entity.wolf.ambient"-                                                                 :hurt_sound "minecraft:entity.wolf.ambient"-                                                                 :pant_sound "minecraft:entity.wolf.ambient"-                                                                 :step_sound "minecraft:entity.wolf.ambient"-                                                                 :whine_sound "minecraft:entity.wolf.ambient"}-                                                  :baby_sounds {:ambient_sound "minecraft:entity.wolf.ambient"-                                                                :death_sound "minecraft:entity.wolf.ambient"-                                                                :growl_sound "minecraft:entity.wolf.ambient"-                                                                :hurt_sound "minecraft:entity.wolf.ambient"-                                                                :pant_sound "minecraft:entity.wolf.ambient"-                                                                :step_sound "minecraft:entity.wolf.ambient"-                                                                :whine_sound "minecraft:entity.wolf.ambient"}}}]))+                   "wolf_sound_variant" {"angry" {:adult_sounds {:ambient_sound null-sound+                                                                 :death_sound null-sound+                                                                 :growl_sound null-sound+                                                                 :hurt_sound null-sound+                                                                 :pant_sound null-sound+                                                                 :step_sound null-sound+                                                                 :whine_sound null-sound}+                                                  :baby_sounds {:ambient_sound null-sound+                                                                :death_sound null-sound+                                                                :growl_sound null-sound+                                                                :hurt_sound null-sound+                                                                :pant_sound null-sound+                                                                :step_sound null-sound+                                                                :whine_sound null-sound}}}]))  ;; Make a map of ids -> order ; This probably has to be per-client since different clients could have different registries+; Actually, that is silly :p+; Make it a global registry and build it from the above data. #_(defn registry-id     "Function to get the ordered numerical id from a given registry id"     [id])