diff --git a/copy_java_files_to_pack.sh b/copy_java_files_to_pack.sh index 49c3367..9914e65 100755 --- a/copy_java_files_to_pack.sh +++ b/copy_java_files_to_pack.sh @@ -8,6 +8,5 @@ while read -r p || [ -n "$p" ]; do cp "extracted/${filesToCopy[0]}" "${filesToCopy[1]}" done @@ -143,6 +144,29 @@ The killer bunny does not exist in Bedrock Edition. Nonetheless, this is primari The texture required for this to be displayed can be retrieved during the build process. +### Particles + +The pack replaces many particles that are not displayed for various reasons. Some cannot be displayed due to Bedrock's lack of ability to spawn particles with data from required builtin variables. Others simply do not exist in Bedrock edition. The table below summarizes the particle changes implemented by this pack. + +| Java (`minecraft:`) | Bedrock (`minecraft:`) | Optional Pack (`geyseropt:`) | Notes | +|:-----------------------:|:-----------------------:|:----------------------------:|:----------------------------------------------------------------------------------------:| +| `ash` | - | `ash` | Not present in Bedrock Edition | +| `barrier` | - | `barrier` | Present in Bedrock Edition, but not as a particle | +| `bubble` | `basic_bubble_manual` | - | Modified version of the basic_bubble_manual particle is used to spawn in all block types | +| `crimson_spore` | - | `crimson_spore` | Not present in Bedrock Edition | +| `damage_indicator` | - | `damage_indicator` | Not present in Bedrock Edition | +| `enchanted_hit` | - | `enchanted_hit_single` | Not present in Bedrock Edition | +| - | - | `enchanted_hit_multiple` | Used for playing multiple scattered particles on attack | +| `flash` | - | `flash` | Not present in Bedrock Edition | +| `landing_honey` | - | `landing_honey` | Not present in Bedrock Edition | +| `landing_lava` | - | `landing_lava` | Not present in Bedrock Edition | +| `landing_obsidian_tear` | - | `landing_obsidian_tear` | Not present in Bedrock Edition | +| `nautilus` | - | `nautilus` | Not present in Bedrock Edition | +| `sneeze` | - | `sneeze` | Part of Bedrock Edition as a variant of redstone dust (local use only in optional pack) | +| `underwater` | - | `underwater` | Not present in Bedrock Edition | +| `warped_spore` | - | `warped_spore` | Not present in Bedrock Edition | +| `white_ash` | - | `white_ash` | Not present in Bedrock Edition | + ### Shulkers See https://github.com/GeyserMC/Geyser/issues/1412 for more context. diff --git a/particles/bubble_pop.particle.json b/particles/bubble_pop.particle.json deleted file mode 100644 index 7d42764..0000000 --- a/particles/bubble_pop.particle.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "format_version": "1.10.0", - "particle_effect": { - "description": { - "identifier": "geyseropt:bubble_pop", - "basic_render_parameters": { - "material": "particles_alpha", - "texture": "textures/particle/bubble_pop" - } - }, - "components": { - "minecraft:emitter_initialization": { - "creation_expression": "v.size = math.random(0.1, 0.2);" - }, - "minecraft:emitter_rate_instant": { - "num_particles": 1 - }, - "minecraft:emitter_lifetime_once": { - "active_time": 0.3 - }, - "minecraft:emitter_shape_point": {}, - "minecraft:particle_lifetime_expression": { - "max_lifetime": 0.3 - }, - "minecraft:particle_initial_speed": 0, - "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, -0.5, 0] - }, - "minecraft:particle_appearance_billboard": { - "size": ["v.size", "v.size"], - "facing_camera_mode": "rotate_xyz", - "uv": { - "texture_width": 16, - "texture_height": 80, - "flipbook": { - "base_UV": [0, 0], - "size_UV": [16, 16], - "step_UV": [0, 16], - "max_frame": 4, - "stretch_to_lifetime": true - } - } - }, - "minecraft:particle_appearance_tinting": { - "color": [1, 1, 1, 1] - } - } - } -} \ No newline at end of file diff --git a/particles/dolphin.particle.json b/particles/dolphin.particle.json deleted file mode 100644 index dbdcf67..0000000 --- a/particles/dolphin.particle.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "format_version": "1.10.0", - "particle_effect": { - "description": { - "identifier": "geyseropt:dolphin", - "basic_render_parameters": { - "material": "particles_alpha", - "texture": "textures/particle/particles" - } - }, - "components": { - "minecraft:emitter_initialization": { - "creation_expression": "v.size = math.random(0.02, 0.03);" - }, - "minecraft:emitter_rate_instant": { - "num_particles": 1 - }, - "minecraft:emitter_lifetime_once": { - "active_time": 0.75 - }, - "minecraft:emitter_shape_point": {}, - "minecraft:particle_lifetime_expression": { - "max_lifetime": 0.75 - }, - "minecraft:particle_initial_speed": 0.2, - "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, 0.2, 0], - "linear_drag_coefficient": 2 - }, - "minecraft:particle_appearance_billboard": { - "size": ["v.size", "v.size"], - "facing_camera_mode": "rotate_xyz", - "uv": { - "texture_width": 128, - "texture_height": 128, - "uv": [4, 4], - "uv_size": [1, 1] - } - }, - "minecraft:particle_appearance_lighting": {}, - "minecraft:particle_appearance_tinting": { - "color": [0.16078, 0.47451, 0.79216, 1] - } - } - } -} \ No newline at end of file diff --git a/particles/landing_honey.particle.json b/particles/landing_honey.particle.json index 9dd7b19..b347a46 100644 --- a/particles/landing_honey.particle.json +++ b/particles/landing_honey.particle.json @@ -34,6 +34,10 @@ "uv_size": [3, 1] } }, + "minecraft:particle_motion_collision": { + "collision_drag": 100, + "collision_radius": 0.1 + }, "minecraft:particle_appearance_lighting": {}, "minecraft:particle_appearance_tinting": { "color": [0.48627, 0.37647, 0, 1] diff --git a/particles/landing_lava.particle.json b/particles/landing_lava.particle.json index 3aa166e..fbdc18d 100644 --- a/particles/landing_lava.particle.json +++ b/particles/landing_lava.particle.json @@ -34,6 +34,10 @@ "uv_size": [3, 1] } }, + "minecraft:particle_motion_collision": { + "collision_drag": 100, + "collision_radius": 0.1 + }, "minecraft:particle_appearance_lighting": {}, "minecraft:particle_appearance_tinting": { "color": [1, 0.36471, 0.2549, 1] diff --git a/particles/landing_obsidian_tear.particle.json b/particles/landing_obsidian_tear.particle.json index 1d50450..a683062 100644 --- a/particles/landing_obsidian_tear.particle.json +++ b/particles/landing_obsidian_tear.particle.json @@ -34,6 +34,10 @@ "uv_size": [3, 1] } }, + "minecraft:particle_motion_collision": { + "collision_drag": 100, + "collision_radius": 0.1 + }, "minecraft:particle_appearance_lighting": {}, "minecraft:particle_appearance_tinting": { "color": [0.50588, 0, 0.7098, 1]