From aed14255c52607871e0b493bc64528d25f9c68a8 Mon Sep 17 00:00:00 2001 From: Frederox <69014593+FrederoxGit@users.noreply.github.com> Date: Thu, 26 Aug 2021 10:58:28 +0100 Subject: [PATCH] v1.0.2 --- .bridge/extensions/SkeletonPreset/.installed | 0 .../extensions/SkeletonPreset/manifest.json | 13 + .../presets/skeleton/animation.json | 16 + .../skeleton/animation_controller.json | 13 + .../presets/skeleton/client_entity.json | 63 +++ .../presets/skeleton/en_US.lang | 2 + .../presets/skeleton/entity.json | 503 ++++++++++++++++++ .../presets/skeleton/geometry.json | 121 +++++ .../SkeletonPreset/presets/skeleton/icon.png | Bin 0 -> 540 bytes .../presets/skeleton/item_texture.json | 7 + .../presets/skeleton/loot_table.json | 56 ++ .../presets/skeleton/loot_table_gear.json | 69 +++ .../presets/skeleton/manifest.json | 86 +++ .../presets/skeleton/render_controller.json | 10 + .../presets/skeleton/sounds.json | 26 + .../presets/skeleton/spawn_rule.json | 67 +++ .../presets/skeleton/texture.png | Bin 0 -> 1407 bytes BP/animations/launch_mars.json | 2 + BP/animations/launch_moon.json | 2 + BP/animations/launch_overworld.json | 2 + .../entity/rocket_launch_controller.ts | 2 +- BP/entities/space_zombie.json | 5 +- BP/functions/mars/mars.mcfunction | 4 +- BP/manifest.json | 6 +- BP/texts/en_US.lang | 2 +- RP/fogs/mars.json | 8 +- RP/manifest.json | 4 +- RP/texts/en_US.lang | 2 +- RP/ui/debug_screen.json | 2 +- 29 files changed, 1077 insertions(+), 16 deletions(-) create mode 100644 .bridge/extensions/SkeletonPreset/.installed create mode 100644 .bridge/extensions/SkeletonPreset/manifest.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/animation.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/animation_controller.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/client_entity.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/en_US.lang create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/entity.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/geometry.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/icon.png create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/item_texture.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/loot_table.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/loot_table_gear.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/manifest.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/render_controller.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/sounds.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/spawn_rule.json create mode 100644 .bridge/extensions/SkeletonPreset/presets/skeleton/texture.png diff --git a/.bridge/extensions/SkeletonPreset/.installed b/.bridge/extensions/SkeletonPreset/.installed new file mode 100644 index 0000000..e69de29 diff --git a/.bridge/extensions/SkeletonPreset/manifest.json b/.bridge/extensions/SkeletonPreset/manifest.json new file mode 100644 index 0000000..c159ee5 --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/manifest.json @@ -0,0 +1,13 @@ +{ + "author": "Chikorita-Lover", + "name": "Skeleton Preset", + "version": "1.0.0", + "id": "1be48056-4767-442c-a145-eb45f4df7fc1", + "description": "Adds a skeleton preset.", + "api_version": 2, + "target": "v2", + "tags": [ + "Presets" + ], + "releaseTimestamp": 1615227999474 +} \ No newline at end of file diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/animation.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/animation.json new file mode 100644 index 0000000..14b9248 --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/animation.json @@ -0,0 +1,16 @@ +{ + "format_version" : "1.8.0", + "animations" : { + "animation.{{IDENTIFIER}}.attack" : { + "loop" : true, + "bones" : { + "leftarm" : { + "rotation" : [ "-68.75 * math.sin(variable.attack_time * 180.0) + 22.92 * (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0))", "5.73 - math.sin(variable.attack_time * 180.0) * 34.38 - this", "-this" ] + }, + "rightarm" : { + "rotation" : [ "-68.75 * math.sin(variable.attack_time * 180.0) + 22.92 * (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0))", "-5.73 + math.sin(variable.attack_time * 180.0) * 34.38 - this", "-this" ] + } + } + } + } +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/animation_controller.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/animation_controller.json new file mode 100644 index 0000000..89db5f0 --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/animation_controller.json @@ -0,0 +1,13 @@ +{ + "format_version" : "1.10.0", + "animation_controllers" : { + "controller.animation.{{IDENTIFIER}}.attack" : { + "initial_state" : "default", + "states" : { + "default" : { + "animations" : [ "skeleton_attack" ] + } + } + } + } +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/client_entity.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/client_entity.json new file mode 100644 index 0000000..6fae65c --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/client_entity.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.8.0", + "minecraft:client_entity": { + "description": { + "identifier": "{{PROJECT_PREFIX}}:{{IDENTIFIER}}", + "materials": { + "default": "skeleton" + }, + "textures": { + "default": "textures/entity/{{IDENTIFIER}}" + }, + "geometry": { + "default": "geometry.{{IDENTIFIER}}" + }, + "spawn_egg": { + "texture": "egg_{{IDENTIFIER}}", + "texture_index": 0 + }, + "scripts": { + "pre_animation": [ + "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;" + ] + }, + "animations": { + "look_at_target_default": "animation.humanoid.look_at_target.default", + "look_at_target_gliding": "animation.humanoid.look_at_target.gliding", + "look_at_target_swimming": "animation.humanoid.look_at_target.swimming", + "move": "animation.humanoid.move", + "riding.arms": "animation.humanoid.riding.arms", + "riding.legs": "animation.humanoid.riding.legs", + "holding": "animation.humanoid.holding", + "brandish_spear": "animation.humanoid.brandish_spear", + "charging": "animation.humanoid.charging", + "attack.rotations": "animation.humanoid.attack.rotations", + "sneaking": "animation.humanoid.sneaking", + "bob": "animation.humanoid.bob", + "damage_nearby_mobs": "animation.humanoid.damage_nearby_mobs", + "bow_and_arrow": "animation.humanoid.bow_and_arrow", + "swimming": "animation.zombie.swimming", + "use_item_progress": "animation.humanoid.use_item_progress", + "skeleton_attack": "animation.{{IDENTIFIER}}.attack" + }, + "animation_controllers": [ + { "look_at_target": "controller.animation.humanoid.look_at_target" }, + { "move": "controller.animation.humanoid.move" }, + { "riding": "controller.animation.humanoid.riding" }, + { "holding": "controller.animation.humanoid.holding" }, + { "brandish_spear": "controller.animation.humanoid.brandish_spear" }, + { "charging": "controller.animation.humanoid.charging" }, + { "attack": "controller.animation.humanoid.attack" }, + { "sneaking": "controller.animation.humanoid.sneaking" }, + { "bob": "controller.animation.humanoid.bob" }, + { "damage_nearby_mobs": "controller.animation.humanoid.damage_nearby_mobs" }, + { "bow_and_arrow": "controller.animation.humanoid.bow_and_arrow" }, + { "swimming": "controller.animation.zombie.swimming" }, + { "use_item_progress": "controller.animation.humanoid.use_item_progress" }, + { "skeleton_attack": "controller.animation.{{IDENTIFIER}}.attack" } + ], + "render_controllers": [ "controller.render.{{IDENTIFIER}}" ], + "enable_attachables": true + } + } +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/en_US.lang b/.bridge/extensions/SkeletonPreset/presets/skeleton/en_US.lang new file mode 100644 index 0000000..9ddccc1 --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/en_US.lang @@ -0,0 +1,2 @@ +item.spawn_egg.entity.{{PROJECT_PREFIX}}:{{IDENTIFIER}}.name=Spawn {{IDENTIFIER_NAME}} +entity.{{PROJECT_PREFIX}}:{{IDENTIFIER}}.name={{IDENTIFIER_NAME}} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/entity.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/entity.json new file mode 100644 index 0000000..5758b79 --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/entity.json @@ -0,0 +1,503 @@ +{ + "format_version": "1.16.0", + "minecraft:entity": { + "description": { + "identifier": "{{PROJECT_PREFIX}}:{{IDENTIFIER}}", + "is_spawnable": true, + "is_summonable": true, + "is_experimental": false + }, + "component_groups": { + "minecraft:lightning_immune": { + "minecraft:damage_sensor": { + "triggers": { + "on_damage": { "filters": { "other_with_families": "lightning" } }, + "deals_damage": false + } + } + }, + "minecraft:ranged_attack": { + "minecraft:behavior.ranged_attack": { + "priority": 0, + "attack_interval_min": 1.0, + "attack_interval_max": 3.0, + "attack_radius": 15.0 + }, + "minecraft:shooter": { + "def": "minecraft:arrow" + }, + "minecraft:environment_sensor": { + "triggers": [ + { + "filters": { + "test": "is_underwater", + "subject": "self", + "operator": "==", + "value": true + }, + "event": "minecraft:melee_mode" + }, + { + "filters": { + "test": "has_ranged_weapon", + "subject": "self", + "operator": "==", + "value": false + }, + "event": "minecraft:melee_mode" + } + ] + } + }, + "minecraft:melee_attack": { + "minecraft:behavior.melee_attack": { + "priority": 4, + "track_target": true, + "speed_multiplier": 1.25 + }, + "minecraft:attack": { + "damage": 3 + }, + "minecraft:environment_sensor": { + "triggers": [ + { + "filters": { + "all_of": [ + { + "test": "in_water", + "subject": "self", + "operator": "==", + "value": false + }, + { + "test": "has_ranged_weapon", + "subject": "self", + "operator": "==", + "value": true + } + ] + }, + "event": "minecraft:ranged_mode" + } + ] + } + } + }, + + "components": { + "minecraft:experience_reward": { + "on_death": "query.last_hit_by_player ? 5 + (query.equipment_count * Math.Random(1,3)) : 0" + }, + "minecraft:equip_item": { + }, + "minecraft:collision_box": { + "width": 0.6, + "height": 1.9 + }, + "minecraft:type_family": { + "family": [ "skeleton", "undead", "monster", "mob" ] + }, + "minecraft:breathable": { + "total_supply": 15, + "suffocate_time": 0, + "breathes_water": true + }, + + "minecraft:burns_in_daylight": { + }, + + "minecraft:health": { + "value": 20, + "max": 20 + }, + "minecraft:hurt_on_condition": { + "damage_conditions": [ + { + "filters": { "test": "in_lava", "subject": "self", "operator": "==", "value": true }, + "cause": "lava", + "damage_per_tick": 4 + } + ] + }, + "minecraft:loot": { + "table": "loot_tables/entities/{{IDENTIFIER}}.json" + }, + "minecraft:movement": { + "value": 0.25 + }, + "minecraft:navigation.walk": { + "is_amphibious": true, + "avoid_sun": true, + "avoid_water": true + }, + "minecraft:movement.basic": { + }, + "minecraft:jump.static": { + }, + "minecraft:can_climb": { + }, + "minecraft:nameable": { + }, + "minecraft:equipment": { + "table": "loot_tables/entities/{{IDENTIFIER}}_gear.json" + }, + "minecraft:shooter": { + "def": "minecraft:arrow" + }, + "minecraft:environment_sensor": { + "triggers": [ + { + "filters": { + "test": "is_underwater", + "subject": "self", + "operator": "==", + "value": true + }, + "event": "minecraft:melee_mode" + }, + { + "filters": { + "test": "has_ranged_weapon", + "subject": "self", + "operator": "==", + "value": false + }, + "event": "minecraft:melee_mode" + } + ] + }, + "minecraft:despawn": { + "despawn_from_distance": {} + }, + "minecraft:shareables": { + "items": [ + { + "item": "minecraft:netherite_sword", + "want_amount": 1, + "surplus_amount": 1, + "priority": 0 + }, + { + "item": "minecraft:diamond_sword", + "want_amount": 1, + "surplus_amount": 1, + "priority": 1 + }, + { + "item": "minecraft:iron_sword", + "want_amount": 1, + "surplus_amount": 1, + "priority": 2 + }, + { + "item": "minecraft:stone_sword", + "want_amount": 1, + "surplus_amount": 1, + "priority": 3 + }, + { + "item": "minecraft:golden_sword", + "want_amount": 1, + "surplus_amount": 1, + "priority": 4 + }, + { + "item": "minecraft:wooden_sword", + "want_amount": 1, + "surplus_amount": 1, + "priority": 5 + }, + { + "item": "minecraft:bow", + "want_amount": 1, + "surplus_amount": 1, + "priority": 6 + }, + { + "item": "minecraft:netherite_helmet", + "want_amount": 1, + "surplus_amount": 1, + "priority": 0 + }, + { + "item": "minecraft:diamond_helmet", + "want_amount": 1, + "surplus_amount": 1, + "priority": 1 + }, + { + "item": "minecraft:iron_helmet", + "want_amount": 1, + "surplus_amount": 1, + "priority": 2 + }, + { + "item": "minecraft:chainmail_helmet", + "want_amount": 1, + "surplus_amount": 1, + "priority": 3 + }, + { + "item": "minecraft:golden_helmet", + "want_amount": 1, + "surplus_amount": 1, + "priority": 4 + }, + { + "item": "minecraft:leather_helmet", + "want_amount": 1, + "surplus_amount": 1, + "priority": 5 + }, + { + "item": "minecraft:turtle_helmet", + "want_amount": 1, + "surplus_amount": 1, + "priority": 6 + }, + { + "item": "minecraft:skull:0", + "want_amount": 1, + "surplus_amount": 1, + "priority": 7 + }, + { + "item": "minecraft:skull:1", + "want_amount": 1, + "surplus_amount": 1, + "priority": 7 + }, + { + "item": "minecraft:carved_pumpkin", + "want_amount": 1, + "surplus_amount": 1, + "priority": 7 + }, + { + "item": "minecraft:netherite_chestplate", + "want_amount": 1, + "surplus_amount": 1, + "priority": 0 + }, + { + "item": "minecraft:diamond_chestplate", + "want_amount": 1, + "surplus_amount": 1, + "priority": 1 + }, + { + "item": "minecraft:iron_chestplate", + "want_amount": 1, + "surplus_amount": 1, + "priority": 2 + }, + { + "item": "minecraft:chainmail_chestplate", + "want_amount": 1, + "surplus_amount": 1, + "priority": 3 + }, + { + "item": "minecraft:golden_chestplate", + "want_amount": 1, + "surplus_amount": 1, + "priority": 4 + }, + { + "item": "minecraft:leather_chestplate", + "want_amount": 1, + "surplus_amount": 1, + "priority": 5 + }, + { + "item": "minecraft:netherite_leggings", + "want_amount": 1, + "surplus_amount": 1, + "priority": 0 + }, + { + "item": "minecraft:diamond_leggings", + "want_amount": 1, + "surplus_amount": 1, + "priority": 1 + }, + { + "item": "minecraft:iron_leggings", + "want_amount": 1, + "surplus_amount": 1, + "priority": 2 + }, + { + "item": "minecraft:chainmail_leggings", + "want_amount": 1, + "surplus_amount": 1, + "priority": 3 + }, + { + "item": "minecraft:golden_leggings", + "want_amount": 1, + "surplus_amount": 1, + "priority": 4 + }, + { + "item": "minecraft:leather_leggings", + "want_amount": 1, + "surplus_amount": 1, + "priority": 5 + }, + { + "item": "minecraft:netherite_boots", + "want_amount": 1, + "surplus_amount": 1, + "priority": 0 + }, + { + "item": "minecraft:diamond_boots", + "want_amount": 1, + "surplus_amount": 1, + "priority": 1 + }, + { + "item": "minecraft:iron_boots", + "want_amount": 1, + "surplus_amount": 1, + "priority": 2 + }, + { + "item": "minecraft:chainmail_boots", + "want_amount": 1, + "surplus_amount": 1, + "priority": 3 + }, + { + "item": "minecraft:golden_boots", + "want_amount": 1, + "surplus_amount": 1, + "priority": 4 + }, + { + "item": "minecraft:leather_boots", + "want_amount": 1, + "surplus_amount": 1, + "priority": 5 + } + ] + }, + "minecraft:behavior.ranged_attack": { + "priority": 0, + "attack_interval_min": 1.0, + "attack_interval_max": 3.0, + "attack_radius": 15.0 + }, + "minecraft:behavior.hurt_by_target": { + "priority": 1 + }, + "minecraft:behavior.nearest_attackable_target": { + "priority": 2, + "must_see": true, + "reselect_targets": true, + "entity_types": [ + { + "filters": { + "test": "is_family", + "subject": "other", + "value": "player" + }, + "max_dist": 16 + }, + { + "filters": { + "test": "is_family", + "subject": "other", + "value": "irongolem" + }, + "max_dist": 16 + }, + { + "filters": { + "all_of": [ + { + "test": "is_family", + "subject": "other", + "value": "baby_turtle" + }, + { + "test": "in_water", + "subject": "other", + "operator": "!=", + "value": true + } + ] + }, + "max_dist": 16 + } + ] + }, + "minecraft:behavior.flee_sun": { + "priority": 2, + "speed_multiplier": 1 + }, + "minecraft:behavior.equip_item": { + "priority": 3 + }, + "minecraft:behavior.avoid_mob_type": { + "priority": 4, + "entity_types": [ + { + "filters": { + "test": "is_family", + "subject": "other", + "value": "wolf" + }, + "max_dist": 6, + "walk_speed_multiplier": 1.2, + "sprint_speed_multiplier": 1.2 + } + ] + }, + "minecraft:behavior.pickup_items": { + "priority": 5, + "max_dist": 3, + "goal_radius": 2, + "speed_multiplier": 1.0, + "pickup_based_on_chance": true, + "can_pickup_any_item": true + }, + "minecraft:behavior.random_stroll": { + "priority": 6, + "speed_multiplier": 1 + }, + "minecraft:behavior.look_at_player": { + "priority": 7, + "look_distance": 8 + }, + "minecraft:behavior.random_look_around": { + "priority": 8 + }, + "minecraft:physics": { }, + "minecraft:pushable": { + "is_pushable": true, + "is_pushable_by_piston": true + }, + "minecraft:conditional_bandwidth_optimization": { } + }, + + "events": { + "minecraft:entity_spawned": { + "add": { + "component_groups": [ + "minecraft:ranged_attack" + ] + } + }, + "minecraft:melee_mode": { + "remove": { "component_groups": [ "minecraft:ranged_attack" ] }, + "add": { "component_groups": [ "minecraft:melee_attack" ] } + }, + "minecraft:ranged_mode": { + "remove": { "component_groups": [ "minecraft:melee_attack" ] }, + "add": { "component_groups": [ "minecraft:ranged_attack" ] } + } + } + } +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/geometry.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/geometry.json new file mode 100644 index 0000000..c4af520 --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/geometry.json @@ -0,0 +1,121 @@ +{ + "format_version": "1.8.0", + "geometry.{{IDENTIFIER}}": { + "texturewidth": 64, + "textureheight": 32, + "visible_bounds_width": 2, + "visible_bounds_height": 2, + "visible_bounds_offset": [ 0, 1, 0 ], + "bones": [ + { + "name": "body", + "pivot": [ 0.0, 24.0, 0.0 ], + "cubes": [ + { + "origin": [ -4.0, 12.0, -2.0 ], + "size": [ 8, 12, 4 ], + "uv": [ 16, 16 ] + } + ], + "parent": "waist" + }, + + { + "name": "waist", + "pivot": [ 0.0, 12.0, 0.0 ] + }, + + { + "name": "head", + "pivot": [ 0.0, 24.0, 0.0 ], + "cubes": [ + { + "origin": [ -4.0, 24.0, -4.0 ], + "size": [ 8, 8, 8 ], + "uv": [ 0, 0 ] + } + ], + "parent": "body" + }, + + { + "name": "hat", + "pivot": [ 0.0, 24.0, 0.0 ], + "cubes": [ + { + "origin": [ -4.0, 24.0, -4.0 ], + "size": [ 8, 8, 8 ], + "uv": [ 32, 0 ], + "inflate": 0.5 + } + ], + "neverRender": true, + "parent": "head" + }, + { + "name": "rightArm", + "pivot": [ -5.0, 22.0, 0.0 ], + "cubes": [ + { + "origin": [ -6.0, 12.0, -1.0 ], + "size": [ 2, 12, 2 ], + "uv": [ 40, 16 ] + } + ], + "parent": "body" + }, + + { + "name": "rightItem", + "pivot": [ -6, 15, 1 ], + "neverRender": true, + "parent": "rightArm" + }, + + { + "name": "leftArm", + "pivot": [ 5.0, 22.0, 0.0 ], + "cubes": [ + { + "origin": [ 4.0, 12.0, -1.0 ], + "size": [ 2, 12, 2 ], + "uv": [ 40, 16 ] + } + ], + "mirror": true, + "parent": "body" + }, + { + "name": "leftItem", + "pivot": [ 6.0, 15.0, 1.0 ], + "neverRender": true, + "parent": "leftArm" + }, + { + "name": "rightLeg", + "pivot": [ -2.0, 12.0, 0.0 ], + "cubes": [ + { + "origin": [ -3.0, 0.0, -1.0 ], + "size": [ 2, 12, 2 ], + "uv": [ 0, 16 ] + } + ], + "parent": "body" + }, + { + "name": "leftLeg", + "pivot": [ 2.0, 12.0, 0.0 ], + "cubes": [ + { + "origin": [ 1.0, 0.0, -1.0 ], + "size": [ 2, 12, 2 ], + "uv": [ 0, 16 ] + } + ], + "mirror": true, + "parent": "body" + } + ] + } +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/icon.png b/.bridge/extensions/SkeletonPreset/presets/skeleton/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0d58dbf62929371144f504ee3e14557f5ff8cb7a GIT binary patch literal 540 zcmV+%0^|LOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0kKI$K~y+T&63S8 z13?(ZpW5AiX`&HPDF@;+aUnqyH}P3%gg8hcV6L4k|hB})t+S3M+2oQu6);ISM2yRnFAzFY^y`yhRK0S+#qe}!%@72obL;_~J zld1sMz$EftMhm!(q_MGk04W0)Z4S6w9UvsB?)A6VW60xH=L!O!rn9^NNirb$`T$Yj zG1%rnMkLrey`j5b`22nlK1EmG{(*Xp-bpY<7QUTBNTQ&ID%Ep6NW~(!4J~UvT@&AB zK|K1bnKL3!cL0)%W}i6^-OtK3NNH9M#dPdn#Z$tByZw~{k1imG67(2nWitZ@_lA?e e+OOI_0DJr``hq literal 0 HcmV?d00001 diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/item_texture.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/item_texture.json new file mode 100644 index 0000000..7a2cae5 --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/item_texture.json @@ -0,0 +1,7 @@ +{ + "texture_data": { + "egg_{{IDENTIFIER}}": { + "textures": [ "textures/items/egg_{{IDENTIFIER}}" ] + } + } +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/loot_table.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/loot_table.json new file mode 100644 index 0000000..86fda53 --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/loot_table.json @@ -0,0 +1,56 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "minecraft:arrow", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 0, + "max": 2 + } + }, + { + "function": "looting_enchant", + "count": { + "min": 0, + "max": 1 + } + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "minecraft:bone", + "weight": 1, + "functions": [ + { + "function": "set_count", + "count": { + "min": 0, + "max": 2 + } + }, + { + "function": "looting_enchant", + "count": { + "min": 0, + "max": 1 + } + } + ] + } + ] + } + ] +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/loot_table_gear.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/loot_table_gear.json new file mode 100644 index 0000000..ab6801b --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/loot_table_gear.json @@ -0,0 +1,69 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "minecraft:bow", + "weight": 1, + "functions": [ + { + "function": "looting_enchant", + "count": { + "min": 0, + "max": 1 + } + }, + { + "function": "enchant_random_gear", + "chance": 0.10 + } + ] + } + ] + }, + { + "conditions": [ + { + "condition": "random_difficulty_chance", + "default_chance": 1.0, + "peaceful": 0, + "easy": 0 + }, + { + "condition": "random_regional_difficulty_chance", + "max_chance": 0.15 + } + ], + "tiers": { + "initial_range": 2, + "bonus_rolls": 3, + "bonus_chance": 0.095 + }, + + "entries": [ + { + "type": "loot_table", + "name": "loot_tables/entities/armor_set_leather.json" + }, + { + "type": "loot_table", + "name": "loot_tables/entities/armor_set_gold.json" + }, + { + "type": "loot_table", + "name": "loot_tables/entities/armor_set_chain.json" + }, + { + "type": "loot_table", + "name": "loot_tables/entities/armor_set_iron.json" + }, + { + "type": "loot_table", + "name": "loot_tables/entities/armor_set_diamond.json" + } + ] + } + ] +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/manifest.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/manifest.json new file mode 100644 index 0000000..84d9319 --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/manifest.json @@ -0,0 +1,86 @@ +{ + "name": "Skeleton", + "icon": "mdi-skull-crossbones", + "description": "Creates a new skeleton entity.", + "category": "fileType.entity", + "targetVersion": [">=", "1.8.0"], + "fields": [ + ["Identifier", "IDENTIFIER"], + ["Display Name", "IDENTIFIER_NAME"] + ], + + "createFiles": [ + [ + "entity.json", + "BP/entities/{{IDENTIFIER}}.json", + { "inject": ["IDENTIFIER", "PROJECT_PREFIX"] } + ], + [ + "client_entity.json", + "RP/entity/{{IDENTIFIER}}.json", + { "inject": ["IDENTIFIER", "PROJECT_PREFIX"] } + ], + [ + "animation.json", + "RP/animations/{{IDENTIFIER}}.json", + { "inject": ["IDENTIFIER"] } + ], + [ + "animation_controller.json", + "RP/animation_controllers/{{IDENTIFIER}}.json", + { "inject": ["IDENTIFIER"] } + ], + [ + "geometry.json", + "RP/models/entity/{{IDENTIFIER}}.json", + { "inject": ["IDENTIFIER"] } + ], + [ + "icon.png", + "RP/textures/items/egg_{{IDENTIFIER}}.png", + { "inject": ["IDENTIFIER"] } + ], + [ + "loot_table.json", + "BP/loot_tables/entities/{{IDENTIFIER}}.json", + { "inject": ["IDENTIFIER"] } + ], + [ + "loot_table_gear.json", + "BP/loot_tables/entities/{{IDENTIFIER}}_gear.json", + { "inject": ["IDENTIFIER"] } + ], + [ + "render_controller.json", + "RP/render_controllers/{{IDENTIFIER}}.json", + { "inject": ["IDENTIFIER"] } + ], + [ + "spawn_rule.json", + "BP/spawn_rules/{{IDENTIFIER}}.json", + { "inject": ["IDENTIFIER", "PROJECT_PREFIX"] } + ], + [ + "texture.png", + "RP/textures/entity/{{IDENTIFIER}}.png", + { "inject": ["IDENTIFIER"] } + ] + ], + "expandFiles": [ + [ + "en_US.lang", + "RP/texts/en_US.lang", + { "inject": ["IDENTIFIER", "IDENTIFIER_NAME", "PROJECT_PREFIX"] } + ], + [ + "sounds.json", + "RP/sounds.json", + { "inject": ["IDENTIFIER", "PROJECT_PREFIX"] } + ], + [ + "item_texture.json", + "RP/textures/item_texture.json", + { "inject": ["IDENTIFIER"] } + ] + ] +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/render_controller.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/render_controller.json new file mode 100644 index 0000000..95402af --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/render_controller.json @@ -0,0 +1,10 @@ +{ + "format_version": "1.8.0", + "render_controllers": { + "controller.render.{{IDENTIFIER}}": { + "geometry": "Geometry.default", + "materials": [ { "*": "Material.default" } ], + "textures": [ "Texture.default" ] + } + } +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/sounds.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/sounds.json new file mode 100644 index 0000000..abb9784 --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/sounds.json @@ -0,0 +1,26 @@ +{ + "entity_sounds": { + "entities": { + "{{PROJECT_PREFIX}}:{{IDENTIFIER}}": { + "events": { + "ambient": "mob.skeleton.say", + "death": "mob.skeleton.death", + "hurt": { + "sound": "mob.skeleton.hurt", + "volume": 0.70 + }, + "step": { + "pitch": 1.0, + "sound": "mob.skeleton.step", + "volume": 1.0 + } + }, + "pitch": [ + 0.80, + 1.20 + ], + "volume": 1.0 + } + } + } +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/spawn_rule.json b/.bridge/extensions/SkeletonPreset/presets/skeleton/spawn_rule.json new file mode 100644 index 0000000..00052fd --- /dev/null +++ b/.bridge/extensions/SkeletonPreset/presets/skeleton/spawn_rule.json @@ -0,0 +1,67 @@ +{ + "format_version": "1.8.0", + "minecraft:spawn_rules": { + "description": { + "identifier": "{{PROJECT_PREFIX}}:{{IDENTIFIER}}", + "population_control": "monster" + }, + "conditions": [ + { + "minecraft:spawns_on_surface": { + }, + + "minecraft:spawns_underground": { + }, + + "minecraft:spawns_on_block_prevented_filter": [ + "minecraft:nether_wart_block", + "minecraft:shroomlight" + ], + + "minecraft:brightness_filter": { + "min": 0, + "max": 7, + "adjust_for_weather": true + }, + + "minecraft:difficulty_filter": { + "min": "easy", + "max": "hard" + }, + + "minecraft:weight": { + "default": 80 + }, + + "minecraft:herd": { + "min_size": 1, + "max_size": 2 + }, + + "minecraft:biome_filter": { + "any_of": [ + { + "all_of": [ + { + "test": "has_biome_tag", + "operator": "==", + "value": "monster" + }, + { + "test": "has_biome_tag", + "operator": "!=", + "value": "frozen" + } + ] + }, + { + "test": "has_biome_tag", + "operator": "==", + "value": "soulsand_valley" + } + ] + } + } + ] + } +} diff --git a/.bridge/extensions/SkeletonPreset/presets/skeleton/texture.png b/.bridge/extensions/SkeletonPreset/presets/skeleton/texture.png new file mode 100644 index 0000000000000000000000000000000000000000..c0d33265b7649144304d7e34f5e4d64917b8ee5a GIT binary patch literal 1407 zcmV-_1%UdAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1r$j{K~!i%-B??1 z8$}d8UVKYj$G0e#h7c%G1!*6+v@YR=a(gSPL`5q=YLSpY0$$)3^cTPjJirsJ#6yZI zwMqp9S|uV9eXEL)ph~N9NgSHQPVB@kn+ zaQ^b;5@@WWgHp4zJcjnf#BK6r#Oys}(T z08lEGY=!*v>vN@MSAeF|P4URyy-bty^Gv(DyP56=R8;`14+PtSw35ql8?Fzf#KIx& zKgg)60Hcttem|||^5pe;^^pf3HH84;zPPc$?e=JtQppszcLQot0Ic4ktnYTaIS-^4 z%VDt_P}3=}UMSMx_+h&K%XJ)Z!&D*45qJ3^zQW3;@wN-w|kBK>yrR}~gT3bY1z4ie)`Dn*4tf%`63S#H0toG^qg1rdzk~(Ek2@N~Y$y56sQY(bROg-AHJDC4c}-{XIEJ3B_1uX^H+-ec2dE(C9l`xrlssMMZ;m5RTc*jDsX#PJ*37VbYE|;nxAJ6LCBzHcw*p5`tj;D zK31PSbck;K{s*5fr;i_RYzW{7jKYdxB|y81e@)ZaorA5d%5770ad?=njEtzb)>!zV zOP6SLe4H|w49~&bNF>5*u?P0To`BR5$z-xA>xjxRSV>k&kPelkdU|?DQ%MTU_CNM0 z?ccYLt|_5M#>TkatKJt>ZGbtLi#1pa$X)_idQDHN%~nTfftD6-AOxmWmJS92EJ$i$ zfi2nD*-3Z){EH^;-lcRp%@5j>i3D}29Dq5Pi#1q_J+K!bd&BCB>bPviI-+t6iqJ@G zt11t`YB=K&-#8*Y%F@6dZoyD0T68+z-*7fXe840+Vs>)Dco!01yOuL0}FOz-j*2 z1LQxy9jzx&NPRPWrS#>{g%XZRc)`&3Kd>;!3s!KFKNmiXdLBv7io#v>xt2Kl`4=T5 zM7Sq_Ht_M8)Az0W?A&>_mdq2#d_ZajqhJ`@4u93)0%NGu{!yi@72WCwpb$_9CQ86J zMDVj8eQ3KMi~-?|%BwejX4J(4^d>_r3W4p~MwmSS--K`i$3380BH3!KE+GMku*Uvo z9w62>3RQ3Z%wPqSZ+v|E&CmT5N0dI-5>_5yB{*PwCy+USod;}(ziMCw;Km2Xj1_(N z#OquB04#|(21Q@m=EP`*Sleh-C-^f$gT`?b+0p+4SXl(d11~XK-VU&;5l--DgbQb~ z-nN8OC9xI6+D5B7&7X$iW3y)`VP#b-o{Z0SQPZ{fPC@P;cM{unZ { "run_command": { "command": [ `execute @p ~ ~ ~ function ${name}/launch`, - "tp @s ~ -2 ~" + "tp @s ~ -70 ~" ] } } diff --git a/BP/entities/space_zombie.json b/BP/entities/space_zombie.json index 38b2ce1..70453ee 100644 --- a/BP/entities/space_zombie.json +++ b/BP/entities/space_zombie.json @@ -30,6 +30,7 @@ } }, "components": { + "minecraft:leashable": {}, "minecraft:is_hidden_when_invisible": {}, "minecraft:nameable": {}, // Zombie Components @@ -97,7 +98,9 @@ ] }, "minecraft:despawn": { - "despawn_from_distance": {} + "despawn_from_distance": { + "max_distance": 64 + } }, // Zombie Behaviors "minecraft:behavior.equip_item": { diff --git a/BP/functions/mars/mars.mcfunction b/BP/functions/mars/mars.mcfunction index 067d22f..2240a6f 100644 --- a/BP/functions/mars/mars.mcfunction +++ b/BP/functions/mars/mars.mcfunction @@ -6,8 +6,8 @@ effect @e[tag=mars] jump_boost 3 2 true execute @e[tag=mars] ~-4 ~-3 ~-4 fill ~ ~ ~ ~8 ~9 ~8 air 0 replace water # Summon mobs -execute @e[tag=mars] ~ ~ ~ tp @e[type=enderman, r=64, c=1 ] ~ 0 ~ -execute @e[tag=mars] ~ ~ ~ execute @e[type=enderman, r=64, c=1 ] ~ ~ ~ summon cosmo:space_zombie +execute @e[tag=mars] ~ ~ ~ kill @e[type=enderman, r=64, c=2] execute @e[tag=mars] ~ ~ ~ kill @e[type=item, name="Ender Pearl", r=120] +execute @e[tag=mars] ~ ~ ~ execute @e[type=enderman, r=64, c=1 ] ~ ~ ~ summon cosmo:space_zombie tag @e[type=cosmo:space_zombie, tag=!mars] add mars \ No newline at end of file diff --git a/BP/manifest.json b/BP/manifest.json index 3e2f680..7a41466 100644 --- a/BP/manifest.json +++ b/BP/manifest.json @@ -12,7 +12,7 @@ "version": [ 1, 0, - 0 + 2 ] }, "modules": [ @@ -23,7 +23,7 @@ "version": [ 1, 0, - 0 + 2 ] } ], @@ -33,7 +33,7 @@ "version": [ 1, 0, - 0 + 2 ] } ], diff --git a/BP/texts/en_US.lang b/BP/texts/en_US.lang index daf9eb9..396765f 100644 --- a/BP/texts/en_US.lang +++ b/BP/texts/en_US.lang @@ -1,5 +1,5 @@ pack.name=Cosmos BP -pack.description=Cosmos is a space addon! +pack.description=Cosmos is a space addon! [ v1.0.2 ] ## Space Suit item.cosmo:space_suit_helmet=Space Helmet diff --git a/RP/fogs/mars.json b/RP/fogs/mars.json index fef23c6..0e8565f 100644 --- a/RP/fogs/mars.json +++ b/RP/fogs/mars.json @@ -6,8 +6,8 @@ }, "distance": { "air": { - "fog_start": 7.0, - "fog_end": 40.0, + "fog_start": 40.0, + "fog_end": 80.0, "fog_color": "#330808", "render_distance_type": "fixed" }, @@ -18,8 +18,8 @@ "render_distance_type": "fixed" }, "weather": { - "fog_start": 10.0, - "fog_end": 96.0, + "fog_start": 40.0, + "fog_end": 120.0, "fog_color": "#e8a135", "render_distance_type": "fixed" } diff --git a/RP/manifest.json b/RP/manifest.json index 80ef314..870e4ec 100644 --- a/RP/manifest.json +++ b/RP/manifest.json @@ -12,7 +12,7 @@ "version": [ 1, 0, - 0 + 2 ] }, "modules": [ @@ -23,7 +23,7 @@ "version": [ 1, 0, - 0 + 2 ] } ], diff --git a/RP/texts/en_US.lang b/RP/texts/en_US.lang index aac7512..a435335 100644 --- a/RP/texts/en_US.lang +++ b/RP/texts/en_US.lang @@ -1,5 +1,5 @@ pack.name=Cosmos RP -pack.description=Cosmos is a space addon! +pack.description=Cosmos is a space addon! [ v1.0.2 ] ## ==== Entities ==== ## entity.cosmo:space_zombie.name=Space Zombie diff --git a/RP/ui/debug_screen.json b/RP/ui/debug_screen.json index a1d4368..0c1a2f7 100644 --- a/RP/ui/debug_screen.json +++ b/RP/ui/debug_screen.json @@ -36,7 +36,7 @@ }, "text_watermark": { "type": "label", - "text": "§dCosmos [TESTERS BUILD]\n§fBy Frederox", + "text": "§dCosmos [v1.0.2]\n§fBy Frederox", "color": [ 1, 1,