diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c781ada80..3a678a34ef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: env: - VERSION: '1.21.5' + VERSION: '26.1' COMMIT_MSG: ${{ github.event.head_commit.message }} jobs: @@ -86,22 +86,11 @@ jobs: # https://fabricmc.net/use/server/ # https://modrinth.com/mod/fabric-api/versions # https://modrinth.com/mod/packtest/versions - - version: '1.21.5' - fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.5/0.16.13/1.0.3/server/jar - fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/FZ4q3wQK/fabric-api-0.119.9%2B1.21.5.jar - packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/Swh7th09/packtest-2.1-mc1.21.5.jar - - version: '1.21.7' - fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.7/0.16.14/1.0.3/server/jar - fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/sLmbxWpX/fabric-api-0.128.1%2B1.21.7.jar - packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/PAYctH3X/packtest-2.2-mc1.21.7.jar - - version: '1.21.10' - fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.10/0.18.1/1.1.0/server/jar - fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/dQ3p80zK/fabric-api-0.138.3%2B1.21.10.jar - packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/11yGLsYO/packtest-2.3-beta1-mc1.21.10.jar - - version: '1.21.11' - fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.11-rc2/0.18.1/1.1.0/server/jar - fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/RDb9rvBm/fabric-api-0.139.4%2B1.21.11.jar - packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/GN6fvTsW/packtest-2.4-beta2-mc1.21.11.jar + - version: '26.1' + fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/26.1-snapshot-6/0.18.4/1.1.1/server/jar + fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/WAZ95Yd8/fabric-api-0.143.2%2B26.1.jar + packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/eupLiv70/packtest-2.5.0-beta1.jar + command_limit_tracer_url: https://cdn.modrinth.com/data/Ao12dSbt/versions/DxBN5h3K/commandlimittracer-0.2.0.jar name: 'test-${{ matrix.version }}' runs-on: ubuntu-24.04 steps: @@ -119,7 +108,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '21' + java-version: '25' - name: Download server files run: | @@ -127,6 +116,7 @@ jobs: mkdir mods curl -o mods/fabric-api.jar ${{ matrix.fabric_api_url }} curl -o mods/packtest.jar ${{ matrix.packtest_url }} + curl -o mods/command_limit_tracer.jar ${{ matrix.command_limit_tracer_url }} - name: Copy packs to world run: | diff --git a/base/backport_72/assets/minecraft/atlases/blocks.json b/base/backport_72/assets/minecraft/atlases/blocks.json deleted file mode 100644 index 7b950f715e..0000000000 --- a/base/backport_72/assets/minecraft/atlases/blocks.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "sources": [ - { - "type": "directory", - "source": "gui", - "prefix": "gui/" - }, - { - "type": "filter", - "pattern":{ - "namespace": "^((?!gm4).)*$", - "path": "gui" - } - }, - { - "type": "filter", - "pattern": { - "namespace": "gm4_*", - "path": "gui/container" - } - }, - { - "type": "filter", - "pattern": { - "namespace": "gm4_guidebook", - "path": "gui/" - } - } - ] -} diff --git a/base/beet.yaml b/base/beet.yaml index d6f042a321..6fff300e20 100644 --- a/base/beet.yaml +++ b/base/beet.yaml @@ -8,7 +8,6 @@ data_pack: resource_pack: load: assets: assets - backport_72: backport_72 require: - gm4.plugins.resource_pack diff --git a/base/data/gm4/tags/block/air.json b/base/data/gm4/tags/block/air.json deleted file mode 100644 index 143f2f16f3..0000000000 --- a/base/data/gm4/tags/block/air.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:air", - "minecraft:cave_air", - "minecraft:void_air" - ] -} diff --git a/base/data/gm4/tags/block/full_collision.json b/base/data/gm4/tags/block/full_collision.json index 0e4732df16..b7448d3230 100644 --- a/base/data/gm4/tags/block/full_collision.json +++ b/base/data/gm4/tags/block/full_collision.json @@ -1,6 +1,6 @@ { "values": [ - "#minecraft:dirt", + "#minecraft:substrate_overworld", "#minecraft:leaves", "#minecraft:logs", "#minecraft:planks", diff --git a/base/data/gm4/tags/block/no_collision.json b/base/data/gm4/tags/block/no_collision.json index 0f68d3adbb..248d948bd0 100644 --- a/base/data/gm4/tags/block/no_collision.json +++ b/base/data/gm4/tags/block/no_collision.json @@ -27,7 +27,7 @@ "minecraft:cave_vines_plant", "minecraft:cherry_sapling", "minecraft:cobweb", - {"id": "minecraft:copper_torch", "required": false}, + "minecraft:copper_torch", "minecraft:crimson_fungus", "minecraft:crimson_roots", "minecraft:dark_oak_sapling", diff --git a/base/data/gm4/tags/block/replaceable.json b/base/data/gm4/tags/block/replaceable.json index e07bef7db9..fc79eaa23d 100644 --- a/base/data/gm4/tags/block/replaceable.json +++ b/base/data/gm4/tags/block/replaceable.json @@ -1,31 +1,6 @@ { "values": [ - "#minecraft:air", - "#minecraft:fire", - "minecraft:bubble_column", - "minecraft:bush", - "minecraft:crimson_roots", - "minecraft:dead_bush", - "minecraft:fern", - "minecraft:glow_lichen", - "minecraft:short_dry_grass", - "minecraft:short_grass", - "minecraft:hanging_roots", - "minecraft:large_fern", - "minecraft:lava", - "minecraft:leaf_litter", - "minecraft:light", - "minecraft:nether_sprouts", - "minecraft:resin_clump", - "minecraft:sculk_vein", - "minecraft:seagrass", - "minecraft:snow", - "minecraft:structure_void", - "minecraft:tall_dry_grass", - "minecraft:tall_grass", - "minecraft:tall_seagrass", - "minecraft:vine", - "minecraft:warped_roots", - "minecraft:water" + "#minecraft:replaceable", + "minecraft:sculk_vein" ] } diff --git a/base/data/gm4/tags/block/waterloggable.json b/base/data/gm4/tags/block/waterloggable.json index f0fc5f6291..0bc100d66d 100644 --- a/base/data/gm4/tags/block/waterloggable.json +++ b/base/data/gm4/tags/block/waterloggable.json @@ -1,17 +1,17 @@ { "values": [ "#minecraft:all_signs", - {"id": "#minecraft:bars", "required": false}, + "#minecraft:bars", "#minecraft:campfires", "#minecraft:candles", - {"id": "#minecraft:chains", "required": false}, - {"id": "#minecraft:copper_chests", "required": false}, - {"id": "#minecraft:copper_golem_statues", "required": false}, + "#minecraft:chains", + "#minecraft:copper_chests", + "#minecraft:copper_golem_statues", "#minecraft:corals", "#minecraft:fences", - {"id": "#minecraft:lanterns", "required": false}, + "#minecraft:lanterns", "#minecraft:leaves", - {"id": "#minecraft:lightning_rods", "required": false}, + "#minecraft:lightning_rods", "#minecraft:rails", "#minecraft:slabs", "#minecraft:stairs", @@ -19,7 +19,7 @@ "#minecraft:wall_corals", "#minecraft:wall_signs", "#minecraft:walls", - {"id": "#minecraft:wooden_shelves", "required": false}, + "#minecraft:wooden_shelves", "minecraft:amethyst_cluster", "minecraft:big_dripleaf", "minecraft:big_dripleaf_stem", @@ -27,7 +27,6 @@ "minecraft:blue_stained_glass_pane", "minecraft:brown_stained_glass_pane", "minecraft:calibrated_sculk_sensor", - { "id": "minecraft:chain", "required": false }, "minecraft:chest", "minecraft:conduit", "minecraft:cyan_stained_glass_pane", @@ -42,7 +41,7 @@ "minecraft:dead_tube_coral_fan", "minecraft:dead_tube_coral", "minecraft:decorated_pot", - { "id": "minecraft:dried_ghast", "required": false }, + "minecraft:dried_ghast", "minecraft:ender_chest", "minecraft:glass_pane", "minecraft:glow_lichen", diff --git a/base/data/gm4/tags/entity_type/boats.json b/base/data/gm4/tags/entity_type/boats.json deleted file mode 100644 index 25ce76ee84..0000000000 --- a/base/data/gm4/tags/entity_type/boats.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#minecraft:boat" - ] -} diff --git a/base/data/gm4/tags/entity_type/hostile.json b/base/data/gm4/tags/entity_type/hostile.json index 04fdbd1fa8..77e8eb1f1b 100644 --- a/base/data/gm4/tags/entity_type/hostile.json +++ b/base/data/gm4/tags/entity_type/hostile.json @@ -13,7 +13,7 @@ "minecraft:hoglin", "minecraft:husk", "minecraft:magma_cube", - {"id": "minecraft:parched", "required": false}, + "minecraft:parched", "minecraft:phantom", "minecraft:piglin_brute", "minecraft:pillager", diff --git a/base/data/gm4/tags/entity_type/neutral_hostile.json b/base/data/gm4/tags/entity_type/neutral_hostile.json index 484c872eea..f13e0a812b 100644 --- a/base/data/gm4/tags/entity_type/neutral_hostile.json +++ b/base/data/gm4/tags/entity_type/neutral_hostile.json @@ -1,13 +1,13 @@ { "values": [ - {"id": "minecraft:camel_husk", "required": false}, + "minecraft:camel_husk", "minecraft:cave_spider", "minecraft:creaking", "minecraft:drowned", "minecraft:enderman", "minecraft:piglin", "minecraft:spider", - {"id": "minecraft:zombie_nautilus", "required": false}, + "minecraft:zombie_nautilus", "minecraft:zombified_piglin" ] } diff --git a/base/data/gm4/tags/entity_type/non_living.json b/base/data/gm4/tags/entity_type/non_living.json index ea1ac0176f..9a877e2342 100644 --- a/base/data/gm4/tags/entity_type/non_living.json +++ b/base/data/gm4/tags/entity_type/non_living.json @@ -3,7 +3,7 @@ "minecraft:area_effect_cloud", "minecraft:arrow", "minecraft:block_display", - "#gm4:boats", + "#minecraft:boat", "minecraft:breeze_wind_charge", "#gm4:chest_boats", "minecraft:chest_minecart", diff --git a/base/data/gm4/tags/entity_type/passive.json b/base/data/gm4/tags/entity_type/passive.json index 5540be574c..a6ea9fec7e 100644 --- a/base/data/gm4/tags/entity_type/passive.json +++ b/base/data/gm4/tags/entity_type/passive.json @@ -8,16 +8,16 @@ "minecraft:cat", "minecraft:chicken", "minecraft:cod", - {"id": "minecraft:copper_golem", "required": false}, + "minecraft:copper_golem", "minecraft:cow", "minecraft:donkey", "minecraft:frog", "minecraft:glow_squid", - {"id": "minecraft:happy_ghast", "required": false}, + "minecraft:happy_ghast", "minecraft:horse", "minecraft:mooshroom", "minecraft:mule", - {"id": "minecraft:nautilus", "required": false}, + "minecraft:nautilus", "minecraft:ocelot", "minecraft:parrot", "minecraft:pig", diff --git a/beet-dev.yaml b/beet-dev.yaml index aa0702e904..f8f5761bf6 100644 --- a/beet-dev.yaml +++ b/beet-dev.yaml @@ -8,11 +8,9 @@ pipeline: - gm4.plugins.player_heads - gm4.plugins.resource_pack - gm4.plugins.backwards - - beet.contrib.model_merging - beet.contrib.optifine - beet.contrib.babelbox - gm4_guidebook.generate_guidebooks.load_page_data - - gm4_guidebook.generate_guidebooks.load_custom_recipes - gm4.plugins.test.load_tests pipeline: - gm4.plugins.write_mcmeta @@ -30,16 +28,12 @@ pipeline: namespace: gm4_translations unicode_escape: True dialect: excel - model_merging: - predicate_order: [custom_model_data] - extend: beet.yaml directory: resource_pack pipeline: - resource_pack.dev_description - - gm4.plugins.resource_pack.pad_item_def_range_dispatch - gm4.plugins.resource_pack.link_resource_pack - gm4.plugins.output.resource_pack - - gm4.plugins.resource_pack.dump_registry - gm4.plugins.finished meta: diff --git a/beet-release.yaml b/beet-release.yaml index 0db1332e24..dbf16e3abd 100644 --- a/beet-release.yaml +++ b/beet-release.yaml @@ -40,11 +40,9 @@ pipeline: - gm4.plugins.player_heads - gm4.plugins.resource_pack - gm4.plugins.backwards - - beet.contrib.model_merging - beet.contrib.optifine - beet.contrib.babelbox - gm4_guidebook.generate_guidebooks.load_page_data - - gm4_guidebook.generate_guidebooks.load_custom_recipes pipeline: - gm4.plugins.manifest.write_credits - gm4.plugins.test.strip_tests @@ -63,8 +61,6 @@ pipeline: namespace: gm4_translations unicode_escape: True dialect: excel - model_merging: - predicate_order: [custom_model_data] - pipeline: - gm4.plugins.worker.retrieve_and_run @@ -82,7 +78,6 @@ pipeline: - gm4.plugins.output.release_resource_pack - gm4.plugins.write_mcmeta - gm4.plugins.manifest.update_patch - - gm4.plugins.resource_pack.pad_item_def_range_dispatch meta: pack_scan: resource_pack diff --git a/beet-test.yaml b/beet-test.yaml index 5707fe4f89..3227550a90 100644 --- a/beet-test.yaml +++ b/beet-test.yaml @@ -11,7 +11,6 @@ pipeline: - gm4.plugins.resource_pack - gm4.plugins.backwards - gm4_guidebook.generate_guidebooks.load_page_data - - gm4_guidebook.generate_guidebooks.load_custom_recipes - gm4.plugins.test.load_tests - gm4.plugins.test.skip_mecha_lint pipeline: diff --git a/docs/code-conventions.md b/docs/code-conventions.md index bb9bb2e2d1..1b787886ff 100644 --- a/docs/code-conventions.md +++ b/docs/code-conventions.md @@ -6,7 +6,6 @@ * [Function headers](#function-headers) * [Inline comments](#inline-comments) * [Smithed conventions](#smithed-conventions) - * [CMD prefixing](#cmd-prefixing) * [Tag specification](#tag-specification) ## Naming @@ -36,7 +35,7 @@ All functions should start with a header comment that consists of: - a single function, if the function is run by `/function ...`: `# run from zauber_cauldrons:cauldron/create`. - a folder, if multiple functions call this function using `/function`: `# run from functions in gm4_pig_tractors:till/blocks/`. - a function from where it was scheduled: `# scheduled by zauber_cauldrons:cauldron/create`. - - a function and function-tag pair: `# run from gm4_custom_crafters-3.0:process_input/check_item via #gm4_custom_crafter:custom_item_checks`. + - a function and function-tag pair: `# run from gm4_trees:tick via #gm4_trees:destroy_leaf`. - an advancement reward: `# run from advancement damaged/armor/stall` - a combination of these, in which multiple lines may be used. @@ -51,9 +50,6 @@ kill @s ## Smithed conventions We follow the Smithed conventions in our data pack. For the full documentation, see the [Smithed Wiki](https://wiki.smithed.dev/conventions/). -### CMD prefixing -All the custom model data values in GM4 are prefixed with `3420000`. As a module developer you don't need to worry about this, it is handled by our resource pack plugin. - ### Tag specification Smithed defines a set of standard entity `/tag`s to ensure compatibility between different packs: * Custom entities need to get the `smithed.entity` tag diff --git a/docs/getting-started.md b/docs/getting-started.md index 7d528ab3b9..8f82c45c1a 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -12,7 +12,7 @@ To contribute to our project you need to install [Git](https://git-scm.com/downl Our modules are built using [beet](https://github.com/mcbeet/beet), which is a Python framework that allows us to automatically validate and generate part of our data packs and resource packs. -You will need to install [uv](https://docs.astral.sh/uv/) as project manager. If you don't already have Python installed, uv will do that automatically. We currently use Python 3.10. +You will need to install [uv](https://docs.astral.sh/uv/) as project manager. If you don't already have Python installed, uv will do that automatically. We currently use Python 3.14. ```sh # MacOS, Linux, or Git Bash (recommended) curl -LsSf https://astral.sh/uv/install.sh | sh diff --git a/docs/making-a-module.md b/docs/making-a-module.md index 44dfad1c68..c5847d79a0 100644 --- a/docs/making-a-module.md +++ b/docs/making-a-module.md @@ -51,7 +51,6 @@ pipeline: # Include any libraries - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters # Metadata for the build and publishing on the website meta: @@ -59,7 +58,6 @@ meta: versioning: # A list of minimum-required versions for libraries or other modules required: - - lib_custom_crafters: 3.0.0 - lib_machines: 1.1.0 - gm4_bat_grenades: 1.2.0 @@ -74,7 +72,7 @@ meta: # Any recommended modules recommended: - gm4_resource_pack - - gm4_relocators + - gm4_bat_grenades # Important notes for people when they download the module. This can be empty notes: [] # Keywords used by gm4.co's search feature, may be omitted diff --git a/docs/resource-pack-management.md b/docs/resource-pack-management.md index 0b6238e5d1..688ec06cd0 100644 --- a/docs/resource-pack-management.md +++ b/docs/resource-pack-management.md @@ -4,8 +4,8 @@ This document explains Gamemode 4's Resource Pack management tools, which use cu ## Table of Contents * [Getting Started](#getting-started) * [Building the Resource Pack](#building-the-resource-pack) -* [Custom Model Data](#custom-model-data) * [Language Support](#language-support) +* [Custom Model Data](#custom-model-data) * [Model Templates](#model-templates) * [Model Transforms](#model-transforms) * [Advanced Usage](#advanced-usage) @@ -32,26 +32,10 @@ When building a single or list of modules with `beet dev`, a combined resource p Since Gamemode 4 publishes a single resource pack that contains textures for all our modules combined, building a complete copy of the resource pack locally requires building every module. Since this often takes a while, developers are encouraged to only build the packs they are currently working on to save time. -## Custom Model Data -String references can be used instead of hard-to-remember integers when dealing with custom model data. After configuring the custom model data values your data pack will use a mecha plugin will auto-assign the unique integer values and substitute them into the data pack output by the beet build process. - -```yaml -model_data: - - item: rabbit_hide - reference: gm4_bat_grenades:item/bat_leather - template: generated -``` -```mcfunction -give @s rabbit_hide[custom_model_data="gm4_bat_grenades:item/bat_leather"] -summon item ~ ~ ~ {Item:{id:"rabbit_hide",count:1,components:{"minecraft:custom_model_data":"item/bat_leather"}}} -``` - -For full details about the `model_data` config see [`model_data` Config](#model_data-config) - ## Language Support Support for additional languages is managed through babelbox, which uses a spreadsheet of translation keys and their corresponding values in multiple languages, which can be located at either `gm4_module_name/translations.csv` or `gm4_module_name/assets/translations.csv`. Individual language `.json` files are then generated by the build process. -English (en_us) translation values are required for every translation key used in the pack. Other languages are optional and entries can be left empty if no translation is available. +English (`en_us`) translation values are required for every translation key used in the pack. Other languages are optional and entries can be left empty if no translation is available. Example translations.csv: ```csv @@ -75,6 +59,24 @@ English translations can also be auto-filled from text component fallbacks in ot beet -s meta.gm4.babelbox_backfill=True dev bat_grenades ``` +## Custom Model Data +The `model_data` field in `beet.yaml` can be used to generate models and item definitions in the resource pack. + +```yaml +model_data: + - item: rabbit_hide + reference: gm4_bat_grenades:item/bat_leather + template: generated +``` +```mcfunction +give @s rabbit_hide[custom_model_data={strings:["gm4_bat_grenades:item/bat_leather"]}] +summon item ~ ~ ~ {Item:{id:"rabbit_hide",count:1,components:{"minecraft:custom_model_data":{strings:["gm4_bat_grenades:item/bat_leather"]}}}} +``` + +Make sure to include the namespace in the custom model data string. Starting in 26.1 this is no longer implicitly added by the resource pack plugin! + +For full details about the `model_data` config see [`model_data` Config](#model_data-config) + ## Model Templates Templates allow for easy generation of common model file structures. Uses the `textures` field (or its default value of `reference`) to find the texture file(s). Available default templates are: @@ -224,21 +226,6 @@ model_data: - type: minecraft:dye default: -14455863 ``` -Or alternatively with JSON: -```yaml -model_data: - - item: leather_boots - reference: item/flippers - template: generated_overlay - base_model: { - "tints": [ - { - "type": "minecraft:dye", - "default": -14455863 - } - ] - } -``` ### `gui_fonts` Config Custom textured GUIs using fonts can easily be setup using the `meta.gm4.gui_fonts` entry of `beet.yaml` or the `gui_fonts` entry of `model_data.yaml`. These will create a translation that displays a given image texture inside a container, like a dropper or hopper. Empty images of the correct size are available in the `base` to use as a starting point for custom GUIs. @@ -258,20 +245,6 @@ gui_fonts: ### `translation_linter_ignores` Config Individual translation keys can be excluded from the mecha linting process by adding them to the `meta.gm4.translation_linter_ignores` config in `beet.yaml`. This should only be used in unusual situations where translations are being used in other ways than displaying text. -### Custom Model Data Allocations -Sometimes it is desirable to put all the custom model data integer values near each-other for organizational purposes. There is a manual config available in the `modeldata_registry.json` file, which lets sets up additional ranges for a module (or glob of modules) that can be auto assigned by the resource pack plugin. - -```json - "gm4_orb_of_ankou": [ - 200, - 299 - ], - "*_shamir": [ - 100, - 199 - ], -``` - ### Extending TemplateOptions Individual modules may create and configure their own model templates by extending the `TemplateOptions` class in a beet plugin. The subclass must define its name as a class variable, and a `process` method which creates the models, mounts them to the pack, and returns them in a list. Additional instance attributes can be defined, and their values will be filled by any values provided in the `model_data` config under `template`. @@ -298,7 +271,7 @@ Individual modules may add containers to `gui_fonts` as needed by extending the The inherited method `next_unicode(counter_cache: Cache)` can be used to easily get a unique unicode character. Additionally, there are two extendable subclasses already available for containers whose name is centered (like a dropper) and right-aligned (like a hopper). They are `CenteredContainerGui` and `RightAlignedGui` respectively. - +` #### Methods - `process(self, config: GuiFont, counter_cache: Cache) -> tuple[str, list[dict[str, Any]]]`: Requisitions unique characters and returns the translation value (usually made of these characters), and a list of font providers, which usually reference `config.texture`. diff --git a/gm4/plugins/autoload.py b/gm4/plugins/autoload.py index 158aee1aee..3ffa29fa54 100644 --- a/gm4/plugins/autoload.py +++ b/gm4/plugins/autoload.py @@ -3,12 +3,8 @@ def beet_default(ctx: Context): """Loads plugins auto-added to every beet subproject. Configured in pyproject.toml Used primarily to load custom-merge-rules that will apply between broadcast packs, at least until a better option is available in beet""" - ctx.meta["model_merging"] = { - "predicate_order": ["custom_model_data"] # set default model_merging config for these broadcast-created subprojects - } ctx.require( "beet.contrib.default", - "beet.contrib.model_merging", "gm4.plugins.resource_pack.merge_policy", "gm4_metallurgy.shamir_model_template.merge_policy" ) diff --git a/gm4/plugins/backwards.py b/gm4/plugins/backwards.py index 782888f88b..7cea854a42 100644 --- a/gm4/plugins/backwards.py +++ b/gm4/plugins/backwards.py @@ -1,7 +1,6 @@ import logging -import re from typing import Any, Tuple, Callable -from beet import Context, Pack, NamespaceFile, ItemModel, Function +from beet import Context, Pack, NamespaceFile logger = logging.getLogger("gm4.backwards") @@ -9,96 +8,6 @@ def beet_default(ctx: Context): yield - # edited item model definitions - # - replaced head with player_head - backport(ctx.assets, 63, playerhead_models_1_21_5) - # - added on_shelf - backport(ctx.assets, 64, on_shelf_models_1_21_9) - - # renamed gamerules - backport(ctx.data, 92, rename_gamerules) - - -def playerhead_models_1_21_5(id: str, resource: NamespaceFile): - if not isinstance(resource, ItemModel): - return None - if id != "minecraft:player_head": - return None - - def recursive_replace(compound: dict[str,Any]): - for key, val in compound.items(): - # recurse down the tree - if isinstance(val, list): - for subval in val: # type: ignore - if isinstance(subval, dict): - recursive_replace(subval) # type: ignore - elif isinstance(val, dict): - recursive_replace(val) # type: ignore - # then replace matching compounds - match val: - case { - "type": "minecraft:special", - "model": { - "type": "minecraft:player_head" - } - }: - compound[key]["model"]["type"] = "minecraft:head" - compound[key]["model"]["kind"] = "player" - case _: # type: ignore - pass - - overlay = resource.copy() - recursive_replace(overlay.data) - return overlay - -def on_shelf_models_1_21_9(id: str, resource: NamespaceFile): - if not isinstance(resource, ItemModel): - return None - - def recursive_replace(compound: dict[str,Any]): - for key, val in compound.items(): - # recurse down the tree - if key == "when": - if isinstance(compound[key], list) and "on_shelf" in val: - compound[key].remove("on_shelf") - elif isinstance(compound[key], str) and val == "on_shelf": - compound.pop(key) - continue - if isinstance(val, list): - for subval in val: # type: ignore - if isinstance(subval, dict): - recursive_replace(subval) # type: ignore - elif isinstance(val, dict): - recursive_replace(val) # type: ignore - - overlay = resource.copy() - recursive_replace(overlay.data) - return overlay if overlay != resource else None - - -# Only gamerules that are actually used are replaced -GAMERULES_RENAMES = { - "command_block_output": "commandBlockOutput", - "spawn_phantoms": "doInsomnia", - "natural_health_regeneration": "naturalRegeneration", - "random_tick_speed": "randomTickSpeed", - "send_command_feedback": "sendCommandFeedback", - "show_death_messages": "showDeathMessages", -} - - -def rename_gamerules(id: str, resource: NamespaceFile): - if not isinstance(resource, Function): - return None - text = resource.text - for new_gamerule, old_gamerule in GAMERULES_RENAMES.items(): - text = re.sub(f"gamerule (minecraft:)?{new_gamerule}\\b", f"gamerule {old_gamerule}", text) - if text == resource.text: - return None - overlay = resource.copy() - overlay.text = text - return overlay - def backport(pack: Pack[Any], format: int, run: Callable[[str, NamespaceFile], NamespaceFile | None]): resources: dict[Tuple[type[NamespaceFile], str], NamespaceFile] = dict() diff --git a/gm4/plugins/manifest.py b/gm4/plugins/manifest.py index 20353b931f..eec67451d9 100644 --- a/gm4/plugins/manifest.py +++ b/gm4/plugins/manifest.py @@ -21,7 +21,7 @@ parent_logger = logging.getLogger("gm4.manifest") -SUPPORTED_GAME_VERSIONS = ["1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11"] +SUPPORTED_GAME_VERSIONS = ["26.1"] # config models for beet.yaml metas CreditsModel = dict[str, list[str]] @@ -145,7 +145,7 @@ def create(ctx: Context): ctx.cache["gm4_manifest"].json = manifest.model_dump() # Read in the previous manifest, if found - version = os.getenv("VERSION", "1.21.5") + version = os.getenv("VERSION", "26.1") release_dir = Path('release') / version manifest_file = release_dir / "meta.json" @@ -219,7 +219,7 @@ def update_patch(ctx: Context): def write_meta(ctx: Context): """Write the updated meta.json file.""" - version = os.getenv("VERSION", "1.21.5") + version = os.getenv("VERSION", "26.1") release_dir = Path('release') / version os.makedirs(release_dir, exist_ok=True) diff --git a/gm4/plugins/module.py b/gm4/plugins/module.py index 5b5006475f..069fd91afe 100644 --- a/gm4/plugins/module.py +++ b/gm4/plugins/module.py @@ -16,8 +16,8 @@ def gm4_root_advancement(ctx: Context): "id": "command_block", "components": { "minecraft:custom_model_data": { - "floats": [ - 3420001 + "strings": [ + "gm4:gui/advancement/root" ] } } diff --git a/gm4/plugins/output.py b/gm4/plugins/output.py index 63d55b9719..7b5206fa54 100644 --- a/gm4/plugins/output.py +++ b/gm4/plugins/output.py @@ -21,7 +21,7 @@ def beet_default(ctx: Context): """Saves the datapack to the ./out folder in it's exit phase. Should be first in pipeline to properly wrap all other plugins cleanup phases""" - version = os.getenv("VERSION", "1.21.5") + version = os.getenv("VERSION", "26.1") out_dir = Path("out") yield # wait for exit phase, after other plugins cleanup @@ -33,7 +33,7 @@ def beet_default(ctx: Context): def resource_pack(ctx: Context): """Saves the resourcepack to the ./out folder.""" - version = os.getenv("VERSION", "1.21.5") + version = os.getenv("VERSION", "26.1") out_dir = Path("out") ctx.assets.save( @@ -43,7 +43,7 @@ def resource_pack(ctx: Context): def release_resource_pack(ctx: Context): """Saves the resourcepack to the ./out folder.""" - version = os.getenv("VERSION", "1.21.5") + version = os.getenv("VERSION", "26.1") release_dir = Path("release") / version yield @@ -82,7 +82,7 @@ def release(ctx: Context): `BEET_SMITHED_TOKEN` environment variable is set, will try to publish a new version to Smithed if it doesn't already exist. """ - version_dir = os.getenv("VERSION", "1.21.5") + version_dir = os.getenv("VERSION", "26.1") release_dir = Path("release") / version_dir corrected_project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id @@ -199,7 +199,7 @@ def publish_smithed(ctx: Context, config: ManifestConfig, file_name: str): """Attempts to publish pack to smithed""" auth_token = os.getenv(SMITHED_AUTH_KEY, None) logger = parent_logger.getChild(f"smithed.{ctx.project_id}") - mc_version_dir = os.getenv("VERSION", "1.21.5") + mc_version_dir = os.getenv("VERSION", "26.1") manifest = ManifestCacheModel.model_validate(ctx.cache["gm4_manifest"].json) project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id @@ -299,7 +299,7 @@ def clear_release(ctx: Context): 1. Deleted modules no longer stick around in the current version 2. Changes to the build system (such as renamed files/folders) are properly reflected """ - version = os.getenv("VERSION", "1.21.5") + version = os.getenv("VERSION", "26.1") release_dir = Path("release") / version shutil.rmtree(release_dir, ignore_errors=True) os.makedirs(release_dir, exist_ok=True) diff --git a/gm4/plugins/player_heads.py b/gm4/plugins/player_heads.py index ce8b0a2583..66a3faa9fa 100644 --- a/gm4/plugins/player_heads.py +++ b/gm4/plugins/player_heads.py @@ -24,8 +24,6 @@ from nbtlib import String # type: ignore from PIL.Image import Image -from gm4.utils import InvokeOnJsonNbt - parent_logger = logging.getLogger("gm4.player_heads") USER_AGENT = "Gamemode4Dev/GM4_Datapacks/player_head_management (gamemode4official@gmail.com)" @@ -50,7 +48,7 @@ class Skin(PngFile): image: ClassVar[FileDeserialize[Image]] = FileDeserialize() # purely here to solve type-warnings on PIL images -class SkinNbtTransformer(MutatingReducer, InvokeOnJsonNbt): +class SkinNbtTransformer(MutatingReducer): """Reducer class defining custom mecha parsing rules for skin texture data, and storing needed data for those operations""" def __init__(self, ctx: Context): self.ctx: Context = ctx diff --git a/gm4/plugins/resource_pack.py b/gm4/plugins/resource_pack.py index 0949ac17bc..ba29d6c58b 100644 --- a/gm4/plugins/resource_pack.py +++ b/gm4/plugins/resource_pack.py @@ -1,12 +1,8 @@ import csv import glob import logging -import os -import sys from copy import deepcopy -from dataclasses import replace from functools import cache -from fnmatch import fnmatch from itertools import cycle from typing import Annotated, Any, ClassVar, Literal, Optional, Union @@ -17,7 +13,6 @@ Font, ItemModel, InvalidOptions, - JsonFile, Language, ListOption, Model, @@ -30,26 +25,10 @@ from beet.contrib.vanilla import Vanilla, ClientJar from beet.core.utils import format_validation_error from mecha import ( - AstChildren, - AstCommand, - AstItemComponent, - AstItemPredicateTestComponent, - AstJson, AstJsonObject, - AstJsonObjectEntry, - AstJsonObjectKey, - AstJsonValue, AstNbtCompound, - AstNbtCompoundEntry, - AstNbtCompoundKey, - AstNbtPath, - AstNbtPathKey, - AstNbtValue, Diagnostic, - DiagnosticCollection, - DiagnosticError, Mecha, - MutatingReducer, Reducer, rule, ) @@ -58,16 +37,13 @@ from tokenstream import set_location from gm4.utils import ( - InvokeOnJsonNbt, MapOption, add_namespace, - propagate_location, ) JsonType = dict[str,Any] -CUSTOM_MODEL_PREFIX = 3420000 -MINECRAFT_REFERENECE_VERSION = "1.21.9" +MINECRAFT_REFERENCE_VERSION = "1.21.11" parent_logger = logging.getLogger("gm4.resource_pack") @@ -303,7 +279,6 @@ def beet_default(ctx: Context): tl = ctx.inject(TranslationLinter) ctx.require("mecha.contrib.json_files") # mecha register - ctx.inject(Mecha).transform.extend(rp) ctx.inject(Mecha).lint.extend(tl) logging.getLogger("beet.contrib.babelbox").addFilter(block_incomplete_translation) @@ -311,7 +286,7 @@ def beet_default(ctx: Context): # attach context to template classes VanillaTemplate.vanilla = Vanilla(ctx) - VanillaTemplate.vanilla.minecraft_version = MINECRAFT_REFERENECE_VERSION + VanillaTemplate.vanilla.minecraft_version = MINECRAFT_REFERENCE_VERSION VanillaTemplate.vanilla_jar = VanillaTemplate.vanilla.mount("assets/minecraft/items") yield @@ -323,7 +298,6 @@ def build(ctx: Context): rp = ctx.inject(GM4ResourcePack) rp.resolve_config() rp.generate_gui_fonts() - rp.update_modeldata_registry() rp.generate_model_files() rp.generate_item_definitions() @@ -331,8 +305,6 @@ def build(ctx: Context): ctx.assets.icon = ctx.data.icon def setup(ctx: Context): - mount_registry(ctx) - # init font counter ctx.cache["gui_font_counter"].json = { "__next__": ord("\u9000") @@ -353,31 +325,6 @@ def setup(ctx: Context): keys.extend([row['key'] for row in reader]) # type: ignore ; csv only contains strings ctx.cache["translations"].json = {"keys": list(set(keys)), "backfill": babelbox_backfill} -def mount_registry(ctx: Context): - ctx.cache["modeldata_registry"].json = JsonFile(source_path="gm4/modeldata_registry.json").data - -def dump_registry(ctx: Context): - registry = ctx.cache["modeldata_registry"].json - # sort registriy alphabetically and numerically - registry["items"] = dict(sorted(registry["items"].items())) - for item_id, ref_map in registry["items"].items(): - registry["items"][item_id] = dict(sorted(ref_map.items(), key=lambda e: e[1])) - - JsonFile(registry).dump(origin="", path="gm4/modeldata_registry.json") - ctx.cache["modeldata_registry"].delete() - -def pad_item_def_range_dispatch(ctx: Context): - for item_def in ctx.assets["minecraft"].item_models.values(): - vanilla_item_def = item_def.data["model"]["fallback"] - entries: list[Any] = item_def.data["model"]["entries"] - prior_cmd = 1e8 - for i, entry in reversed(list(enumerate(entries))): - if prior_cmd-(prior_cmd:=entry["threshold"]) > 1: # theres a gap to fill - entries.insert(i+1, { - "threshold": prior_cmd+1, - "model": vanilla_item_def - }) - def merge_policy(ctx: Context): ctx.assets.merge_policy.extend_namespace(ItemModel, item_definition_merging) @@ -394,13 +341,11 @@ def link_resource_pack(ctx: Context): lm.data_pack = dp_dir # restore the DP link -class GM4ResourcePack(MutatingReducer, InvokeOnJsonNbt): +class GM4ResourcePack: """Service Object handling custom_model_data and generated item models""" def __init__(self, ctx: Context): self.ctx = ctx - self.cmd_prefix = CUSTOM_MODEL_PREFIX # enables value to be changed by other projects, like the public server - self.registry = ctx.cache["modeldata_registry"].json self.logger = parent_logger.getChild(ctx.project_id) self._opts = FlatResourcePackOptions(model_data=[], gui_fonts=[]) # unloaded config super().__init__() @@ -417,59 +362,25 @@ def resolve_config(self): self._opts.add_namespace(self.ctx.project_id) self._opts.template_mutations() - #== Custom Model Data registration and management ==# - def update_modeldata_registry(self): - """Updates shared modeldata_registry.json with entries from the beet.yaml""" - item_registry: dict[str, dict[str, int]] = self.registry.setdefault("items", {}) - - # add new references and assign values - for m in self.opts.model_data: - conflicts = False - i, err = self.retrieve_index(m.reference) - if not err: # existing index, is it available to assign to all items? - for item_id in m.item.entries(): - reg = item_registry.setdefault(item_id, {}) - used_idxs = {k: reg[k] for k in reg.keys() - {m.reference}}.values() - if i in used_idxs: - self.logger.warning(f"Failed to share existing custom_model_data for '{m.reference}' to '{item_id}'. A new value will be assigned for this reference; existing items may lose their texture!") - conflicts = True - if not conflicts: # existing CMD is available to apply to any new items - for item_id in [e for e in m.item.entries() if m.reference not in item_registry.get(e, {})]: - self.set_index(item_id, i, m.reference) - if err or conflicts: # no existing index, or existing isn't available; get a new one - self.find_new_index(m.item.entries(), m.reference) - - # remove unused references - # NOTE deleting modeldata is really only supported for development cycles. Once published, a cmd value should be permanent. - # Thus, a reference will only be removed if it is no longer present on *any* item in the beet.yaml - all_refs = {r.reference for r in self.opts.model_data if r.reference.startswith(self.ctx.project_id)} - for item_id, reg in item_registry.items(): - for ref in list(reg.keys()): - if ref.startswith(self.ctx.project_id) and ref not in all_refs and self.ctx.project_id != 'gm4': - self.logger.info(f"Removing undefined custom_model_data from {item_id} registry: '{ref}'") - del reg[ref] - def generate_item_definitions(self): - """Generates item-model-definition files in the 'minecraft' namespace, adding range_dispatch entries for each custom_model_data value""" + """Generates item-model-definition files in the 'minecraft' namespace, adding select cases for each custom_model_data value""" vanilla = self.ctx.inject(Vanilla) - vanilla.minecraft_version = MINECRAFT_REFERENECE_VERSION + vanilla.minecraft_version = MINECRAFT_REFERENCE_VERSION vanilla_item_defs_jar = vanilla.mount("assets/minecraft/items") # group models by item id for item_id in {i for m in self.opts.model_data for i in m.item.entries()}: models = filter(lambda m: item_id in m.item.entries(), self.opts.model_data) # with this item_id - models = sorted(models, key=lambda m: self.retrieve_index(m.reference)[0]) vanilla_itemdef = vanilla_item_defs_jar.assets.item_models[f"minecraft:{item_id}"].data["model"] new_itemdef: dict[str, Any] = { "model": { - "type": "minecraft:range_dispatch", + "type": "minecraft:select", "property": "minecraft:custom_model_data", - "entries": [], + "cases": [], "fallback": vanilla_itemdef } } - itemdef_entries: list[Any] = new_itemdef["model"]["entries"] for model in models: if not (m:=model.template.get_item_def_entry(model, item_id)): @@ -485,109 +396,13 @@ def generate_item_definitions(self): if model.base_model: model_json.update(model.base_model) - itemdef_entries.append({ - "threshold": self.cmd_prefix+self.retrieve_index(model.reference)[0], + new_itemdef["model"]["cases"].append({ + "when": model.reference, "model": model_json }) - itemdef_entries.sort(key=lambda entry: entry["threshold"]) # sort entries ascending self.ctx.assets.item_models[f"minecraft:{item_id}"] = ItemModel(new_itemdef) - def retrieve_index(self, reference: str) -> tuple[int, KeyError|None]: - """retrieves the CMD value for the given reference""" - for reg in self.registry["items"].values(): - if reference in reg: - return reg[reference], None - return -self.cmd_prefix, KeyError(f"{reference} has no asscioated index") - - def find_new_index(self, item_ids: list[str], reference: str): - """finds the next available CMD value for the given items and applies it to the registry""" - try: - allocation_id = next(filter(lambda k: fnmatch(self.ctx.project_id, k), self.registry["allocations"].keys())) #type: ignore ; type checker thinks 'k' is _T@next, not str - except StopIteration: - allocation_id = None - l, u = self.registry["allocations"].get(allocation_id, (1,99)) - available_indices = set(range(l, u+1)) - - for item_id in item_ids: - used_values = set(self.registry["items"].get(item_id, {}).values()) - available_indices -= used_values - - if not available_indices: - self.logger.warning("No Valid CMD is open for assignment! Your module may require a specially assigned value allocation if registering many CMD values.") - raise RuntimeError("Ran out of CMD values to assign!") - - i = min(available_indices) - self.logger.info(f"Issuing new custom_model_data for '{reference}': {i}") - for item_id in item_ids: - self.set_index(item_id, i, reference) - - def set_index(self, item_id: str, index: int, reference: str): - """sets the given cmd index on the item""" - if os.getenv("GITHUB_ACTIONS"): - self.logger.error(f"Model-Data cache is outdated. Github Actions cannot issue custom_model_data. Run the build locally and commit changes to modeldata_registry.json") - sys.exit(1) # stop the build and mark the github action as failed - - self.registry.setdefault("items", {}).setdefault(item_id, {})[reference] = index - self.logger.info(f"Issuing custom_model_data {index} for {item_id}") - - - #== Mecha Transformer Rules ==# - @rule(AstJsonObjectEntry, key=AstJsonObjectKey(value="minecraft:custom_model_data")) - def json_substitutions(self, node: AstJsonObjectEntry, **kwargs: Any): - reference = node.value.evaluate() - if isinstance(reference, str): - index, exc = self.retrieve_index(add_namespace(reference, self.ctx.project_id)) - if exc: - yield Diagnostic("error", str(exc), filename=kwargs.get("filename"), file=kwargs.get("file")) - node = replace(node, value=AstJsonValue.from_value({ "floats": [index+self.cmd_prefix] })) - return node - - @rule(AstJsonObject) - def json_substitutions_item_modifier(self, node: AstJsonObject, **kwargs: Any): - match node.evaluate(): - case {"function": "minecraft:set_custom_model_data"}: - yield Diagnostic("error", "Item modifier set_custom_model_data is not supported", filename=kwargs.get("filename"), file=kwargs.get("file")) - case _: pass - return node - - @rule(AstNbtCompoundEntry, key=AstNbtCompoundKey(value="minecraft:custom_model_data")) - def cmd_substitutions_nbt(self, node: AstNbtCompoundEntry, **kwargs: Any): - if isinstance(node.value, AstNbtValue) and isinstance(node.value.value, String): - index, exc = self.retrieve_index(add_namespace(node.value.value, self.ctx.project_id)) - if exc: - yield Diagnostic("error", str(exc), filename=kwargs.get("filename"), file=kwargs.get("file")) - node = replace(node, value=AstNbtValue.from_value({ "floats": [index+self.cmd_prefix] })) - return node - - @rule(AstItemComponent) - @rule(AstItemPredicateTestComponent) - def cmd_substitutions_component(self, node: AstItemComponent | AstItemPredicateTestComponent, **kwargs: Any): - if node.value and node.key.get_canonical_value() == "minecraft:custom_model_data": - if isinstance(node.value, AstNbtValue) and isinstance(node.value.value, String): - index, exc = self.retrieve_index(add_namespace(node.value.value, self.ctx.project_id)) - if exc: - yield Diagnostic("error", str(exc), filename=kwargs.get("filename"), file=kwargs.get("file")) - node = replace(node, value=AstNbtValue.from_value({ "floats": [index+self.cmd_prefix] })) - return node - - @rule(AstCommand, identifier="data:modify:storage:target:targetPath:set:value:value") - @rule(AstCommand, identifier="data:modify:block:targetPos:targetPath:set:value:value") - @rule(AstCommand, identifier="data:modify:entity:target:targetPath:set:value:value") - def cmd_substitutions_datamodify(self, node: AstCommand): - ast_target, ast_target_path, ast_nbt = node.arguments - match ast_target_path, ast_nbt: - case AstNbtPath(components=[*_, AstNbtPathKey(value="minecraft:custom_model_data")]), AstNbtValue(value=String(reference)): - index, exc = self.retrieve_index(add_namespace(reference, self.ctx.project_id)) - if exc: - d = Diagnostic("error", str(exc)) - yield set_location(d, ast_nbt) - node = replace(node, arguments=AstChildren([ast_target, ast_target_path, AstNbtValue.from_value({ "floats": [index+self.cmd_prefix] })])) - case _: - pass - return node - - #== Model file generation ==# def generate_model_files(self): """Create individual models for each item/block according to its config""" @@ -616,22 +431,21 @@ def generate_gui_fonts(self): })) def item_definition_merging(pack: ResourcePack, path: str, current: ItemModel, conflict: ItemModel) -> bool: - """ItemModel beet merge rule for combining range_dispatch properly""" - if current.data["model"].get("type") != "minecraft:range_dispatch" or conflict.data["model"].get("type") != "minecraft:range_dispatch": - parent_logger.warning(f"item model {path} was sent to merging but only one file uses 'range_dispatch'") + """ItemModel beet merge rule for combining select properly""" + if current.data["model"].get("type") != "minecraft:select" or conflict.data["model"].get("type") != "minecraft:select": + parent_logger.warning(f"item model {path} was sent to merging but only one file uses 'select'") return False - merged_entries: list[Any] = current.data["model"]["entries"] - merged_entries.extend(conflict.data["model"]["entries"]) - merged_entries.sort(key=lambda entry: entry["threshold"]) + merged_cases: list[Any] = current.data["model"]["cases"] + merged_cases.extend(conflict.data["model"]["cases"]) - # remove duplicate entries - relying on each CMD to be unique already + # remove duplicate cases - relying on each CMD to be unique already seen_values: set[int] = set() - for entry in merged_entries.copy(): - if (v:=entry["threshold"]) not in seen_values: + for entry in merged_cases.copy(): + if (v:=entry["when"]) not in seen_values: seen_values.add(v) else: # otherwise its a duplicate - merged_entries.remove(entry) + merged_cases.remove(entry) return True @@ -642,7 +456,7 @@ def __init__(self, ctx: Context): self.ctx = ctx self.mecha_database = ctx.inject(Mecha).database vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = MINECRAFT_REFERENECE_VERSION + vanilla.minecraft_version = MINECRAFT_REFERENCE_VERSION vanilla_lang = vanilla.mount("assets/minecraft/lang/en_us.json") self.vanilla_keys = set(vanilla_lang.assets.languages["minecraft:en_us"].data.keys()) self.total_keys: set[str] = set() @@ -654,19 +468,6 @@ def __init__(self, ctx: Context): self.ignored_keys: set[str] = set(ctx.validate("gm4", TranslationLinterOptions).translation_linter_ignores) super().__init__() - @rule(AstNbtValue) - def check_nbt_json(self, node: AstNbtValue): - mc = self.ctx.inject(Mecha) - if isinstance(node.value, (String, str)): - try: - json_ast = mc.parse(node.value, type=AstJson) - with self.use_diagnostics(collec:=DiagnosticCollection()): - self.invoke(json_ast) # process new node with reducer rules - for exc in collec.exceptions: - yield propagate_location(exc, node) - except DiagnosticError: - pass # string is not json - @rule(AstNbtCompound) @rule(AstJsonObject) def missing_en_us_translations(self, node: Union[AstNbtCompound, AstJsonObject]): @@ -1005,7 +806,7 @@ def apply_transform(self, model: Model): #== Convience Template/Transform Presets ==# class LegacyMachineArmorStand(BlockTemplate, TemplateOptions): - """An 'block' template preset with the 'item_display' transformer for the legacy small-armor-stand-head-slot of custom crafters""" + """An 'block' template preset with the 'item_display' transformer for the legacy small-armor-stand-head-slot of some machines""" default_transforms = [ ItemDisplayModel( origin=[0.5, 1, 0.5], diff --git a/gm4/plugins/write_mcmeta.py b/gm4/plugins/write_mcmeta.py index 49f05bea2c..3ef2ab1fb9 100644 --- a/gm4/plugins/write_mcmeta.py +++ b/gm4/plugins/write_mcmeta.py @@ -9,22 +9,18 @@ def beet_default(ctx: Context): manifest = ManifestCacheModel.model_validate(ctx.cache["gm4_manifest"].json) manifest_entry = {v.id:v for v in (manifest.modules|manifest.libraries).values()}.get(ctx.project_id, NoneAttribute()) - ctx.data.pack_format = 71 - ctx.data.supported_formats = {"min_inclusive": 71, "max_inclusive": 94} - ctx.data.min_format = 71 - ctx.data.max_format = 94 + ctx.data.min_format = 99 + ctx.data.max_format = 99 - ctx.assets.pack_format = 55 - ctx.assets.supported_formats = {"min_inclusive": 55, "max_inclusive": 75} - ctx.assets.min_format = 55 - ctx.assets.max_format = 75 + ctx.assets.min_format = 80 + ctx.assets.max_format = 80 for pack in ctx.packs: pack.description = [ ctx.project_name, "\n", { - "text": f"Gamemode 4 (1.21.5+)", + "text": f"Gamemode 4 for 26.1", "color": "#4AA0C7" } ] diff --git a/gm4/skin_cache.json b/gm4/skin_cache.json index e0ff0678cf..c2d7fcb211 100644 --- a/gm4/skin_cache.json +++ b/gm4/skin_cache.json @@ -1093,7 +1093,6 @@ "gm4_potion_liquids:liquids/harming", "gm4_potion_liquids:liquids/healing", "gm4_potion_liquids:liquids/leaping", - "gm4_potion_liquids:liquids/harming", "gm4_potion_liquids:liquids/poison", "gm4_potion_liquids:liquids/regeneration", "gm4_potion_liquids:liquids/strength", @@ -1104,15 +1103,6 @@ ], "gm4_auto_crafting": [ "gm4_custom_crafters:custom_crafter" - ], - "gm4_zauber_liquids": [ - "gm4_potion_liquids:liquids/harming", - "gm4_potion_liquids:liquids/healing", - "gm4_potion_liquids:liquids/leaping", - "gm4_potion_liquids:liquids/poison", - "gm4_potion_liquids:liquids/regeneration", - "gm4_potion_liquids:liquids/strength", - "gm4_potion_liquids:liquids/swiftness" ] } } diff --git a/gm4/utils.py b/gm4/utils.py index 0934a5fa0b..ea3e34d9c6 100644 --- a/gm4/utils.py +++ b/gm4/utils.py @@ -1,24 +1,11 @@ import subprocess import warnings -from contextlib import contextmanager -from dataclasses import asdict, dataclass, replace +from dataclasses import asdict, dataclass from functools import total_ordering -from typing import Any, Generic, Iterator, List, TypeVar - -from beet import Advancement, Context, ItemModifier, ListOption, LootTable, Predicate -from mecha import ( - AbstractNode, - AstJsonObjectEntry, - AstJsonObjectKey, - AstJsonValue, - AstNbtCompound, - DiagnosticCollection, - DiagnosticError, - Mecha, - rule, -) +from typing import Any, Generic, List, TypeVar + +from beet import ListOption from pydantic import RootModel, field_validator -from tokenstream import SourceLocation, set_location T = TypeVar('T') import csv @@ -142,62 +129,6 @@ def validate_root(cls, value: list[T]|dict[str,T]|T) -> list[T]|dict[str,T]: value = [value] return value # type: ignore -# TODO 1.20.5: might not need this anymore -class InvokeOnJsonNbt: - """Extendable mixin to run MutatingReducer's rules on nbt within advancements, loot_tables ect...""" - def __init__(self, ctx: Context): - self.ctx = ctx - raise RuntimeError("InvokeOnJsonNbt should not be directly instantiated. It is a mixin for MutatingReducers and should be interited instead") - - @contextmanager - def use_diagnostics(self, diagnostics: DiagnosticCollection) -> Iterator[None]: - """Class is mixed into MutatingReducer, who does have this method. Passed here for type completion""" - raise NotImplementedError() - - def invoke(self, node: AbstractNode, *args: Any, **kwargs: Any) -> Any: - """Class is mixed into MutatingReducer, who does have this method. Passed here for type completion""" - raise NotImplementedError() - - - @rule(AstJsonObjectEntry, key=AstJsonObjectKey(value='nbt')) - @rule(AstJsonObjectEntry, key=AstJsonObjectKey(value='tag')) - def process_nbt_in_json(self, node: AstJsonObjectEntry): - mc = self.ctx.inject(Mecha) - if isinstance(mc.database.current, (Advancement, LootTable, ItemModifier, Predicate)): - if isinstance(node.value, AstJsonValue) and isinstance(node.value.value, str) \ - and node.value.value.startswith("{") and node.value.value.endswith("}"): # excludes location check block/fluid tags - easier than making rule that checks for 'set_nbt' functions on the same json level - try: - nbt = mc.parse(node.value.value.replace("\n", "\\\\n"), type=AstNbtCompound) - except DiagnosticError as exc: - # if parsing failed, give pretty traceback - for d in exc.diagnostics.exceptions: - yield set_location(replace(d, file=mc.database.current), node.value) - return replace(node, value="{}") - - ## TEMP - trial on yielding children rather than using invoke - # with self.use_diagnostics(captured_diagnostics:=DiagnosticCollection()): - # nbt = yield nbt # run all rules on child-node - # print(captured_diagnostics.exceptions) - # print(nbt) - # new_node = replace(node, value=AstJsonValue(value=mc.serialize(nbt, type=AstNbtCompound))) - - with self.use_diagnostics(captured_diagnostics:=DiagnosticCollection()): - processed_nbt = mc.serialize(self.invoke(nbt, type=AstNbtCompound)) - for exc in captured_diagnostics.exceptions: - yield propagate_location(exc, node.value) # set error location to nbt key-value that caused the problem and pass diagnostic back to mecha - - new_node = replace(node, value=AstJsonValue(value=processed_nbt)) - if new_node != node: - return new_node - - return node - -def propagate_location(obj: T, parent_location_obj: Any) -> T: - """a set_location like function propagating diagnostic information for manually invoked rules""" - return set_location(obj, - SourceLocation(pos=parent_location_obj.location.pos+obj.location.pos, lineno=parent_location_obj.location.lineno, colno=parent_location_obj.location.colno+obj.location.colno), # type: ignore - SourceLocation(pos=parent_location_obj.location.pos+obj.end_location.pos, lineno=parent_location_obj.location.lineno, colno=parent_location_obj.location.colno+obj.end_location.colno) # type: ignore - ) # CSV READING UTILS class CSVCell(str): diff --git a/gm4_animi_shamir/data/gm4_animi_shamir/loot_table/band.json b/gm4_animi_shamir/data/gm4_animi_shamir/loot_table/band.json index 49088c8df8..f748bfbabf 100644 --- a/gm4_animi_shamir/data/gm4_animi_shamir/loot_table/band.json +++ b/gm4_animi_shamir/data/gm4_animi_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/animi" + "minecraft:custom_model_data": {"strings":["gm4_animi_shamir:shamir/animi"]} } }, { diff --git a/gm4_animi_shamir/mod.mcdoc b/gm4_animi_shamir/mod.mcdoc new file mode 100644 index 0000000000..af7ea4d46c --- /dev/null +++ b/gm4_animi_shamir/mod.mcdoc @@ -0,0 +1,12 @@ +use ::java::world::item::ItemStack + +dispatch minecraft:storage[gm4_animi_shamir:cache] to struct { + prepared_entry?: Entry, + temp_entry?: Entry, + inventories?: [Entry], +} + +struct Entry { + owner?: #[uuid] int[] @ 4, + inventory?: [ItemStack], +} diff --git a/gm4_apple_trees/beet.yaml b/gm4_apple_trees/beet.yaml index 56f35512cc..f2ed285cd7 100644 --- a/gm4_apple_trees/beet.yaml +++ b/gm4_apple_trees/beet.yaml @@ -13,14 +13,12 @@ resource_pack: pipeline: - gm4.plugins.extend.module - - gm4.plugins.include.lib_trades - gm4.plugins.include.lib_trees meta: gm4: versioning: required: - lib_trades: 1.6.0 lib_trees: 1.3.0 schedule_loops: - main diff --git a/gm4_apple_trees/data/gm4_apple_trees/function/init.mcfunction b/gm4_apple_trees/data/gm4_apple_trees/function/init.mcfunction index 805e247cd4..1c0c1f7900 100644 --- a/gm4_apple_trees/data/gm4_apple_trees/function/init.mcfunction +++ b/gm4_apple_trees/data/gm4_apple_trees/function/init.mcfunction @@ -10,8 +10,6 @@ scoreboard objectives add gm4_apple_data dummy scoreboard objectives add gm4_ga_root dummy scoreboard objectives add gm4_ga_root_count dummy -scoreboard players set #8 gm4_apple_data 8 -scoreboard players set #4 gm4_apple_data 4 scoreboard players set #stage_1_start gm4_apple_data 20 scoreboard players set #stage_2_start gm4_apple_data 40 scoreboard players set #stage_0_start gm4_apple_data 60 diff --git a/gm4_apple_trees/data/gm4_apple_trees/function/leaf/set_stage/1.mcfunction b/gm4_apple_trees/data/gm4_apple_trees/function/leaf/set_stage/1.mcfunction index 10e6bf25e3..b51c1af13d 100644 --- a/gm4_apple_trees/data/gm4_apple_trees/function/leaf/set_stage/1.mcfunction +++ b/gm4_apple_trees/data/gm4_apple_trees/function/leaf/set_stage/1.mcfunction @@ -8,4 +8,4 @@ scoreboard players operation @s gm4_fruit_stage = #stage_2_start gm4_apple_data # visuals playsound minecraft:block.beehive.drip block @a[distance=..8] ~ ~ ~ 0.3 1.4 -data merge entity @s {Marker:0b,ShowArms:1b,equipment:{offhand:{id:"minecraft:apple",count:1,components:{"minecraft:custom_model_data":"block/apple_unripe"}}},Pose:{LeftArm:[0.0f,90.0f,90.0f]}} +data merge entity @s {Marker:0b,ShowArms:1b,equipment:{offhand:{id:"minecraft:apple",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_apple_trees:block/apple_unripe"]}}}},Pose:{LeftArm:[0.0f,90.0f,90.0f]}} diff --git a/gm4_apple_trees/data/gm4_apple_trees/function/sapling/grow/generate_random_apple_leaf.mcfunction b/gm4_apple_trees/data/gm4_apple_trees/function/sapling/grow/generate_random_apple_leaf.mcfunction index 8268e3a18c..c67ca01a07 100644 --- a/gm4_apple_trees/data/gm4_apple_trees/function/sapling/grow/generate_random_apple_leaf.mcfunction +++ b/gm4_apple_trees/data/gm4_apple_trees/function/sapling/grow/generate_random_apple_leaf.mcfunction @@ -3,13 +3,11 @@ # positioned ^ ^ ^1 # run from gm4_apple_trees:sapling/grow/generate_random_tree -# pick a random facing direction shape -# FUTURE NOTE: replace with more performant loot table randomizer when spigot bug is fixed -execute store result score $random gm4_apple_data run data get entity @s UUID[0] -scoreboard players operation $random gm4_apple_data %= #4 gm4_apple_data +# pick a random facing direction shape +execute store result score $random gm4_apple_data run random value 0..3 # place apple at given orientation execute if score $random gm4_apple_data matches 0 run place template gm4_apple_trees:sapling_growth/apple_leaf ~ ~-1 ~ none execute if score $random gm4_apple_data matches 1 run place template gm4_apple_trees:sapling_growth/apple_leaf ~ ~-1 ~ clockwise_90 execute if score $random gm4_apple_data matches 2 run place template gm4_apple_trees:sapling_growth/apple_leaf ~ ~-1 ~ 180 -execute if score $random gm4_apple_data matches 3 run place template gm4_apple_trees:sapling_growth/apple_leaf ~ ~-1 ~ counterclockwise_90 \ No newline at end of file +execute if score $random gm4_apple_data matches 3 run place template gm4_apple_trees:sapling_growth/apple_leaf ~ ~-1 ~ counterclockwise_90 diff --git a/gm4_apple_trees/data/gm4_apple_trees/function/sapling/grow/generate_random_tree.mcfunction b/gm4_apple_trees/data/gm4_apple_trees/function/sapling/grow/generate_random_tree.mcfunction index c1227c7167..8b8139178b 100644 --- a/gm4_apple_trees/data/gm4_apple_trees/function/sapling/grow/generate_random_tree.mcfunction +++ b/gm4_apple_trees/data/gm4_apple_trees/function/sapling/grow/generate_random_tree.mcfunction @@ -4,16 +4,8 @@ # run from gm4_apple_trees:sapling/generate_tree # pick a random tree shape -# FUTURE NOTE: replace with more performant loot table randomizer when spigot bug is fixed -execute store result score $random gm4_apple_data run data get entity @s UUID[0] -scoreboard players operation $tree_shape gm4_apple_data = $random gm4_apple_data -scoreboard players operation $tree_shape gm4_apple_data %= #8 gm4_apple_data - -scoreboard players operation $random gm4_apple_data /= #8 gm4_apple_data -scoreboard players operation $rotation gm4_apple_data = $random gm4_apple_data -scoreboard players operation $rotation gm4_apple_data %= #4 gm4_apple_data - -# scoreboard players operation $height +execute store result score $tree_shape gm4_apple_data run random value 0..7 +execute store result score $rotation gm4_apple_data run random value 0..3 # place the chosen tree execute if score $tree_shape gm4_apple_data matches 0 if score $rotation gm4_apple_data matches 0 rotated ~ ~ run place template gm4_apple_trees:sapling_growth/apple_tree_short_1 ^-2 ^-1 ^-2 none @@ -62,4 +54,4 @@ execute as @e[type=marker,tag=gm4_jpool_apple_leaf] if predicate gm4_apple_trees # generate corner leaves execute as @e[type=marker,tag=gm4_jpool_corner_leaf] if predicate gm4_apple_trees:corner_leaf_gen_chance at @s positioned ^ ^ ^1 run setblock ~ ~ ~ oak_leaves[persistent=false,distance=3] -kill @e[type=marker,tag=gm4_jigsaw_marker] \ No newline at end of file +kill @e[type=marker,tag=gm4_jigsaw_marker] diff --git a/gm4_apple_trees/data/gm4_apple_trees/function/wandering_trader/register_trade.mcfunction b/gm4_apple_trees/data/gm4_apple_trees/function/wandering_trader/register_trade.mcfunction deleted file mode 100644 index e8919ab81b..0000000000 --- a/gm4_apple_trees/data/gm4_apple_trees/function/wandering_trader/register_trade.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# Adds trades from this expansion to the fruiting trees trade pool. The base randomly will select one trade from the trade pool to be added to a wandering trader. -# @s = a wandering trader without the gm4_fruiting_trader tag (aka without the new trades) -# located at @s -# run from gm4_fruiting_trees:wandering_trader/add_trade - -# apple sapling -execute if predicate gm4_apple_trees:overworld run summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_new_trade_option"],Items:[{id:"minecraft:emerald",count:5,Slot:1b}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:8,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_new_trade_option] horse.0 loot gm4_apple_trees:items/apple_tree_sapling -tag @e[type=trader_llama] remove gm4_new_trade_option diff --git a/gm4_apple_trees/data/gm4_apple_trees/loot_table/items/apple_tree_sapling.json b/gm4_apple_trees/data/gm4_apple_trees/loot_table/items/apple_tree_sapling.json index 0b9f947e79..5f2558efe0 100644 --- a/gm4_apple_trees/data/gm4_apple_trees/loot_table/items/apple_tree_sapling.json +++ b/gm4_apple_trees/data/gm4_apple_trees/loot_table/items/apple_tree_sapling.json @@ -10,17 +10,16 @@ "functions": [ { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.apple_tree_sapling", - "fallback": "Apple Tree Sapling", - "italic": false, - "color": "white" + "fallback": "Apple Tree Sapling" } }, { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/apple_tree_sapling" + "minecraft:custom_model_data": {"strings":["gm4_apple_trees:item/apple_tree_sapling"]} } }, { diff --git a/gm4_apple_trees/data/gm4_apple_trees/villager_trade/emerald_apple_tree_sapling.json b/gm4_apple_trees/data/gm4_apple_trees/villager_trade/emerald_apple_tree_sapling.json new file mode 100644 index 0000000000..3d0ceebdf0 --- /dev/null +++ b/gm4_apple_trees/data/gm4_apple_trees/villager_trade/emerald_apple_tree_sapling.json @@ -0,0 +1,19 @@ +{ + "wants": { + "id": "minecraft:emerald", + "count": 5 + }, + "gives": { + "id": "minecraft:oak_sapling", + "components": { + "minecraft:custom_data": "{gm4_trees:{item:{id:'sapling',type:'apple'}},gm4_podzol_rooting_soil:{id:'apple_tree_sapling'}}", + "minecraft:custom_model_data": {"strings":["gm4_apple_trees:item/apple_tree_sapling"]}, + "minecraft:item_name": { + "translate": "item.gm4.apple_tree_sapling", + "fallback": "Apple Tree Sapling" + } + } + }, + "max_uses": 8, + "xp": 1 +} diff --git a/gm4_apple_trees/data/gm4_golden_apple_trees/function/leaf/set_stage/1.mcfunction b/gm4_apple_trees/data/gm4_golden_apple_trees/function/leaf/set_stage/1.mcfunction index 18d20cb6d8..6d8a9f12a8 100644 --- a/gm4_apple_trees/data/gm4_golden_apple_trees/function/leaf/set_stage/1.mcfunction +++ b/gm4_apple_trees/data/gm4_golden_apple_trees/function/leaf/set_stage/1.mcfunction @@ -8,4 +8,4 @@ scoreboard players operation @s gm4_fruit_stage = #gapple_stage_2_start gm4_appl # visuals playsound minecraft:block.beehive.drip block @a[distance=..8] ~ ~ ~ 0.3 1.4 -data merge entity @s {Marker:0b,ShowArms:1b,equipment:{offhand:{id:"minecraft:golden_apple",count:1,components:{"minecraft:custom_model_data":"block/golden_apple_unripe"}}},Pose:{LeftArm:[0.0f,90.0f,90.0f]}} +data merge entity @s {Marker:0b,ShowArms:1b,equipment:{offhand:{id:"minecraft:golden_apple",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_apple_trees:block/golden_apple_unripe"]}}}},Pose:{LeftArm:[0.0f,90.0f,90.0f]}} diff --git a/gm4_apple_trees/data/gm4_golden_apple_trees/tags/block/rootable.json b/gm4_apple_trees/data/gm4_golden_apple_trees/tags/block/rootable.json index f679143d1b..062ffccab4 100644 --- a/gm4_apple_trees/data/gm4_golden_apple_trees/tags/block/rootable.json +++ b/gm4_apple_trees/data/gm4_golden_apple_trees/tags/block/rootable.json @@ -1,6 +1,6 @@ { "values": [ "#minecraft:base_stone_overworld", - "#minecraft:dirt" + "#minecraft:substrate_overworld" ] } diff --git a/gm4_apple_trees/data/gm4_trades/tags/function/register_trades.json b/gm4_apple_trees/data/gm4_trades/tags/function/register_trades.json deleted file mode 100644 index c15008e315..0000000000 --- a/gm4_apple_trees/data/gm4_trades/tags/function/register_trades.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_apple_trees:wandering_trader/register_trade" - ] -} \ No newline at end of file diff --git a/gm4_apple_trees/data/minecraft/tags/villager_trade/wandering_trader/common.json b/gm4_apple_trees/data/minecraft/tags/villager_trade/wandering_trader/common.json new file mode 100644 index 0000000000..c38b9e6be5 --- /dev/null +++ b/gm4_apple_trees/data/minecraft/tags/villager_trade/wandering_trader/common.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gm4_apple_trees:emerald_apple_tree_sapling" + ] +} diff --git a/gm4_audere_shamir/data/gm4_audere_shamir/loot_table/band.json b/gm4_audere_shamir/data/gm4_audere_shamir/loot_table/band.json index 57ca9f122e..b88cbf71b5 100644 --- a/gm4_audere_shamir/data/gm4_audere_shamir/loot_table/band.json +++ b/gm4_audere_shamir/data/gm4_audere_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/audere" + "minecraft:custom_model_data": {"strings":["gm4_audere_shamir:shamir/audere"]} } }, { diff --git a/gm4_audere_shamir/mod.mcdoc b/gm4_audere_shamir/mod.mcdoc new file mode 100644 index 0000000000..9021700ccc --- /dev/null +++ b/gm4_audere_shamir/mod.mcdoc @@ -0,0 +1,5 @@ +use ::java::world::item::ItemStack + +dispatch minecraft:storage[gm4_audere_shamir:temp/player/tool] to struct { + SelectedItem?: ItemStack, +} diff --git a/gm4_balloon_animals/beet.yaml b/gm4_balloon_animals/beet.yaml index 59e1f842ad..aa7ccaca52 100644 --- a/gm4_balloon_animals/beet.yaml +++ b/gm4_balloon_animals/beet.yaml @@ -8,7 +8,6 @@ data_pack: pipeline: - gm4_balloon_animals.generate - gm4.plugins.extend.module - - gm4.plugins.include.lib_trades require: - bolt @@ -16,8 +15,6 @@ require: meta: gm4: versioning: - required: - lib_trades: 1.6.0 schedule_loops: [main] website: description: Looking for exotic animals? This module makes some Wandering Traders sell cute baby animals! diff --git a/gm4_balloon_animals/data/gm4/advancement/balloon_animals.json b/gm4_balloon_animals/data/gm4/advancement/balloon_animals.json index 80ca7c01a2..dda1ab2f49 100644 --- a/gm4_balloon_animals/data/gm4/advancement/balloon_animals.json +++ b/gm4_balloon_animals/data/gm4/advancement/balloon_animals.json @@ -3,7 +3,7 @@ "icon": { "id": "lead", "components": { - "minecraft:custom_model_data": "gui/advancement/balloon_animals" + "minecraft:custom_model_data": {"strings":["gm4_balloon_animals:gui/advancement/balloon_animals"]} } }, "title": { diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/main.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/main.mcfunction index 2053108f9d..30233eadd9 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/main.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/main.mcfunction @@ -1,4 +1,6 @@ +execute as @e[type=minecraft:wandering_trader,tag=!gm4_balloon_animal_eligible_ignore,tag=!smithed.entity] at @s run function gm4_balloon_animals:wandering_trader/check_eligibility + execute as @e[type=#gm4_balloon_animals:balloon_animal,tag=gm4_balloon_animal,tag=!gm4_balloon_animal_purchased] run function gm4_balloon_animals:balloon/check_leashed schedule function gm4_balloon_animals:main 4s diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/check_eligibility.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/check_eligibility.mcfunction index 59ff7a59a0..e026ecfbd3 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/check_eligibility.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/check_eligibility.mcfunction @@ -1,24 +1,19 @@ # @s = a wandering trader # at @s -# run from #gm4_trades:register_trades +# run from gm4_balloon_animals:main -scoreboard players set $valid_trader gm4_balloon_animals_data 1 +# ensure that this wandering trader is not checked again +tag @s add gm4_balloon_animal_eligible_ignore -# check tags -execute if entity @s[tag=gm4_balloon_animal_eligible_ignore] run scoreboard players set $valid_trader gm4_balloon_animals_data 0 -execute if entity @s[tag=gm4_calling_bell_trader] run scoreboard players set $valid_trader gm4_balloon_animals_data 0 - -data modify storage gm4_balloon_animals:temp trader.uuid set from entity @s UUID -tag @s add gm4_balloon_animal_trader_eligible_check +execute unless predicate gm4_balloon_animals:balloon_trader_chance run return 0 # must have 2 llamas leashed scoreboard players set $trader_llama_count gm4_balloon_animals_data 0 +tag @s add gm4_balloon_animal_trader_eligible_check execute as @e[type=trader_llama,tag=!smithed.entity,distance=..6] on leasher if entity @s[tag=gm4_balloon_animal_trader_eligible_check] run scoreboard players add $trader_llama_count gm4_balloon_animals_data 1 -execute unless score $trader_llama_count gm4_balloon_animals_data matches 2 run scoreboard players set $valid_trader gm4_balloon_animals_data 0 - -tag @s add gm4_balloon_animal_eligible_ignore tag @s remove gm4_balloon_animal_trader_eligible_check -execute if score $valid_trader gm4_balloon_animals_data matches 1 if predicate gm4_balloon_animals:balloon_trader_chance run function gm4_balloon_animals:wandering_trader/init_trader - -# clean up +execute unless score $trader_llama_count gm4_balloon_animals_data matches 2 run return 0 scoreboard players reset $trader_llama_count gm4_balloon_animals_data + +data modify storage gm4_balloon_animals:temp trader.uuid set from entity @s UUID +function gm4_balloon_animals:wandering_trader/init_trader diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/init_trader.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/init_trader.mcfunction index 38a987c84f..bcd32b8ad6 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/init_trader.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/init_trader.mcfunction @@ -1,20 +1,14 @@ # @s = a wandering trader with exactly 2 trader llamas # at @s -# run from wandering_trader/check_eligibility via #gm4_trades:register_trades +# run from wandering_trader/check_eligibility +# mark that this trader was modified tag @s add gm4_balloon_animal_trader -tag @s add gm4_balloon_animal_trader_new - -scoreboard players set $llamas_replaced gm4_balloon_animals_data 0 # find leashed llamas +tag @s add gm4_balloon_animal_trader_new execute as @e[type=trader_llama,tag=!smithed.entity,distance=..6] run function gm4_balloon_animals:wandering_trader/llama/check_leasher +tag @s remove gm4_balloon_animal_trader_new # pick two animals and set up trades function gm4_balloon_animals:wandering_trader/pick_two_animals - - -# clean up -scoreboard players reset $trader_llama_check gm4_balloon_animals_data - -tag @s remove gm4_balloon_animal_trader_new diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/llama/check_leasher.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/llama/check_leasher.mcfunction index 10df14b70e..f1af507a88 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/llama/check_leasher.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/llama/check_leasher.mcfunction @@ -1,7 +1,8 @@ # Checks that this trader llama is attached to the wandering trader that is being checked -# @s = a llama within 5 blocks of the wandering trader being checked +# @s = a llama within 6 blocks of the wandering trader being checked # at @s # run from wandering_trader/init_trader execute store result score $trader_llama_check gm4_balloon_animals_data on leasher if entity @s[tag=gm4_balloon_animal_trader_new] execute if score $trader_llama_check gm4_balloon_animals_data matches 1 run function gm4_balloon_animals:wandering_trader/llama/kill +scoreboard players reset $trader_llama_check gm4_balloon_animals_data diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/llama/kill.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/llama/kill.mcfunction index 8144334532..dd7f720c8f 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/llama/kill.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/llama/kill.mcfunction @@ -1,11 +1,9 @@ -# @s = a llama within 5 blocks of the wandering trader being checked +# @s = a llama within 6 blocks of the wandering trader being checked # at @s # run from wandering_trader/llama/check_leasher execute on leasher at @s unless entity @e[type=marker,tag=gm4_balloon_animal_item_cleanup,distance=..0.01,limit=1] summon marker run tag @s add gm4_balloon_animal_item_cleanup -scoreboard players add $llamas_replaced gm4_balloon_animals_data 1 - tp @s ~ ~-4096 ~ kill @s diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/pick_two_animals.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/pick_two_animals.mcfunction index a023022ac8..0a3decfadf 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/pick_two_animals.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/pick_two_animals.mcfunction @@ -1,4 +1,4 @@ -# @s = a wandering trader with no trader llamas, tag=gm4_balloon_animal_trader,tag=gm4_balloon_animal_trader_new +# @s = a wandering trader with no trader llamas, tag=gm4_balloon_animal_trader # at @s # run from wandering_trader/init_trader diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_bee_nest.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_bee_nest.mcfunction index 85b2c5cd47..2cb76f7c6b 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_bee_nest.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_bee_nest.mcfunction @@ -1,9 +1,5 @@ -# @s = trader llama -# at wandering trader with no llamas, tag=gm4_balloon_animal_trader,tag=gm4_balloon_animal_trader_new +# @s = wandering trader +# at wandering trader with no llamas, tag=gm4_balloon_animal_trader # run from wandering_trader/trade/pick_animal -tp @s ~ 0 ~ - -data merge entity @s {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{id:"minecraft:emerald",count:8,Slot:1b}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:1,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}} - -loot replace entity @s horse.0 loot gm4_balloon_animals:bee_nest +data modify storage gm4_balloon_animals:temp trade set value {buy:{id:"minecraft:emerald",count:8},sell:{id:"minecraft:bee_nest",components:{"minecraft:bees":[{entity_data:{id:"minecraft:bee"},ticks_in_hive:0,min_ticks_in_hive:0}]}},maxUses:1,rewardExp:1b,xp:1,priceMultiplier:0.05f} diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_chicken_egg.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_chicken_egg.mcfunction index 077beb9cd0..f0b80db51d 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_chicken_egg.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_chicken_egg.mcfunction @@ -1,13 +1,10 @@ -# @s = trader llama -# at wandering trader with no llamas, tag=gm4_balloon_animal_trader,tag=gm4_balloon_animal_trader_new +# @s = wandering trader +# at wandering trader with no llamas, tag=gm4_balloon_animal_trader # run from wandering_trader/trade/pick_animal -tp @s ~ 0 ~ - -data merge entity @s {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{id:"minecraft:emerald",count:2,Slot:1b}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1b,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:4,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}} - +data modify storage gm4_balloon_animals:temp trade set value {buy:{id:"minecraft:emerald",count:2},maxUses:1,rewardExp:1b,xp:1,priceMultiplier:0.05f} execute store result score $variant_id gm4_balloon_animals_data run random value 0..2 - -for index, egg_variant in enumerate(ctx.meta['chicken_eggs']): - execute if score $variant_id gm4_balloon_animals_data matches index run loot replace entity @s horse.0 loot f"gm4_balloon_animals:chicken_egg/{egg_variant}" +execute if score $variant_id gm4_balloon_animals_data matches 0 run data modify storage gm4_balloon_animals:temp trade.sell set value {id:"minecraft:egg",count:8} +execute if score $variant_id gm4_balloon_animals_data matches 1 run data modify storage gm4_balloon_animals:temp trade.sell set value {id:"minecraft:blue_egg",count:8} +execute if score $variant_id gm4_balloon_animals_data matches 2 run data modify storage gm4_balloon_animals:temp trade.sell set value {id:"minecraft:brown_egg",count:8} diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_lead.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_lead.mcfunction new file mode 100644 index 0000000000..c5c141890d --- /dev/null +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_lead.mcfunction @@ -0,0 +1,11 @@ +# @s = animal to be attached to trader +# at wandering trader with no llamas, tag=gm4_balloon_animal_trader +# run from wandering_trader/trade/init_[animal|wolf|farm] + +data modify storage gm4_balloon_animals:temp trade set value {buy:{id:"minecraft:emerald",count:12},maxUses:1,rewardExp:1b,xp:1,priceMultiplier:0.05f} + +loot spawn ~ -4096 ~ loot gm4_balloon_animals:lead +execute positioned ~ -4096 ~ run data modify storage gm4_balloon_animals:temp trade.sell set from entity @e[type=item,predicate=gm4_balloon_animals:is_lead,distance=..1,limit=1] Item +execute positioned ~ -4096 ~ run kill @e[type=item,predicate=gm4_balloon_animals:is_lead,distance=..1,limit=1] + +data modify entity @s CustomName set from storage gm4_balloon_animals:temp trade.sell.components."minecraft:lore"[0].text diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_turtle_egg.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_turtle_egg.mcfunction index f1768625c5..6fa5348627 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_turtle_egg.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/add_turtle_egg.mcfunction @@ -1,9 +1,5 @@ -# @s = trader llama -# at wandering trader with no llamas, tag=gm4_balloon_animal_trader,tag=gm4_balloon_animal_trader_new +# @s = wandering trader +# at wandering trader with no llamas, tag=gm4_balloon_animal_trader # run from wandering_trader/trade/pick_animal -tp @s ~ 0 ~ - -data merge entity @s {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{id:"minecraft:emerald",count:8,Slot:1b}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:1,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}} - -loot replace entity @s horse.0 loot gm4_balloon_animals:turtle_egg +data modify storage gm4_balloon_animals:temp trade set value {buy:{id:"minecraft:emerald",count:8},sell:{id:"minecraft:turtle_egg",count:1},maxUses:1,rewardExp:1b,xp:1,priceMultiplier:0.05f} diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_animal.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_animal.mcfunction index f2db719efe..6f9f33297c 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_animal.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_animal.mcfunction @@ -1,5 +1,5 @@ # @s = animal to be attached to trader, type=#gm4_balloon_animals:balloon_animal -# at wandering trader with no llamas, tag=gm4_balloon_animal_trader,tag=gm4_balloon_animal_trader_new +# at wandering trader with no llamas, tag=gm4_balloon_animal_trader # run from wandering_trader/trade/pick_animal tag @s add gm4_balloon_animal @@ -11,10 +11,7 @@ effect give @s resistance infinite 4 true data modify entity @s Age set value -2147483648 data modify entity @s leash.UUID set from storage gm4_balloon_animals:temp trader.uuid -scoreboard players add $id gm4_balloon_animals_id 1 -scoreboard players operation @s gm4_balloon_animals_id = $id gm4_balloon_animals_id +execute store result score @s gm4_balloon_animals_id run scoreboard players add $id gm4_balloon_animals_id 1 execute store result storage gm4_balloon_animals:temp gm4_balloon_animals.id int 1 run scoreboard players get $id gm4_balloon_animals_id -execute summon trader_llama run function gm4_balloon_animals:wandering_trader/trade/spawn_trade_llama - -data modify entity @s CustomName set from storage gm4_balloon_animals:temp CustomName +function gm4_balloon_animals:wandering_trader/trade/add_lead diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_farm.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_farm.mcfunction index 1ebdd10287..c0838db44a 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_farm.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_farm.mcfunction @@ -1,5 +1,5 @@ # @s = farm animal to be attached to trader, type=#gm4_balloon_animals:balloon_animal -# at wandering trader with no llamas, tag=gm4_balloon_animal_trader,tag=gm4_balloon_animal_trader_new +# at wandering trader with no llamas, tag=gm4_balloon_animal_trader # run from wandering_trader/trade/pick_animal tag @s add gm4_balloon_animal @@ -12,13 +12,11 @@ data modify entity @s Age set value -2147483648 data modify entity @s leash.UUID set from storage gm4_balloon_animals:temp trader.uuid execute store result score $variant_id gm4_balloon_animals_data run random value 0..2 -for index, farm_variant in enumerate(ctx.meta['farm_variants']): - execute if score $variant_id gm4_balloon_animals_data matches index run data modify entity @s variant set value f"{farm_variant}" +execute if score $variant_id gm4_balloon_animals_data matches 0 run data modify entity @s variant set value "minecraft:warm" +execute if score $variant_id gm4_balloon_animals_data matches 1 run data modify entity @s variant set value "minecraft:temperate" +execute if score $variant_id gm4_balloon_animals_data matches 2 run data modify entity @s variant set value "minecraft:cold" -scoreboard players add $id gm4_balloon_animals_id 1 -scoreboard players operation @s gm4_balloon_animals_id = $id gm4_balloon_animals_id +execute store result score @s gm4_balloon_animals_id run scoreboard players add $id gm4_balloon_animals_id 1 execute store result storage gm4_balloon_animals:temp gm4_balloon_animals.id int 1 run scoreboard players get $id gm4_balloon_animals_id -execute summon trader_llama run function gm4_balloon_animals:wandering_trader/trade/spawn_trade_llama - -data modify entity @s CustomName set from storage gm4_balloon_animals:temp CustomName +function gm4_balloon_animals:wandering_trader/trade/add_lead diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_wolf.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_wolf.mcfunction index 48a76fe9df..8878f8185d 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_wolf.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/init_wolf.mcfunction @@ -1,5 +1,5 @@ # @s = wolf to be attached to trader, type=#gm4_balloon_animals:balloon_animal -# at wandering trader with no llamas, tag=gm4_balloon_animal_trader,tag=gm4_balloon_animal_trader_new +# at wandering trader with no llamas, tag=gm4_balloon_animal_trader # run from wandering_trader/trade/pick_animal tag @s add gm4_balloon_animal @@ -12,13 +12,17 @@ data modify entity @s Age set value -2147483648 data modify entity @s leash.UUID set from storage gm4_balloon_animals:temp trader.uuid execute store result score $variant_id gm4_balloon_animals_data run random value 0..8 -for index, wolf_variant in enumerate(ctx.meta['wolf_variants']): - execute if score $variant_id gm4_balloon_animals_data matches index run data modify entity @s variant set value f"{wolf_variant}" +execute if score $variant_id gm4_balloon_animals_data matches 0 run data modify entity @s variant set value "minecraft:pale" +execute if score $variant_id gm4_balloon_animals_data matches 1 run data modify entity @s variant set value "minecraft:ashen" +execute if score $variant_id gm4_balloon_animals_data matches 2 run data modify entity @s variant set value "minecraft:black" +execute if score $variant_id gm4_balloon_animals_data matches 3 run data modify entity @s variant set value "minecraft:chestnut" +execute if score $variant_id gm4_balloon_animals_data matches 4 run data modify entity @s variant set value "minecraft:rusty" +execute if score $variant_id gm4_balloon_animals_data matches 5 run data modify entity @s variant set value "minecraft:snowy" +execute if score $variant_id gm4_balloon_animals_data matches 6 run data modify entity @s variant set value "minecraft:spotted" +execute if score $variant_id gm4_balloon_animals_data matches 7 run data modify entity @s variant set value "minecraft:striped" +execute if score $variant_id gm4_balloon_animals_data matches 7 run data modify entity @s variant set value "minecraft:woods" -scoreboard players add $id gm4_balloon_animals_id 1 -scoreboard players operation @s gm4_balloon_animals_id = $id gm4_balloon_animals_id +execute store result score @s gm4_balloon_animals_id run scoreboard players add $id gm4_balloon_animals_id 1 execute store result storage gm4_balloon_animals:temp gm4_balloon_animals.id int 1 run scoreboard players get $id gm4_balloon_animals_id -execute summon trader_llama run function gm4_balloon_animals:wandering_trader/trade/spawn_trade_llama - -data modify entity @s CustomName set from storage gm4_balloon_animals:temp CustomName +function gm4_balloon_animals:wandering_trader/trade/add_lead diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/pick_animal.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/pick_animal.mcfunction index 95e600c723..840097af94 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/pick_animal.mcfunction +++ b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/pick_animal.mcfunction @@ -1,4 +1,4 @@ -# @s = wandering trader and no trader llamas, tag=gm4_balloon_animal_trader,tag=gm4_balloon_animal_trader_new +# @s = wandering trader and no trader llamas, tag=gm4_balloon_animal_trader # at @s # run from wandering_trader/pick_two_animals @@ -6,8 +6,10 @@ execute store result score $animal_id gm4_balloon_animals_data run loot spawn ~ for animal in ctx.meta['animals']: if animal['function'] not in ['init_animal', 'init_wolf','init_farm']: - execute if score $animal_id gm4_balloon_animals_data matches ctx.meta['enumeration'].index(animal['id']) summon minecraft:trader_llama run function f"gm4_balloon_animals:wandering_trader/trade/{animal['function']}" + execute if score $animal_id gm4_balloon_animals_data matches ctx.meta['enumeration'].index(animal['id']) run function f"gm4_balloon_animals:wandering_trader/trade/{animal['function']}" continue execute if score $animal_id gm4_balloon_animals_data matches ctx.meta['enumeration'].index(animal['id']) summon animal['id'] run function f"gm4_balloon_animals:wandering_trader/trade/{animal['function']}" - + +data modify entity @s Offers.Recipes append from storage gm4_balloon_animals:temp trade +data remove storage gm4_balloon_animals:temp trade diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/spawn_trade_llama.mcfunction b/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/spawn_trade_llama.mcfunction deleted file mode 100644 index aac030c966..0000000000 --- a/gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/trade/spawn_trade_llama.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# @s = trader llama -# at wandering trader with no llamas, tag=gm4_balloon_animal_trader,tag=gm4_balloon_animal_trader_new -# run from wandering_trader/trade/init_[animal|wolf|farm] - -tp @s ~ 0 ~ -data merge entity @s {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{id:"minecraft:emerald",count:12,Slot:1b}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:1,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}} - -loot replace entity @s horse.0 loot gm4_balloon_animals:lead - -data modify storage gm4_balloon_animals:temp CustomName set from entity @s Items[0].components."minecraft:lore"[0].text diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/bee_nest.json b/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/bee_nest.json deleted file mode 100644 index aaba88f888..0000000000 --- a/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/bee_nest.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bee_nest", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:bees": [ - { - "entity_data": { - "id": "minecraft:bee" - }, - "ticks_in_hive": 0, - "min_ticks_in_hive": 0 - } - ] - } - } - ] - } - ] - } - ] -} diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/chicken_egg/blue_egg.json b/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/chicken_egg/blue_egg.json deleted file mode 100644 index 20e46c0072..0000000000 --- a/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/chicken_egg/blue_egg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:blue_egg", - "functions": [ - { - "function": "minecraft:set_count", - "count": 8 - } - ] - } - ] - } - ] -} diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/chicken_egg/brown_egg.json b/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/chicken_egg/brown_egg.json deleted file mode 100644 index 35b1d8fb68..0000000000 --- a/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/chicken_egg/brown_egg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:brown_egg", - "functions": [ - { - "function": "minecraft:set_count", - "count": 8 - } - ] - } - ] - } - ] -} diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/chicken_egg/egg.json b/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/chicken_egg/egg.json deleted file mode 100644 index 368774d675..0000000000 --- a/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/chicken_egg/egg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:egg", - "functions": [ - { - "function": "minecraft:set_count", - "count": 8 - } - ] - } - ] - } - ] -} diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/turtle_egg.json b/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/turtle_egg.json deleted file mode 100644 index 4053008114..0000000000 --- a/gm4_balloon_animals/data/gm4_balloon_animals/loot_table/turtle_egg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:turtle_egg" - } - ] - } - ] -} diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/predicate/is_lead.json b/gm4_balloon_animals/data/gm4_balloon_animals/predicate/is_lead.json new file mode 100644 index 0000000000..e924b5b3b7 --- /dev/null +++ b/gm4_balloon_animals/data/gm4_balloon_animals/predicate/is_lead.json @@ -0,0 +1,14 @@ +{ + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "slots": { + "contents": { + "items": "minecraft:lead", + "predicates": { + "minecraft:custom_data": "{gm4_balloon_animals:{}}" + } + } + } + } +} diff --git a/gm4_balloon_animals/data/gm4_trades/tags/function/register_trades.json b/gm4_balloon_animals/data/gm4_trades/tags/function/register_trades.json deleted file mode 100644 index 4dca2165e5..0000000000 --- a/gm4_balloon_animals/data/gm4_trades/tags/function/register_trades.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_balloon_animals:wandering_trader/check_eligibility" - ] -} diff --git a/gm4_balloon_animals/generate.py b/gm4_balloon_animals/generate.py index b9bec7cc71..f42d1abc82 100644 --- a/gm4_balloon_animals/generate.py +++ b/gm4_balloon_animals/generate.py @@ -24,15 +24,7 @@ def beet_default(ctx: Context): rare_animals.sort() common_animals.sort() - # set variants - wolf_variants = ["minecraft:pale", "minecraft:ashen", "minecraft:black", "minecraft:chestnut", "minecraft:rusty", "minecraft:snowy", "minecraft:spotted", "minecraft:striped", "minecraft:woods"] - farm_variants = ["minecraft:warm", "minecraft:temperate","minecraft:cold"] - chicken_eggs = ["egg", "blue_egg", "brown_egg"] - # store to meta ctx.meta['animals'] = animals ctx.meta['enumeration'] = [*common_animals, *rare_animals] ctx.meta['rare_start'] = len(common_animals) - ctx.meta['wolf_variants'] = wolf_variants - ctx.meta['farm_variants'] = farm_variants - ctx.meta['chicken_eggs'] = chicken_eggs diff --git a/gm4_balloon_animals/mod.mcdoc b/gm4_balloon_animals/mod.mcdoc new file mode 100644 index 0000000000..df58769cbe --- /dev/null +++ b/gm4_balloon_animals/mod.mcdoc @@ -0,0 +1,19 @@ +use ::java::world::entity::mob::breedable::villager::Recipe + +dispatch minecraft:storage[gm4_balloon_animals:temp] to struct { + player?: struct { + uuid: #[uuid] int[] @ 4, + }, + trader?: struct { + uuid: #[uuid] int[] @ 4, + }, + temp_source?: [Recipe], + trades?: [Recipe], + trade?: Recipe, + gm4_balloon_animals?: BalloonAnimalsData, +} + +dispatch mcdoc:custom_data[gm4_balloon_animals] to struct BalloonAnimalsData { + trade?: byte, + id?: int, +} diff --git a/gm4_bat_grenades/data/gm4/advancement/bat_grenades.json b/gm4_bat_grenades/data/gm4/advancement/bat_grenades.json index e106ab08a8..863dfe734b 100644 --- a/gm4_bat_grenades/data/gm4/advancement/bat_grenades.json +++ b/gm4_bat_grenades/data/gm4/advancement/bat_grenades.json @@ -3,7 +3,7 @@ "icon": { "id": "gunpowder", "components": { - "minecraft:custom_model_data": "gui/advancement/bat_grenades" + "minecraft:custom_model_data": {"strings":["gm4_bat_grenades:gui/advancement/bat_grenades"]} } }, "title": { diff --git a/gm4_bat_grenades/data/gm4_bat_grenades/loot_table/items/bat_leather.json b/gm4_bat_grenades/data/gm4_bat_grenades/loot_table/items/bat_leather.json index 8d3787cc98..3d77688fb4 100644 --- a/gm4_bat_grenades/data/gm4_bat_grenades/loot_table/items/bat_leather.json +++ b/gm4_bat_grenades/data/gm4_bat_grenades/loot_table/items/bat_leather.json @@ -10,15 +10,15 @@ { "function": "set_components", "components": { - "minecraft:custom_model_data": "item/bat_leather" + "minecraft:custom_model_data": {"strings":["gm4_bat_grenades:item/bat_leather"]} } }, { "function": "set_name", + "target": "item_name", "name": { "translate": "item.gm4.bat_leather", - "fallback": "Bat Leather", - "italic": false + "fallback": "Bat Leather" } }, { diff --git a/gm4_better_armour_stands/data/gm4/advancement/better_armour_stands.json b/gm4_better_armour_stands/data/gm4/advancement/better_armour_stands.json index 207300ae52..9cdc14a337 100644 --- a/gm4_better_armour_stands/data/gm4/advancement/better_armour_stands.json +++ b/gm4_better_armour_stands/data/gm4/advancement/better_armour_stands.json @@ -3,7 +3,7 @@ "icon": { "id": "armor_stand", "components": { - "minecraft:custom_model_data": "gui/advancement/better_armour_stands" + "minecraft:custom_model_data": {"strings":["gm4_better_armour_stands:gui/advancement/better_armour_stands"]} } }, "title": { diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/pose/select/success.mcfunction b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/pose/select/success.mcfunction index 7f33e5613b..9a8c1b9987 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/pose/select/success.mcfunction +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/pose/select/success.mcfunction @@ -8,7 +8,7 @@ tag @s add gm4_bas_track tag @a[tag=gm4_bas_active,limit=1] add gm4_bas_track data modify entity @s DisabledSlots set value 4144959 -data modify entity @s[nbt={Invisible:1b}] Glowing set value 1 +data modify entity @s[nbt={Invisible:1b}] Glowing set value 1b # right click detection summon minecraft:interaction ~ ~ ~ {Tags:["smithed.entity","smithed.strict","gm4_bas_detect","gm4_bas_new","gm4_bas_temp"],height:2,width:1} diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/base.mcfunction b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/base.mcfunction index 57ab17790f..c31690de2c 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/base.mcfunction +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/base.mcfunction @@ -7,11 +7,11 @@ scoreboard players set $valid_code gm4_bas_data 1 # toggle base plate execute store result score $base gm4_bas_data run data get entity @s NoBasePlate -execute if score $base gm4_bas_data matches 0 run data modify entity @s NoBasePlate set value 1 +execute if score $base gm4_bas_data matches 0 run data modify entity @s NoBasePlate set value 1b execute if score $base gm4_bas_data matches 0 run playsound minecraft:block.stone.break block @a[distance=..6] ~ ~ ~ 0.5 1 execute if score $base gm4_bas_data matches 0 run particle minecraft:block{block_state:"minecraft:smooth_stone"} ~ ~ ~ .15 0 .15 0 10 -execute if score $base gm4_bas_data matches 1 run data modify entity @s NoBasePlate set value 0 +execute if score $base gm4_bas_data matches 1 run data modify entity @s NoBasePlate set value 0b execute if score $base gm4_bas_data matches 1 run playsound minecraft:block.stone.place block @a[distance=..6] ~ ~ ~ 0.5 1 # advancement for customizing armor_stand diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/gravity.mcfunction b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/gravity.mcfunction index a3a86de120..d4d1d9e9b6 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/gravity.mcfunction +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/gravity.mcfunction @@ -8,10 +8,10 @@ scoreboard players set $valid_code gm4_bas_data 1 execute store result score $gravity gm4_bas_data run data get entity @s NoGravity playsound minecraft:item.chorus_fruit.teleport block @a[distance=..6] ~ ~ ~ 0.5 2 -execute if score $gravity gm4_bas_data matches 0 run data modify entity @s NoGravity set value 1 +execute if score $gravity gm4_bas_data matches 0 run data modify entity @s NoGravity set value 1b execute if score $gravity gm4_bas_data matches 0 run particle minecraft:reverse_portal ~ ~ ~ .2 1 .2 0 20 -execute if score $gravity gm4_bas_data matches 1 run data modify entity @s NoGravity set value 0 +execute if score $gravity gm4_bas_data matches 1 run data modify entity @s NoGravity set value 0b execute if score $gravity gm4_bas_data matches 1 run particle minecraft:portal ~ ~ ~ .2 1 .2 0 20 # advancement for customizing armor_stand diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/lock/unlock.mcfunction b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/lock/unlock.mcfunction index 9621f81c94..012d242f97 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/lock/unlock.mcfunction +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/lock/unlock.mcfunction @@ -5,7 +5,7 @@ scoreboard players set $valid_code gm4_bas_data 1 # unlock armor_stand -data modify entity @s Glowing set value 0 +data modify entity @s Glowing set value 0b playsound minecraft:block.wooden_trapdoor.open block @a[distance=..6] ~ ~ ~ 0.5 2 particle minecraft:enchant ~ ~.5 ~ .15 .5 .15 0 10 diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/size.mcfunction b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/size.mcfunction index 051a0fafe5..fb3efe454a 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/size.mcfunction +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/size.mcfunction @@ -8,10 +8,10 @@ scoreboard players set $valid_code gm4_bas_data 1 execute store result score $size gm4_bas_data run data get entity @s Small playsound minecraft:entity.armor_stand.fall block @a[distance=..6] ~ ~ ~ 0.5 1 -execute if score $size gm4_bas_data matches 0 run data modify entity @s Small set value 1 +execute if score $size gm4_bas_data matches 0 run data modify entity @s Small set value 1b execute if score $size gm4_bas_data matches 0 run playsound minecraft:entity.puffer_fish.blow_out block @a[distance=..6] ~ ~ ~ .3 2 -execute if score $size gm4_bas_data matches 1 run data modify entity @s Small set value 0 +execute if score $size gm4_bas_data matches 1 run data modify entity @s Small set value 0b execute if score $size gm4_bas_data matches 1 run playsound minecraft:entity.puffer_fish.blow_up block @a[distance=..6] ~ ~ ~ .3 2 # advancement for customizing armor_stand diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/visible.mcfunction b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/visible.mcfunction index 3675b8fc55..657378bc79 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/visible.mcfunction +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/function/toggle/visible.mcfunction @@ -8,10 +8,10 @@ scoreboard players set $valid_code gm4_bas_data 1 execute store result score $invisible gm4_bas_data run data get entity @s Invisible playsound minecraft:entity.player.attack.nodamage neutral @a[distance=..6] ~ ~ ~ 0.5 0.6 -execute if score $invisible gm4_bas_data matches 0 run data modify entity @s Invisible set value 1 +execute if score $invisible gm4_bas_data matches 0 run data modify entity @s Invisible set value 1b execute if score $invisible gm4_bas_data matches 0 run effect give @s glowing 2 0 -execute if score $invisible gm4_bas_data matches 1 run data modify entity @s Invisible set value 0 +execute if score $invisible gm4_bas_data matches 1 run data modify entity @s Invisible set value 0b execute if score $invisible gm4_bas_data matches 1 run effect clear @s glowing # advancement for customizing armor_stand diff --git a/gm4_better_armour_stands/mod.mcdoc b/gm4_better_armour_stands/mod.mcdoc new file mode 100644 index 0000000000..0d80378df3 --- /dev/null +++ b/gm4_better_armour_stands/mod.mcdoc @@ -0,0 +1,20 @@ +use ::java::world::entity::mob::armor_stand::Pose +use ::java::world::entity::AnyEntity +use ::java::util::Filterable + +dispatch minecraft:storage[gm4_better_armour_stands:default] to struct { + Pose?: Pose +} + +dispatch minecraft:storage[gm4_better_armour_stands:temp] to struct { + pages?: [Filterable], + entity_data?: AnyEntity, + CurrentPose?: Pose, + Pose?: Pose, + Undo?: any, + Data?: struct { + Pose?: Pose, + Rotation?: [float] @ 2, + Pos?: [double] @ 3, + }, +} diff --git a/gm4_better_fire/README.md b/gm4_better_fire/README.md deleted file mode 100644 index ac8fdd42c0..0000000000 --- a/gm4_better_fire/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Better Fire - -Fire needed more effects in game... - -### Features -- Flaming arrows set the ground alight wherever they land -- Creepers on fire with less than one-heart of health will explode -- Flaming arrows have a chance of dropping an arrowhead (flint) after they land and burn up. diff --git a/gm4_better_fire/assets/gm4_better_fire/textures/item/charred_arrowhead.png b/gm4_better_fire/assets/gm4_better_fire/textures/item/charred_arrowhead.png deleted file mode 100644 index 1c1c4b6d12..0000000000 Binary files a/gm4_better_fire/assets/gm4_better_fire/textures/item/charred_arrowhead.png and /dev/null differ diff --git a/gm4_better_fire/assets/translations.csv b/gm4_better_fire/assets/translations.csv deleted file mode 100644 index d5bc83e000..0000000000 --- a/gm4_better_fire/assets/translations.csv +++ /dev/null @@ -1,7 +0,0 @@ -key,en_us -advancement.gm4.better_fire.title,Flint 'n Stick -advancement.gm4.better_fire.description,Fire a Flame Bow -item.gm4.better_fire.flint,Flint -item.gm4.better_fire.flint.lore,Charred arrowhead -text.gm4.guidebook.module_desc.better_fire,Spice up Minecraft's fire mechanics with this module! Flame arrows set fire when they land and burning creepers explode when low on health! -text.gm4.guidebook.better_fire.description,"Flame arrows set the block they land on with fire, sometimes dropping the arrowhead.\n\nFire can also cause a creeper to explode as if lit by flint and steel." diff --git a/gm4_better_fire/beet.yaml b/gm4_better_fire/beet.yaml deleted file mode 100644 index 173a6f5896..0000000000 --- a/gm4_better_fire/beet.yaml +++ /dev/null @@ -1,42 +0,0 @@ -id: gm4_better_fire -name: Better Fire -version: 1.6.X - -data_pack: - load: . - -resource_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - -meta: - gm4: - versioning: - schedule_loops: [main] - website: - description: Spice up Minecraft's fire mechanics with this module! Flame arrows set fire when they land and burning creepers explode when low on health! - recommended: - - gm4_bat_grenades - - gm4_enderman_support_class - notes: [] - modrinth: - project_id: tQgWS7r6 - video: https://www.youtube.com/watch?v=J5024LhHuWk - wiki: https://wiki.gm4.co/wiki/Better_Fire - credits: - Creator: - - Sparks - Updated By: - - Bloo - - SpecialBuilder32 - Icon Design: - - Sparks - model_data: - - item: flint - reference: item/charred_arrowhead - template: generated - - item: bow - reference: gui/advancement/better_fire - template: advancement diff --git a/gm4_better_fire/data/gm4/advancement/better_fire.json b/gm4_better_fire/data/gm4/advancement/better_fire.json deleted file mode 100644 index 91dbbfdda7..0000000000 --- a/gm4_better_fire/data/gm4/advancement/better_fire.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "display": { - "icon": { - "id": "bow", - "components": { - "minecraft:enchantments": { - "flame": 1 - }, - "minecraft:custom_model_data": "gui/advancement/better_fire" - } - }, - "title": { - "translate": "advancement.gm4.better_fire.title", - "fallback": "Flint 'n Stick" - }, - "description": { - "translate": "advancement.gm4.better_fire.description", - "fallback": "Fire a Flame Bow", - "color": "gray" - } - }, - "parent": "gm4:root", - "criteria": { - "gm4_better_fire_shoot_fire_arrow": { - "trigger": "minecraft:item_durability_changed", - "conditions": { - "delta": -1, - "item": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:flame", - "levels": 1 - } - ] - }, - "items": [ - "minecraft:bow" - ] - } - } - } - } -} diff --git a/gm4_better_fire/data/gm4_better_fire/function/arrow.mcfunction b/gm4_better_fire/data/gm4_better_fire/function/arrow.mcfunction deleted file mode 100644 index a6e401b9a4..0000000000 --- a/gm4_better_fire/data/gm4_better_fire/function/arrow.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# Sets one fire block -# Attempts to spawn a flint -# Destroys arrow, once it has made contact with a block -# @s = arrow -# runs from on_fire - -setblock ~ ~ ~ fire keep -execute if entity @s[nbt={pickup:1b}] run loot spawn ~ ~ ~ loot gm4_better_fire:entities/flame_arrow/flint - -kill @s diff --git a/gm4_better_fire/data/gm4_better_fire/function/init.mcfunction b/gm4_better_fire/data/gm4_better_fire/function/init.mcfunction deleted file mode 100644 index 3bf7257e39..0000000000 --- a/gm4_better_fire/data/gm4_better_fire/function/init.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -scoreboard objectives add gm4_creep_health dummy - -execute unless score better_fire gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Better Fire"} -execute unless score better_fire gm4_earliest_version < better_fire gm4_modules run scoreboard players operation better_fire gm4_earliest_version = better_fire gm4_modules -scoreboard players set better_fire gm4_modules 1 - -schedule function gm4_better_fire:main 1t - - - -#$moduleUpdateList diff --git a/gm4_better_fire/data/gm4_better_fire/function/main.mcfunction b/gm4_better_fire/data/gm4_better_fire/function/main.mcfunction deleted file mode 100644 index c4ce68cf01..0000000000 --- a/gm4_better_fire/data/gm4_better_fire/function/main.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -execute as @e[tag=!smithed.entity,predicate=gm4_better_fire:on_fire] run function gm4_better_fire:on_fire - -schedule function gm4_better_fire:main 16t diff --git a/gm4_better_fire/data/gm4_better_fire/function/on_fire.mcfunction b/gm4_better_fire/data/gm4_better_fire/function/on_fire.mcfunction deleted file mode 100644 index f5f352aa98..0000000000 --- a/gm4_better_fire/data/gm4_better_fire/function/on_fire.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @s, flame arrow or creeper on fire -# runs from main - -#fire arrows place fire -execute as @s[type=arrow,tag=!gm4_bf_ignore,nbt={inGround:1b}] if data entity @s Fire at @s run function gm4_better_fire:arrow - -#make creepers explode when on fire and low on Health -execute if entity @s[type=creeper] store result score @s gm4_creep_health run data get entity @s Health 1 -data merge entity @s[type=creeper,scores={gm4_creep_health=0..2}] {Fuse:0} diff --git a/gm4_better_fire/data/gm4_better_fire/guidebook/better_fire.json b/gm4_better_fire/data/gm4_better_fire/guidebook/better_fire.json deleted file mode 100644 index 96d96f31af..0000000000 --- a/gm4_better_fire/data/gm4_better_fire/guidebook/better_fire.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "id": "better_fire", - "name": "Better Fire", - "module_type": "module", - "icon": { - "id": "minecraft:flint_and_steel" - }, - "criteria": { - "obtain_flint_and_steel": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:flint_and_steel" - ] - } - ] - } - } - }, - "sections": [ - { - "name": "fire_changes", - "enable": [], - "requirements": [ - [ - "obtain_flint_and_steel" - ] - ], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.better_fire.description", - "fallback": "Flame arrows set the block they land on with fire, sometimes dropping the arrowhead.\n\nFire can also cause a creeper to explode as if lit by flint and steel." - } - ] - ] - } - ] -} diff --git a/gm4_better_fire/data/gm4_better_fire/loot_table/entities/flame_arrow/flint.json b/gm4_better_fire/data/gm4_better_fire/loot_table/entities/flame_arrow/flint.json deleted file mode 100644 index db46fac4b2..0000000000 --- a/gm4_better_fire/data/gm4_better_fire/loot_table/entities/flame_arrow/flint.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flint", - "functions": [ - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.better_fire.flint", - "fallback": "Flint", - "italic": false - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "item/charred_arrowhead" - } - }, - { - "function": "minecraft:set_lore", - "mode": "append", - "entity": "this", - "lore": [ - { - "translate": "item.gm4.better_fire.flint.lore", - "fallback": "Charred arrowhead", - "color": "dark_gray", - "italic": true - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - } - ] - } - ] -} diff --git a/gm4_better_fire/data/gm4_better_fire/predicate/on_fire.json b/gm4_better_fire/data/gm4_better_fire/predicate/on_fire.json deleted file mode 100644 index e88ce7dc89..0000000000 --- a/gm4_better_fire/data/gm4_better_fire/predicate/on_fire.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type": "#gm4_better_fire:entity", - "flags": { - "is_on_fire": true - } - } -} diff --git a/gm4_better_fire/data/gm4_better_fire/tags/entity_type/entity.json b/gm4_better_fire/data/gm4_better_fire/tags/entity_type/entity.json deleted file mode 100644 index 19314b3322..0000000000 --- a/gm4_better_fire/data/gm4_better_fire/tags/entity_type/entity.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "minecraft:arrow", - "minecraft:creeper" - ] -} diff --git a/gm4_better_fire/data/gm4_better_fire/test/explode_creeper.mcfunction b/gm4_better_fire/data/gm4_better_fire/test/explode_creeper.mcfunction deleted file mode 100644 index 88012d9eb6..0000000000 --- a/gm4_better_fire/data/gm4_better_fire/test/explode_creeper.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# @template gm4:test_platform -# @skyaccess - -summon creeper ~1.5 ~1 ~1.5 {Health:2} -summon arrow ~1.5 ~4 ~1.5 {Fire:100s,Motion:[0.0,-0.1,0.0]} - -await not entity @e[type=creeper,distance=..4] diff --git a/gm4_better_fire/data/gm4_better_fire/test/set_fire.mcfunction b/gm4_better_fire/data/gm4_better_fire/test/set_fire.mcfunction deleted file mode 100644 index 1432c43f7b..0000000000 --- a/gm4_better_fire/data/gm4_better_fire/test/set_fire.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# @template gm4:test_platform -# @skyaccess - -summon arrow ~1.5 ~4 ~1.5 {Fire:100s,Motion:[0.0,-0.1,0.0]} - -await block ~1 ~1 ~1 fire diff --git a/gm4_better_fire/pack.png b/gm4_better_fire/pack.png deleted file mode 100644 index e2a2b8eb9f..0000000000 Binary files a/gm4_better_fire/pack.png and /dev/null differ diff --git a/gm4_better_fire/pack.svg b/gm4_better_fire/pack.svg deleted file mode 100644 index d4f838a595..0000000000 --- a/gm4_better_fire/pack.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/gm4_block_compressors/assets/translations.csv b/gm4_block_compressors/assets/translations.csv index 485f2a75a1..e4a343d350 100644 --- a/gm4_block_compressors/assets/translations.csv +++ b/gm4_block_compressors/assets/translations.csv @@ -8,5 +8,5 @@ container.gm4.block_compressor,Compression Amount text.gm4.block_compressors.compressed,Compressed ×%s text.gm4.guidebook.module_desc.block_compressors,"Chest space won't be an issue with this module! Use a Block Compressor to compress stacks of items, turning a stack of items into a single item for long-term storage. Make sure to uncompress your items before using them again, though!" text.gm4.guidebook.block_compressors.description,"Block Compressors can be used to cut down on bulk storage. Item stacks can be compressed into a single item, and vice versa." -text.gm4.guidebook.block_compressors.crafting,A Block Compressor can be crafted in a Custom Crafter: +text.gm4.guidebook.block_compressors.crafting,A Block Compressor can be crafted in a crafting table: text.gm4.guidebook.block_compressors.usage,"To select the amount of compression, put that amount of items inside the block compressor, then drop the items on top of the compressor.\n\nPutting 1 item in the compressor will decompress any items on top." diff --git a/gm4_block_compressors/beet.yaml b/gm4_block_compressors/beet.yaml index 1709d61c90..04b958b43e 100644 --- a/gm4_block_compressors/beet.yaml +++ b/gm4_block_compressors/beet.yaml @@ -10,17 +10,16 @@ resource_pack: pipeline: - gm4.plugins.extend.module - - gm4.plugins.include.lib_forceload - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters meta: gm4: versioning: required: - lib_custom_crafters: 3.4.0 lib_machines: 1.4.0 schedule_loops: [main] + translation_linter_ignores: + - text.gm4.block_compressors.compressed model_data: - item: purpur_block reference: block/block_compressor_plate @@ -57,7 +56,6 @@ meta: description: Chest space won't be an issue with this module! Use a Block Compressor to compress stacks of items, turning a stack of items into a single item for long-term storage. Make sure to uncompress your items before using them again, though! recommended: - gm4_resource_pack - - gm4_relocators - gm4_standard_crafting - gm4_ender_hoppers - gm4_enchantment_extractors diff --git a/gm4_block_compressors/data/gm4/advancement/block_compressors.json b/gm4_block_compressors/data/gm4/advancement/block_compressors.json index 0c703b52e2..bcbd595ef2 100644 --- a/gm4_block_compressors/data/gm4/advancement/block_compressors.json +++ b/gm4_block_compressors/data/gm4/advancement/block_compressors.json @@ -3,7 +3,7 @@ "icon": { "id": "piston", "components": { - "minecraft:custom_model_data": "gui/advancement/block_compressors" + "minecraft:custom_model_data": {"strings":["gm4_block_compressors:gui/advancement/block_compressors"]} } }, "title": { @@ -16,7 +16,7 @@ "color": "gray" } }, - "parent": "gm4:custom_crafters", + "parent": "gm4:root", "criteria": { "obtain_block_compressor": { "trigger": "minecraft:inventory_changed", diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/check_recipes.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/check_recipes.mcfunction deleted file mode 100644 index da4bb281bb..0000000000 --- a/gm4_block_compressors/data/gm4_block_compressors/function/check_recipes.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# @s = custom crafter running recipes -# run from #gm4_custom_crafters:check_recipes - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:iron_ingot"},{Slot:1b,id:"minecraft:purpur_block"},{Slot:2b,id:"minecraft:iron_ingot"},{Slot:3b,id:"minecraft:piston"},{Slot:4b,id:"minecraft:obsidian"},{Slot:5b,id:"minecraft:piston"},{Slot:6b,id:"minecraft:cobblestone"},{Slot:7b,id:"minecraft:cobblestone"},{Slot:8b,id:"minecraft:cobblestone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_block_compressors:crafting/block_compressor diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/item.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/item.mcfunction index 38b9fab852..43c48b343e 100644 --- a/gm4_block_compressors/data/gm4_block_compressors/function/item.mcfunction +++ b/gm4_block_compressors/data/gm4_block_compressors/function/item.mcfunction @@ -8,7 +8,7 @@ data modify storage gm4_block_compressors:temp/item_stack Item set from entity @ scoreboard players set $decompressing gm4_bc_data 0 execute if data storage gm4_block_compressors:temp/item_stack Item{count:1} run function gm4_block_compressors:item/try_decompress -execute unless score $decompressing gm4_bc_data matches 1 unless data storage gm4_block_compressors:temp/item_stack Item.components."minecraft:custom_data".gm4_block_compressors unless data storage gm4_block_compressors:temp/item_stack gm4_compressed run function gm4_block_compressors:item/try_compress +execute unless score $decompressing gm4_bc_data matches 1 unless data storage gm4_block_compressors:temp/item_stack Item.components."minecraft:custom_data".gm4_block_compressors unless data storage gm4_block_compressors:temp/item_stack Item.components."minecraft:custom_data".gm4_compressed run function gm4_block_compressors:item/try_compress scoreboard players reset $decompressing gm4_bc_data data remove storage gm4_block_compressors:temp/item_stack Item diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/item/compress.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/item/compress.mcfunction index 5680ea69b8..305dffbda8 100644 --- a/gm4_block_compressors/data/gm4_block_compressors/function/item/compress.mcfunction +++ b/gm4_block_compressors/data/gm4_block_compressors/function/item/compress.mcfunction @@ -12,10 +12,7 @@ execute store result storage gm4_block_compressors:temp/item_stack Item.componen # set count to 1 and add compressed item visuals data merge storage gm4_block_compressors:temp/item_stack {Item:{count:1,components:{"minecraft:enchantment_glint_override":true}}} -execute as 344d47-4-4-4-f04ce104d run loot replace entity @s weapon.offhand loot gm4_block_compressors:technical/compressed_lore -execute as 344d47-4-4-4-f04ce104d run data modify storage gm4_block_compressors:temp/item_stack Item.components."minecraft:lore" append from entity @s equipment.offhand.components."minecraft:custom_name" -data remove entity 344d47-4-4-4-f04ce104d equipment.mainhand -data remove entity 344d47-4-4-4-f04ce104d equipment.offhand +function gm4_block_compressors:item/set_lore with storage gm4_block_compressors:temp/item_stack Item.components.'minecraft:custom_data'.gm4_block_compressors # clone data to original item entity data modify entity @s Item set from storage gm4_block_compressors:temp/item_stack Item diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/item/set_lore.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/item/set_lore.mcfunction new file mode 100644 index 0000000000..80f13f6289 --- /dev/null +++ b/gm4_block_compressors/data/gm4_block_compressors/function/item/set_lore.mcfunction @@ -0,0 +1,5 @@ +# Uses a macro to append the compressed lore line to the item in storage +# @s = item entity to be compressed +# run from gm4_block_compressors:item/compress + +$data modify storage gm4_block_compressors:temp/item_stack Item.components."minecraft:lore" append value {translate:"text.gm4.block_compressors.compressed",fallback:"Compressed ×%s",with:[$(compression_level)],color:"gray",italic:false} diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/machine/create.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/machine/create.mcfunction index 04469a2463..9661e6f6b6 100644 --- a/gm4_block_compressors/data/gm4_block_compressors/function/machine/create.mcfunction +++ b/gm4_block_compressors/data/gm4_block_compressors/function/machine/create.mcfunction @@ -7,8 +7,8 @@ setblock ~ ~ ~ dropper[facing=down]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.block_compressor","fallback":"Compression Amount"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.block_compressor","fallback":"Compression Amount","font":"gm4:half_invert"},{"translate":"container.gm4.block_compressor","fallback":"Compression Amount","font":"gm4:offscreen"},{"translate":"gui.gm4.block_compressor","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.block_compressor","fallback":"Compression Amount","font":"gm4:half_invert"},{"translate":"container.gm4.block_compressor","fallback":"Compression Amount","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon item_display ~ ~ ~ {Tags:["gm4_block_compressor_plate","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor_plate",item:{id:"minecraft:purpur_block",count:1,components:{"minecraft:custom_model_data":"block/block_compressor_plate"}},transformation:{right_rotation:[0f,0f,0f,1f],left_rotation:[1f,0f,0f,0f],translation:[0.0,0.225,0.0],scale:[0.625,0.625,0.625]},brightness:{block:15,sky:15},item_display:"head"} -summon item_display ~ ~ ~ {Tags:["gm4_block_compressor_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor_display",item:{id:"minecraft:stone",count:1,components:{"minecraft:custom_model_data":"block/block_compressor"}},transformation:{right_rotation:[0f,0f,0f,1f],left_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.5,0.5,0.5]},brightness:{block:15,sky:15},item_display:"head"} +summon item_display ~ ~ ~ {Tags:["gm4_block_compressor_plate","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor_plate",item:{id:"minecraft:purpur_block",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_block_compressors:block/block_compressor_plate"]}}},transformation:{right_rotation:[0f,0f,0f,1f],left_rotation:[1f,0f,0f,0f],translation:[0.0,0.225,0.0],scale:[0.625,0.625,0.625]},brightness:{block:15,sky:15},item_display:"head"} +summon item_display ~ ~ ~ {Tags:["gm4_block_compressor_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor_display",item:{id:"minecraft:stone",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_block_compressors:block/block_compressor"]}}},transformation:{right_rotation:[0f,0f,0f,1f],left_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.5,0.5,0.5]},brightness:{block:15,sky:15},item_display:"head"} summon marker ~ ~ ~ {Tags:["gm4_block_compressor","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor",Rotation:[0.0f,0.0f]} # mark block as placed diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/relocate/pick_up_check.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/relocate/pick_up_check.mcfunction deleted file mode 100644 index 56ec5876ae..0000000000 --- a/gm4_block_compressors/data/gm4_block_compressors/function/relocate/pick_up_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from #gm4_relocators:pick_up_check - -execute if score gm4_block_compressors load.status matches 1 if entity @s[tag=gm4_block_compressor] run function gm4_block_compressors:relocate/set_pick_up_data diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/relocate/place_down.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/relocate/place_down.mcfunction deleted file mode 100644 index 8ec788df74..0000000000 --- a/gm4_block_compressors/data/gm4_block_compressors/function/relocate/place_down.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -# @s = command block placed by "gm4_relocators:backwards_compatibility/place_down/replace_head" -# located at the command block (where the player head was) - -# execute if block ~ ~ ~ command_block[facing=east] run setblock ~ ~ ~ dropper[facing=west] -# execute if block ~ ~ ~ command_block[facing=west] run setblock ~ ~ ~ dropper[facing=east] -# execute if block ~ ~ ~ command_block[facing=south] run setblock ~ ~ ~ dropper[facing=north] -# execute if block ~ ~ ~ command_block[facing=north] run setblock ~ ~ ~ dropper[facing=south] -# execute if block ~ ~ ~ command_block[facing=down] run setblock ~ ~ ~ dropper[facing=up] - -# data merge block ~ ~ ~ {CustomName:'{"translate":"container.gm4.block_compressor","fallback":"Compressor"}'} -# summon armor_stand ~ ~-.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,DisabledSlots:2039552,Tags:["gm4_no_edit","gm4_block_compressor"],HasVisualFire:1b,CustomName:'"gm4_block_compressor"',ArmorItems:[{},{},{},{id:"minecraft:player_head",count:1,tag:{CustomModelData:3420001,SkullOwner:{Id:[I;-1851723870,1025001935,-1279456745,2096330633],Properties:{textures:[{Value:"eyJ0aW1lc3RhbXAiOjE0NTMzMjYwNjc3NzksInByb2ZpbGVJZCI6IjkxYTBlZmEyM2QxODQ5Y2ZiM2JkMGExNzdjZjM3Nzg4IiwicHJvZmlsZU5hbWUiOiJEdWNrSnIiLCJzaWduYXR1cmVSZXF1aXJlZCI6dHJ1ZSwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzFkNmNkYTQwYjViODEyODVhZmRiY2RlOWQ2M2M3OGUxNzZkMzFiNTk0YjFhNmQ5Nzc5OWQ0OTBkN2VmMjkyIn19fQ=="}]}}}}],HandItems:[{id:"minecraft:stone_button",count:1,tag:{CustomModelData:3420001}},{}],Pose:{RightArm:[0f, 0f, 0f]}} -# playsound minecraft:block.piston.contract block @a[distance=..5] - -# NOTE this feature set is outdated and should be removed when relocators removed whe relocators drops its legacy support -function gm4_block_compressors:machine/create diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/relocate/place_down_check.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/relocate/place_down_check.mcfunction deleted file mode 100644 index 276dd4aab0..0000000000 --- a/gm4_block_compressors/data/gm4_block_compressors/function/relocate/place_down_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = player who placed the block -# located at the center of the block to be placed -# run from #gm4_relocators:place_down_check - -execute if score $placed_block gm4_rl_data matches 0 if score gm4_block_compressors load.status matches 1 if data storage gm4_relocators:temp gm4_relocation{custom_block:"gm4_block_compressor"} run function gm4_block_compressors:relocate/summon_block_markers diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/relocate/set_pick_up_data.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/relocate/set_pick_up_data.mcfunction deleted file mode 100644 index 01ce18dfad..0000000000 --- a/gm4_block_compressors/data/gm4_block_compressors/function/relocate/set_pick_up_data.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# sets the specific relocator data -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from gm4_block_compressors:relocate/pick_up_check - -data modify storage gm4_relocators:temp merge_data set value {custom_block:"gm4_block_compressor",lore:{"translate":"block.gm4.block_compressor","fallback":"Compressor","color":"gray","italic":true}} - -execute positioned ~ ~ ~ run kill @e[type=item_display,tag=gm4_block_compressor_plate,limit=1,distance=..0.1] -execute positioned ~ ~ ~ run kill @e[type=item_display,tag=gm4_block_compressor_display,limit=1,distance=..0.1] -kill @s -scoreboard players set $found_marker gm4_rl_data 1 diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/relocate/summon_block_markers.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/relocate/summon_block_markers.mcfunction deleted file mode 100644 index b4e046f81f..0000000000 --- a/gm4_block_compressors/data/gm4_block_compressors/function/relocate/summon_block_markers.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# summons the entities for this machine -# @s = player who placed the block -# located at the center of the block to be placed -# run from gm4_block_compressors:relocate/place_down_check - -scoreboard players set $placed_block gm4_rl_data 1 - -summon item_display ~ ~ ~ {Tags:["gm4_block_compressor_plate","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor_plate",item:{id:"minecraft:purpur_block",count:1,components:{"minecraft:custom_model_data":"block/block_compressor_plate"}},transformation:{right_rotation:[0f,0f,0f,1f],left_rotation:[1f,0f,0f,0f],translation:[0.0,0.225,0.0],scale:[0.625,0.625,0.625]},brightness:{block:15,sky:15},item_display:"head"} -summon item_display ~ ~ ~ {Tags:["gm4_block_compressor_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor_display",item:{id:"minecraft:stone",count:1,components:{"minecraft:custom_model_data":"block/block_compressor"}},transformation:{right_rotation:[0f,0f,0f,1f],left_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.5,0.5,0.5]},brightness:{block:15,sky:15},item_display:"head"} -summon marker ~ ~ ~ {Tags:["gm4_block_compressor","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor",Rotation:[0.0f,0.0f]} - -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 2 -tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_block_compressors/data/gm4_block_compressors/function/upgrade_paths/1.4.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/function/upgrade_paths/1.4.mcfunction index a93d22b061..6959432f8b 100644 --- a/gm4_block_compressors/data/gm4_block_compressors/function/upgrade_paths/1.4.mcfunction +++ b/gm4_block_compressors/data/gm4_block_compressors/function/upgrade_paths/1.4.mcfunction @@ -1,5 +1,5 @@ -execute as @e[type=armor_stand,tag=gm4_block_compressor_stand] at @s positioned ~ ~0.965 ~ align y run summon item_display ~ ~0.5 ~ {Tags:["gm4_block_compressor_plate","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor_plate",item:{id:"minecraft:purpur_block",count:1,components:{"minecraft:custom_model_data":"block/block_compressor_plate"}},transformation:{right_rotation:[0f,0f,0f,1f],left_rotation:[1f,0f,0f,0f],translation:[0.0,0.225,0.0],scale:[0.625,0.625,0.625]},brightness:{block:15,sky:15},item_display:"head"} -execute as @e[type=armor_stand,tag=gm4_block_compressor_display] at @s align y run summon item_display ~ ~0.5 ~ {Tags:["gm4_block_compressor_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor_display",item:{id:"minecraft:stone",count:1,components:{"minecraft:custom_model_data":"block/block_compressor"}},transformation:{right_rotation:[0f,0f,0f,1f],left_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.5,0.5,0.5]},brightness:{block:15,sky:15},item_display:"head"} +execute as @e[type=armor_stand,tag=gm4_block_compressor_stand] at @s positioned ~ ~0.965 ~ align y run summon item_display ~ ~0.5 ~ {Tags:["gm4_block_compressor_plate","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor_plate",item:{id:"minecraft:purpur_block",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_block_compressors:block/block_compressor_plate"]}}},transformation:{right_rotation:[0f,0f,0f,1f],left_rotation:[1f,0f,0f,0f],translation:[0.0,0.225,0.0],scale:[0.625,0.625,0.625]},brightness:{block:15,sky:15},item_display:"head"} +execute as @e[type=armor_stand,tag=gm4_block_compressor_display] at @s align y run summon item_display ~ ~0.5 ~ {Tags:["gm4_block_compressor_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_block_compressor_display",item:{id:"minecraft:stone",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_block_compressors:block/block_compressor"]}}},transformation:{right_rotation:[0f,0f,0f,1f],left_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.5,0.5,0.5]},brightness:{block:15,sky:15},item_display:"head"} execute as @e[type=armor_stand,tag=gm4_block_compressor_display] at @s run scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 2 execute as @e[type=armor_stand,tag=gm4_block_compressor_display] at @s run tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_block_compressors/data/gm4_block_compressors/gm4_recipes/block_compressor.json b/gm4_block_compressors/data/gm4_block_compressors/gm4_recipes/block_compressor.json deleted file mode 100644 index f09cdfd7bc..0000000000 --- a/gm4_block_compressors/data/gm4_block_compressors/gm4_recipes/block_compressor.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "IPI", - "SOS", - "CCC" - ], - "key": { - "I": { - "item": "minecraft:iron_ingot" - }, - "P": { - "item": "minecraft:purpur_block" - }, - "S": { - "item": "minecraft:piston" - }, - "O": { - "item": "minecraft:obsidian" - }, - "C": { - "item": "minecraft:cobblestone" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_block_compressors:items/block_compressor", - "count": 1 - } - } -} diff --git a/gm4_block_compressors/data/gm4_block_compressors/guidebook/block_compressors.json b/gm4_block_compressors/data/gm4_block_compressors/guidebook/block_compressors.json index f62dbbff4b..d6a19f5d21 100644 --- a/gm4_block_compressors/data/gm4_block_compressors/guidebook/block_compressors.json +++ b/gm4_block_compressors/data/gm4_block_compressors/guidebook/block_compressors.json @@ -6,43 +6,6 @@ "id": "minecraft:piston" }, "criteria": { - "create_custom_crafter": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type_specific": { - "type": "player", - "advancements": { - "gm4:custom_crafters": true - } - } - } - } - ] - } - }, - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, "obtain_obsidian": { "trigger": "minecraft:inventory_changed", "conditions": { @@ -105,12 +68,7 @@ { "name": "description", "enable": [], - "requirements": [ - [ - "create_custom_crafter", - "open_custom_crafter" - ] - ], + "requirements": [], "pages": [ [ { @@ -136,12 +94,12 @@ [ { "translate": "text.gm4.guidebook.block_compressors.crafting", - "fallback": "A Block Compressor can be crafted in a Custom Crafter:" + "fallback": "A Block Compressor can be crafted in a crafting table:" }, "\n", { "insert": "recipe", - "recipe": "gm4_block_compressors:block_compressor" + "recipe": "gm4_block_compressors:compressor" } ] ], diff --git a/gm4_block_compressors/data/gm4_block_compressors/loot_table/crafting/block_compressor.json b/gm4_block_compressors/data/gm4_block_compressors/loot_table/crafting/block_compressor.json deleted file mode 100644 index baa7a4ccc1..0000000000 --- a/gm4_block_compressors/data/gm4_block_compressors/loot_table/crafting/block_compressor.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_block_compressors:items/block_compressor", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_block_compressors/data/gm4_block_compressors/loot_table/items/block_compressor.json b/gm4_block_compressors/data/gm4_block_compressors/loot_table/items/block_compressor.json index d6dfd711d5..241054dd69 100644 --- a/gm4_block_compressors/data/gm4_block_compressors/loot_table/items/block_compressor.json +++ b/gm4_block_compressors/data/gm4_block_compressors/loot_table/items/block_compressor.json @@ -11,7 +11,7 @@ { "function": "set_components", "components": { - "minecraft:custom_model_data": "block/block_compressor_full", + "minecraft:custom_model_data": {"strings":["gm4_block_compressors:block/block_compressor_full"]}, "minecraft:profile": "$block_compressor" } }, diff --git a/gm4_block_compressors/data/gm4_block_compressors/loot_table/technical/compressed_lore.json b/gm4_block_compressors/data/gm4_block_compressors/loot_table/technical/compressed_lore.json deleted file mode 100644 index bdabbfe06a..0000000000 --- a/gm4_block_compressors/data/gm4_block_compressors/loot_table/technical/compressed_lore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:stone_button", - "functions": [ - { - "function": "minecraft:set_name", - "entity": "this", - "name": { - "translate": "text.gm4.block_compressors.compressed", - "fallback": "Compressed ×%s", - "with": [ - { - "nbt": "Item.components.'minecraft:custom_data'.gm4_block_compressors.compression_level", - "storage": "gm4_block_compressors:temp/item_stack" - } - ], - "color": "gray", - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_block_compressors/data/gm4_block_compressors/recipe/compressor.json b/gm4_block_compressors/data/gm4_block_compressors/recipe/compressor.json index 3f2ed7fab7..cae1b682a3 100644 --- a/gm4_block_compressors/data/gm4_block_compressors/recipe/compressor.json +++ b/gm4_block_compressors/data/gm4_block_compressors/recipe/compressor.json @@ -16,7 +16,7 @@ "result": { "id": "minecraft:player_head", "components": { - "minecraft:custom_model_data": "block/block_compressor_full", + "minecraft:custom_model_data": {"strings":["gm4_block_compressors:block/block_compressor_full"]}, "minecraft:profile": "$block_compressor", "minecraft:custom_data": "{gm4_machines:{id:'block_compressor'}}", "minecraft:custom_name": {"translate":"block.gm4.block_compressor","fallback":"Compressor","color":"white","italic":false} diff --git a/gm4_block_compressors/data/gm4_block_compressors/test/craft.mcfunction b/gm4_block_compressors/data/gm4_block_compressors/test/craft.mcfunction deleted file mode 100644 index 773afe98e6..0000000000 --- a/gm4_block_compressors/data/gm4_block_compressors/test/craft.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.0 with minecraft:iron_ingot -item replace block ~1 ~1 ~1 container.1 with minecraft:purpur_block -item replace block ~1 ~1 ~1 container.2 with minecraft:iron_ingot -item replace block ~1 ~1 ~1 container.3 with minecraft:piston -item replace block ~1 ~1 ~1 container.4 with minecraft:obsidian -item replace block ~1 ~1 ~1 container.5 with minecraft:piston -item replace block ~1 ~1 ~1 container.6 with minecraft:cobblestone -item replace block ~1 ~1 ~1 container.7 with minecraft:cobblestone -item replace block ~1 ~1 ~1 container.8 with minecraft:cobblestone - -await items block ~1 ~1 ~1 container.* minecraft:player_head[custom_data~{gm4_machines:{id:"block_compressor"}}] diff --git a/gm4_block_compressors/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_block_compressors/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 92e1d3a2ec..0000000000 --- a/gm4_block_compressors/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_block_compressors:check_recipes" - ] -} diff --git a/gm4_block_compressors/data/gm4_relocators/tags/function/pick_up_check.json b/gm4_block_compressors/data/gm4_relocators/tags/function/pick_up_check.json deleted file mode 100644 index 0f4d576a00..0000000000 --- a/gm4_block_compressors/data/gm4_relocators/tags/function/pick_up_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_block_compressors:relocate/pick_up_check" - ] -} diff --git a/gm4_block_compressors/data/gm4_relocators/tags/function/place_down_check.json b/gm4_block_compressors/data/gm4_relocators/tags/function/place_down_check.json deleted file mode 100644 index b0b51b317e..0000000000 --- a/gm4_block_compressors/data/gm4_relocators/tags/function/place_down_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_block_compressors:relocate/place_down_check" - ] -} diff --git a/gm4_block_compressors/mod.mcdoc b/gm4_block_compressors/mod.mcdoc new file mode 100644 index 0000000000..ae6ed53d0f --- /dev/null +++ b/gm4_block_compressors/mod.mcdoc @@ -0,0 +1,10 @@ +use ::java::world::item::ItemStack + +dispatch minecraft:storage[gm4_block_compressors:temp/item_stack] to struct { + Item?: ItemStack, + gm4_compressed?: boolean, +} + +dispatch minecraft:storage[gm4_block_compressors:temp/compressor] to struct { + Items?: [ItemStack], +} diff --git a/gm4_book_binders/backport_88/data/gm4_book_binders/loot_table/debind_book.json b/gm4_book_binders/backport_88/data/gm4_book_binders/loot_table/debind_book.json deleted file mode 100644 index fc753909cd..0000000000 --- a/gm4_book_binders/backport_88/data/gm4_book_binders/loot_table/debind_book.json +++ /dev/null @@ -1,67 +0,0 @@ -pools = [] -enchantments = ["minecraft:binding_curse", "minecraft:vanishing_curse", "minecraft:riptide", "minecraft:channeling", "minecraft:wind_burst", "minecraft:frost_walker", "minecraft:sharpness", "minecraft:smite", "minecraft:bane_of_arthropods", "minecraft:impaling", "minecraft:power", "minecraft:density", "minecraft:breach", "minecraft:piercing", "minecraft:sweeping_edge", "minecraft:multishot", "minecraft:fire_aspect", "minecraft:flame", "minecraft:knockback", "minecraft:punch", "minecraft:protection", "minecraft:blast_protection", "minecraft:fire_protection", "minecraft:projectile_protection", "minecraft:feather_falling", "minecraft:fortune", "minecraft:looting", "minecraft:silk_touch", "minecraft:luck_of_the_sea", "minecraft:efficiency", "minecraft:quick_charge", "minecraft:lure", "minecraft:respiration", "minecraft:aqua_affinity", "minecraft:soul_speed", "minecraft:swift_sneak", "minecraft:depth_strider", "minecraft:thorns", "minecraft:loyalty", "minecraft:unbreaking", "minecraft:infinity", "minecraft:mending"] -# expecting enchantment in format, "minecraft:name" -# see bookshelf inspectors, evaluate/process_display/spawn/components_to_list - -for enchantment in enchantments: - pools.append( - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:paper", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "item/enchanted_page" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_book_binders:{item:\"enchanted_page\"}}" - }, - { - "function": "minecraft:set_name", - "entity": "this", - "target": "custom_name", - "name": { - "translate": "item.gm4.enchanted_page", - "fallback": "Enchanted Page", - "italic": false - } - }, - { - "function": "minecraft:set_enchantments", - "enchantments": { - f"{enchantment}": { - "type": "minecraft:storage", - "storage": "gm4_book_binders:temp", - "path": f"stored_enchantments.\"{enchantment}\"" - } - } - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:storage", - "storage": "gm4_book_binders:temp", - "path": f"stored_enchantments.\"{enchantment}\"" - }, - "range": { - "min": 1, - "max": 255 - } - } - ] - } - ) - -{ - "pools": pools -} diff --git a/gm4_book_binders/beet.yaml b/gm4_book_binders/beet.yaml index 497d898243..ab259a5011 100644 --- a/gm4_book_binders/beet.yaml +++ b/gm4_book_binders/beet.yaml @@ -4,13 +4,6 @@ version: 1.5.X data_pack: load: . - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 88 - min_format: 1 - max_format: 88 - directory: backport_88 require: - bolt diff --git a/gm4_book_binders/data/gm4/advancement/book_binders.json b/gm4_book_binders/data/gm4/advancement/book_binders.json index db6391ed0a..7c16c7539d 100644 --- a/gm4_book_binders/data/gm4/advancement/book_binders.json +++ b/gm4_book_binders/data/gm4/advancement/book_binders.json @@ -3,7 +3,7 @@ "icon": { "id": "lectern", "components": { - "minecraft:custom_model_data": "gui/advancement/book_binders" + "minecraft:custom_model_data": {"strings":["gm4_book_binders:gui/advancement/book_binders"]} } }, "title": { diff --git a/gm4_book_binders/data/gm4/advancement/book_binders_bind.json b/gm4_book_binders/data/gm4/advancement/book_binders_bind.json index 357a632d95..61f0f03170 100644 --- a/gm4_book_binders/data/gm4/advancement/book_binders_bind.json +++ b/gm4_book_binders/data/gm4/advancement/book_binders_bind.json @@ -6,7 +6,7 @@ "minecraft:enchantments": { "minecraft:mending": 1 }, - "minecraft:custom_model_data": "gui/advancement/book_binders_bind" + "minecraft:custom_model_data": {"strings":["gm4_book_binders:gui/advancement/book_binders_bind"]} } }, "title": { diff --git a/gm4_book_binders/data/gm4/advancement/book_binders_debind.json b/gm4_book_binders/data/gm4/advancement/book_binders_debind.json index fe92d665cd..e7715f4292 100644 --- a/gm4_book_binders/data/gm4/advancement/book_binders_debind.json +++ b/gm4_book_binders/data/gm4/advancement/book_binders_debind.json @@ -6,7 +6,7 @@ "minecraft:enchantments": { "minecraft:mending": 1 }, - "minecraft:custom_model_data": "gui/advancement/book_binders_debind" + "minecraft:custom_model_data": {"strings":["gm4_book_binders:gui/advancement/book_binders_debind"]} } }, "title": { diff --git a/gm4_book_binders/data/gm4_book_binders/loot_table/debind_book.json b/gm4_book_binders/data/gm4_book_binders/loot_table/debind_book.json index 49ef186292..36bd83ffa3 100644 --- a/gm4_book_binders/data/gm4_book_binders/loot_table/debind_book.json +++ b/gm4_book_binders/data/gm4_book_binders/loot_table/debind_book.json @@ -15,7 +15,7 @@ for enchantment in enchantments: { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/enchanted_page" + "minecraft:custom_model_data": {"strings":["gm4_book_binders:item/enchanted_page"]} } }, { @@ -25,11 +25,10 @@ for enchantment in enchantments: { "function": "minecraft:set_name", "entity": "this", - "target": "custom_name", + "target": "item_name", "name": { "translate": "item.gm4.enchanted_page", - "fallback": "Enchanted Page", - "italic": false + "fallback": "Enchanted Page" } }, { diff --git a/gm4_book_binders/mod.mcdoc b/gm4_book_binders/mod.mcdoc new file mode 100644 index 0000000000..115f4455ff --- /dev/null +++ b/gm4_book_binders/mod.mcdoc @@ -0,0 +1,5 @@ +use ::java::world::component::item::EnchantmentLevels + +dispatch minecraft:storage[gm4_book_binders:temp] to struct { + stored_enchantments?: EnchantmentLevels +} diff --git a/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/eval_enchantment.mcfunction b/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/eval_enchantment.mcfunction index e8f4d36ac4..6f2c82cfbf 100644 --- a/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/eval_enchantment.mcfunction +++ b/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/eval_enchantment.mcfunction @@ -6,5 +6,5 @@ # with $lvl = level of the enchantment as integer # if enchantment level is 10 or lower display latin number, otherwise just print level -$execute if score $enchant_lvl gm4_bookshelf_inspector_data matches 1..10 run data modify storage gm4_bookshelf_inspector:store enchantment_list append value [{"translate":"enchantment.minecraft.$(id)"},{"text":" "},{"translate":"enchantment.level.$(lvl)"}] -$execute unless score $enchant_lvl gm4_bookshelf_inspector_data matches 1..10 run data modify storage gm4_bookshelf_inspector:store enchantment_list append value [{"translate":"enchantment.minecraft.$(id)"},{"text":" $(lvl)"}] +$execute if score $enchant_lvl gm4_bookshelf_inspector_data matches 1..10 run data modify storage gm4_bookshelf_inspector:temp enchantment_list append value [{"translate":"enchantment.minecraft.$(id)"},{"text":" "},{"translate":"enchantment.level.$(lvl)"}] +$execute unless score $enchant_lvl gm4_bookshelf_inspector_data matches 1..10 run data modify storage gm4_bookshelf_inspector:temp enchantment_list append value [{"translate":"enchantment.minecraft.$(id)"},{"text":" $(lvl)"}] diff --git a/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/list_enchantments.mcfunction b/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/list_enchantments.mcfunction index b9d26c7b01..b426188c09 100644 --- a/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/list_enchantments.mcfunction +++ b/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/list_enchantments.mcfunction @@ -7,11 +7,11 @@ scoreboard players set $enchantments_max gm4_bookshelf_inspector_data 4 data modify storage gm4_bookshelf_inspector:temp levels set from storage gm4_bookshelf_inspector:temp book_data.components."minecraft:stored_enchantments" function gm4_bookshelf_inspector:process_display/spawn/components_to_list -data modify storage gm4_bookshelf_inspector:store enchantment_list set value [] +data modify storage gm4_bookshelf_inspector:temp enchantment_list set value [] function gm4_bookshelf_inspector:process_display/spawn/process_enchantments # add to the text -data modify storage gm4_bookshelf_inspector:temp text append value {"nbt":"enchantment_list[]","storage":"gm4_bookshelf_inspector:store","separator":"\n","interpret":true,"color":"gray"} +data modify storage gm4_bookshelf_inspector:temp text append value {"nbt":"enchantment_list[]","storage":"gm4_bookshelf_inspector:temp","separator":"\n","interpret":true,"color":"gray"} # cleanup data remove storage gm4_bookshelf_inspector:temp enchantments diff --git a/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/process_enchantments.mcfunction b/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/process_enchantments.mcfunction index ec2e11b187..24ba27ad58 100644 --- a/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/process_enchantments.mcfunction +++ b/gm4_bookshelf_inspector/data/gm4_bookshelf_inspector/function/process_display/spawn/process_enchantments.mcfunction @@ -20,5 +20,5 @@ scoreboard players remove $enchantments_max gm4_bookshelf_inspector_data 1 data remove storage gm4_bookshelf_inspector:temp enchantments[0] execute if score $enchantments_max gm4_bookshelf_inspector_data matches 0 store result score $enchantment_count gm4_bookshelf_inspector_data run data get storage gm4_bookshelf_inspector:temp enchantments execute if score $enchantments_max gm4_bookshelf_inspector_data matches 0 if score $enchantment_count gm4_bookshelf_inspector_data matches 1 run function gm4_bookshelf_inspector:process_display/spawn/process_enchantments -execute if score $enchantments_max gm4_bookshelf_inspector_data matches 0 if score $enchantment_count gm4_bookshelf_inspector_data matches 2.. run data modify storage gm4_bookshelf_inspector:store enchantment_list append value {"translate":"container.shulkerBox.more","with":[{"score":{"name":"$enchantment_count","objective":"gm4_bookshelf_inspector_data"}}]} +execute if score $enchantments_max gm4_bookshelf_inspector_data matches 0 if score $enchantment_count gm4_bookshelf_inspector_data matches 2.. run data modify storage gm4_bookshelf_inspector:temp enchantment_list append value {"translate":"container.shulkerBox.more","with":[{"score":{"name":"$enchantment_count","objective":"gm4_bookshelf_inspector_data"}}]} execute if score $enchantments_max gm4_bookshelf_inspector_data matches 1.. if data storage gm4_bookshelf_inspector:temp enchantments[0] run function gm4_bookshelf_inspector:process_display/spawn/process_enchantments diff --git a/gm4_bookshelf_inspector/mod.mcdoc b/gm4_bookshelf_inspector/mod.mcdoc new file mode 100644 index 0000000000..d96a4b26d2 --- /dev/null +++ b/gm4_bookshelf_inspector/mod.mcdoc @@ -0,0 +1,22 @@ +use ::java::world::item::ItemStack +use ::java::world::component::item::EnchantmentLevels +use ::java::util::text::Text +use ::java::util::text::TextObject + +dispatch minecraft:storage[gm4_bookshelf_inspector:temp] to struct { + book_data?: ( + [ItemStack] | + ItemStack | + ), + levels?: EnchantmentLevels, + enchantments?: [struct { + id: #[id="enchantment"] string, + lvl?: int, + }], + enchantment_list?: [Text], + new_enchant?: struct { + id: #[id="enchantment"] string, + lvl?: int, + }, + text?: (Text | [TextObject] @ 0), +} diff --git a/gm4_boots_of_ostara/assets/gm4_boots_of_ostara/textures/item/flippers_of_ostara.png b/gm4_boots_of_ostara/assets/gm4_boots_of_ostara/textures/item/flippers_of_ostara.png deleted file mode 100644 index 0e9525edf1..0000000000 Binary files a/gm4_boots_of_ostara/assets/gm4_boots_of_ostara/textures/item/flippers_of_ostara.png and /dev/null differ diff --git a/gm4_boots_of_ostara/assets/gm4_boots_of_ostara/textures/item/flippers_of_ostara_overlay.png b/gm4_boots_of_ostara/assets/gm4_boots_of_ostara/textures/item/flippers_of_ostara_overlay.png deleted file mode 100644 index 2e23828002..0000000000 Binary files a/gm4_boots_of_ostara/assets/gm4_boots_of_ostara/textures/item/flippers_of_ostara_overlay.png and /dev/null differ diff --git a/gm4_boots_of_ostara/assets/translations.csv b/gm4_boots_of_ostara/assets/translations.csv index 98d9efbaa3..681d47dbbe 100644 --- a/gm4_boots_of_ostara/assets/translations.csv +++ b/gm4_boots_of_ostara/assets/translations.csv @@ -3,9 +3,8 @@ advancement.gm4.boots_of_ostara.description,Wear the Boots of Ostara advancement.gm4.boots_of_ostara.title,Green Feet item.gm4.boots_of_ostara,Boots of Ostara item.gm4.boots_of_ostara.lore,Brings abundance beneath you! -item.gm4.flippers_of_ostara,Flippers of Ostara text.gm4.guidebook.module_desc.boots_of_ostara,"A pair of boots every gardener would love to have! Boots of Ostara allow you to easily spread Grass and Moss, and they even stop the Desire Lines module from creating that pesky dirt." -text.gm4.guidebook.boot_of_ostara.description,Boots of Ostara can be crafted to aid in the spreading of grass and moss.\n\nThe boots can be crafted in a Custom Crafter. +text.gm4.guidebook.boot_of_ostara.description,Boots of Ostara can be crafted to aid in the spreading of grass and moss.\n\nThe boots can be crafted in a crafting table. text.gm4.guidebook.boots_of_ostara.crafting,The recipe for the Boots of Ostara is as follows: text.gm4.guidebook.boots_of_ostara.crafting_and_desire_lines,Boots of Ostara also prevent desire lines from forming. text.gm4.guidebook.boots_of_ostara.grass,Wearing the boots and holding a grass block in the offhand will spread grass onto dirt beneath the wearer.\n diff --git a/gm4_boots_of_ostara/beet.yaml b/gm4_boots_of_ostara/beet.yaml index 6ed55b7687..ed37a29397 100644 --- a/gm4_boots_of_ostara/beet.yaml +++ b/gm4_boots_of_ostara/beet.yaml @@ -10,20 +10,16 @@ resource_pack: pipeline: - gm4.plugins.extend.module - - gm4.plugins.include.lib_custom_crafters meta: gm4: versioning: - required: - lib_custom_crafters: 3.4.0 schedule_loops: [main] model_data: - item: leather_boots template: generated_overlay broadcast: - reference: item/boots_of_ostara - - reference: item/flippers_of_ostara - item: leather_boots reference: gui/advancement/boots_of_ostara template: diff --git a/gm4_boots_of_ostara/data/gm4/advancement/boots_of_ostara.json b/gm4_boots_of_ostara/data/gm4/advancement/boots_of_ostara.json index 22ce4c110f..1b69376086 100644 --- a/gm4_boots_of_ostara/data/gm4/advancement/boots_of_ostara.json +++ b/gm4_boots_of_ostara/data/gm4/advancement/boots_of_ostara.json @@ -4,7 +4,7 @@ "id": "leather_boots", "components": { "minecraft:dyed_color": 3705899, - "minecraft:custom_model_data": "gui/advancement/boots_of_ostara" + "minecraft:custom_model_data": {"strings":["gm4_boots_of_ostara:gui/advancement/boots_of_ostara"]} } }, "title": { @@ -17,7 +17,7 @@ "color": "gray" } }, - "parent": "gm4:custom_crafters", + "parent": "gm4:root", "criteria": { "boots_of_ostara": { "trigger": "minecraft:inventory_changed", diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/function/check_recipes.mcfunction b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/function/check_recipes.mcfunction deleted file mode 100644 index 9c738094f4..0000000000 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/function/check_recipes.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# Check for Boots of Ostara recipe, ensure that the provided boots are not already Boots of Ostara, and then upgrade the boots while preserving NBT. -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 5 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:wheat_seeds",count:1},{Slot:3b,id:"minecraft:moss_block",count:1},{Slot:4b,id:"minecraft:leather_boots",count:1},{Slot:5b,id:"minecraft:grass_block",count:1},{Slot:7b,id:"minecraft:water_bucket",count:1}]} unless data storage gm4_custom_crafters:temp/crafter Items[2].components."minecraft:custom_data".gm4_boots_of_ostara run function gm4_boots_of_ostara:create_boots -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 5 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:wheat_seeds",count:1},{Slot:3b,id:"minecraft:grass_block",count:1},{Slot:4b,id:"minecraft:leather_boots",count:1},{Slot:5b,id:"minecraft:moss_block",count:1},{Slot:7b,id:"minecraft:water_bucket",count:1}]} unless data storage gm4_custom_crafters:temp/crafter Items[2].components."minecraft:custom_data".gm4_boots_of_ostara run function gm4_boots_of_ostara:create_boots diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/function/convert.mcfunction b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/function/convert.mcfunction index 4300b7d608..49d456cf57 100644 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/function/convert.mcfunction +++ b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/function/convert.mcfunction @@ -9,13 +9,13 @@ # first run, check mainhand execute if items entity @s weapon.mainhand moss_block if block ~ ~-0.5 ~ #gm4_boots_of_ostara:moss_replaceable run setblock ~ ~-0.5 ~ moss_block execute if items entity @s weapon.mainhand mycelium if block ~ ~-0.5 ~ #gm4_boots_of_ostara:mycelium_replaceable run setblock ~ ~-0.5 ~ mycelium -execute if items entity @s weapon.mainhand grass_block if block ~ ~-0.5 ~ #minecraft:dirt run setblock ~ ~-0.5 ~ grass_block +execute if items entity @s weapon.mainhand grass_block if block ~ ~-0.5 ~ #minecraft:substrate_overworld run setblock ~ ~-0.5 ~ grass_block execute if items entity @s weapon.mainhand crimson_nylium if block ~ ~-0.5 ~ minecraft:netherrack run setblock ~ ~-0.5 ~ crimson_nylium execute if items entity @s weapon.mainhand warped_nylium if block ~ ~-0.5 ~ minecraft:netherrack run setblock ~ ~-0.5 ~ warped_nylium # now go through offhand execute if items entity @s weapon.offhand moss_block if block ~ ~-0.5 ~ #gm4_boots_of_ostara:moss_replaceable run setblock ~ ~-0.5 ~ moss_block execute if items entity @s weapon.offhand mycelium if block ~ ~-0.5 ~ #gm4_boots_of_ostara:mycelium_replaceable run setblock ~ ~-0.5 ~ mycelium -execute if items entity @s weapon.offhand grass_block if block ~ ~-0.5 ~ #minecraft:dirt run setblock ~ ~-0.5 ~ grass_block +execute if items entity @s weapon.offhand grass_block if block ~ ~-0.5 ~ #minecraft:substrate_overworld run setblock ~ ~-0.5 ~ grass_block execute if items entity @s weapon.offhand crimson_nylium if block ~ ~-0.5 ~ minecraft:netherrack run setblock ~ ~-0.5 ~ crimson_nylium execute if items entity @s weapon.offhand warped_nylium if block ~ ~-0.5 ~ minecraft:netherrack run setblock ~ ~-0.5 ~ warped_nylium diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/function/create_boots.mcfunction b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/function/create_boots.mcfunction deleted file mode 100644 index cbdc2d93aa..0000000000 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/function/create_boots.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# @s = gm4_custom_crafter (with boots of ostara recipe) -# Run from check_recipes - -scoreboard players set $crafted gm4_crafting 1 - -scoreboard players reset $boa_custom_name gm4_crafting -execute store success score $boa_custom_name gm4_crafting if items block ~ ~ ~ container.4 *[custom_name] - -scoreboard players reset $boa_flippers gm4_crafting -execute store success score $boa_flippers gm4_crafting if items block ~ ~ ~ container.4 *[custom_data~{gm4_scuba_gear:{item:"flippers"}}] - -item modify block ~ ~ ~ container.4 gm4_boots_of_ostara:boots_of_ostara -item replace block ~ ~ ~ container.1 with minecraft:air -item replace block ~ ~ ~ container.3 with minecraft:air -item replace block ~ ~ ~ container.5 with minecraft:air -item replace block ~ ~ ~ container.7 with minecraft:bucket diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/gm4_recipes/boots_of_ostara.json b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/gm4_recipes/boots_of_ostara.json deleted file mode 100644 index 3e2a7f4026..0000000000 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/gm4_recipes/boots_of_ostara.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - " S ", - "MBG", - " W " - ], - "key": { - "S": { - "item": "minecraft:wheat_seeds" - }, - "M": { - "item": "minecraft:moss_block" - }, - "B": { - "item": "minecraft:leather_boots" - }, - "G": { - "item": "minecraft:grass_block" - }, - "W": { - "item": "minecraft:water_bucket" - } - } - }, - "output": { - "type": "special", - "function": "gm4_boots_of_ostara:create_boots", - "guidebook": { - "type": "item", - "name": "minecraft:leather_boots", - "image": "gm4:boots_of_ostara", - "components": { - "minecraft:custom_name": {"translate": "item.gm4.boots_of_ostara","fallback": "Boots of Ostara","italic":false}, - "minecraft:lore": [ - {"translate": "item.gm4.boots_of_ostara.lore","fallback": "Brings abundance beneath you!","color": "dark_gray","italic": true} - ], - "minecraft:dyed_color": 3705899, - "minecraft:tooltip_display": { - "hidden_components": [ - "minecraft:dyed_color" - ] - } - }, - "count": 1 - } - } -} diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/guidebook/boots_of_ostara.json b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/guidebook/boots_of_ostara.json index bdf3a5297a..5cc0def41d 100644 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/guidebook/boots_of_ostara.json +++ b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/guidebook/boots_of_ostara.json @@ -61,7 +61,7 @@ }, { "translate": "text.gm4.guidebook.boot_of_ostara.description", - "fallback": "Boots of Ostara can be crafted to aid in the spreading of grass and moss.\n\nThe boots can be crafted in a Custom Crafter." + "fallback": "Boots of Ostara can be crafted to aid in the spreading of grass and moss.\n\nThe boots can be crafted in a crafting table." } ] ] diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/item_modifier/boots_of_ostara.json b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/item_modifier/boots_of_ostara.json deleted file mode 100644 index 3f525e2cc3..0000000000 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/item_modifier/boots_of_ostara.json +++ /dev/null @@ -1,97 +0,0 @@ -[ - { - "function": "minecraft:set_components", - "components": { - "minecraft:dyed_color": 3705899, - "minecraft:tooltip_display": { - "hidden_components": [ - "minecraft:dyed_color" - ] - }, - "minecraft:custom_model_data": "item/boots_of_ostara" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_boots_of_ostara:1b}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.boots_of_ostara", - "fallback": "Boots of Ostara", - "italic": false - }, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$boa_custom_name" - }, - "score": "gm4_crafting" - }, - "range": 1 - } - } - ] - }, - { - "function": "minecraft:set_lore", - "mode": "insert", - "lore": [ - { - "translate": "item.gm4.boots_of_ostara.lore", - "fallback": "Brings abundance beneath you!", - "color": "dark_gray", - "italic": true - } - ] - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "gm4_scuba_gear:item/flippers" - }, - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$boa_flippers" - }, - "score": "gm4_crafting" - }, - "range": 1 - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.flippers_of_ostara", - "fallback": "Flippers of Ostara", - "italic": false - }, - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$boa_flippers" - }, - "score": "gm4_crafting" - }, - "range": 1 - } - ] - } -] diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/loot_table/crafting/boots_of_ostara.json b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/loot_table/crafting/boots_of_ostara.json deleted file mode 100644 index 81fb74a5e0..0000000000 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/loot_table/crafting/boots_of_ostara.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 4, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_boots_of_ostara:items/boots_of_ostara", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - }, - { - "rolls": 2, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bucket", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - } - ] -} diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/loot_table/items/boots_of_ostara.json b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/loot_table/items/boots_of_ostara.json index 5a50b3d792..66387e0b5d 100644 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/loot_table/items/boots_of_ostara.json +++ b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/loot_table/items/boots_of_ostara.json @@ -9,8 +9,45 @@ "name": "minecraft:leather_boots", "functions": [ { - "function": "minecraft:reference", - "name": "gm4_boots_of_ostara:boots_of_ostara" + "function": "minecraft:set_components", + "components": { + "minecraft:dyed_color": 3705899, + "minecraft:tooltip_display": { + "hidden_components": [ + "minecraft:dyed_color" + ] + }, + "minecraft:custom_model_data": { + "strings": [ + "gm4_boots_of_ostara:item/boots_of_ostara" + ] + } + } + }, + { + "function": "minecraft:set_custom_data", + "tag": "{gm4_boots_of_ostara:1b}" + }, + { + "function": "minecraft:set_name", + "target": "item_name", + "name": { + "translate": "item.gm4.boots_of_ostara", + "fallback": "Boots of Ostara", + "italic": false + } + }, + { + "function": "minecraft:set_lore", + "mode": "insert", + "lore": [ + { + "translate": "item.gm4.boots_of_ostara.lore", + "fallback": "Brings abundance beneath you!", + "color": "dark_gray", + "italic": true + } + ] } ] } diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/recipe/boots_of_ostara.json b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/recipe/boots_of_ostara.json index 8d51843996..5888bdbbc0 100644 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/recipe/boots_of_ostara.json +++ b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/recipe/boots_of_ostara.json @@ -22,9 +22,9 @@ "minecraft:dyed_color" ] }, - "minecraft:custom_model_data": "item/boots_of_ostara", + "minecraft:custom_model_data": {"strings":["gm4_boots_of_ostara:item/boots_of_ostara"]}, "minecraft:custom_data": "{gm4_boots_of_ostara:1b}", - "minecraft:custom_name": {"translate": "item.gm4.boots_of_ostara","fallback": "Boots of Ostara","italic": false}, + "minecraft:item_name": {"translate": "item.gm4.boots_of_ostara","fallback": "Boots of Ostara"}, "minecraft:lore": [ {"translate":"item.gm4.boots_of_ostara.lore","fallback":"Brings abundance beneath you!","color":"dark_gray","italic":false} ] diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/tags/block/moss_replaceable.json b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/tags/block/moss_replaceable.json index 431c24a6c4..a7f917fa5b 100644 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/tags/block/moss_replaceable.json +++ b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/tags/block/moss_replaceable.json @@ -1,6 +1,6 @@ { "values": [ "#minecraft:base_stone_overworld", - "#minecraft:dirt" + "#minecraft:substrate_overworld" ] } diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/test/craft.mcfunction b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/test/craft.mcfunction deleted file mode 100644 index cc4482b257..0000000000 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/test/craft.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.1 with minecraft:wheat_seeds -item replace block ~1 ~1 ~1 container.3 with minecraft:moss_block -item replace block ~1 ~1 ~1 container.4 with minecraft:leather_boots -item replace block ~1 ~1 ~1 container.5 with minecraft:grass_block -item replace block ~1 ~1 ~1 container.7 with minecraft:water_bucket - -await items block ~1 ~1 ~1 container.* minecraft:leather_boots[custom_data~{gm4_boots_of_ostara:1b}] -await items block ~1 ~1 ~1 container.* minecraft:bucket[count=1] diff --git a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/test/craft_keep_data.mcfunction b/gm4_boots_of_ostara/data/gm4_boots_of_ostara/test/craft_keep_data.mcfunction deleted file mode 100644 index b5cd7e285c..0000000000 --- a/gm4_boots_of_ostara/data/gm4_boots_of_ostara/test/craft_keep_data.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.1 with minecraft:wheat_seeds -item replace block ~1 ~1 ~1 container.3 with minecraft:moss_block -item replace block ~1 ~1 ~1 container.4 with minecraft:leather_boots[damage=15] -item replace block ~1 ~1 ~1 container.5 with minecraft:grass_block -item replace block ~1 ~1 ~1 container.7 with minecraft:water_bucket - -await items block ~1 ~1 ~1 container.* minecraft:leather_boots[custom_data~{gm4_boots_of_ostara:1b},damage=15] -await items block ~1 ~1 ~1 container.* minecraft:bucket[count=1] diff --git a/gm4_boots_of_ostara/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_boots_of_ostara/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index b1161881e8..0000000000 --- a/gm4_boots_of_ostara/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_boots_of_ostara:check_recipes" - ] -} diff --git a/gm4_calling_bell/beet.yaml b/gm4_calling_bell/beet.yaml index dbef592a5c..534525d5ad 100644 --- a/gm4_calling_bell/beet.yaml +++ b/gm4_calling_bell/beet.yaml @@ -7,13 +7,10 @@ data_pack: pipeline: - gm4.plugins.extend.module - - gm4.plugins.include.lib_trades meta: gm4: versioning: - required: - lib_trades: 1.6.0 schedule_loops: - tick - day_clock diff --git a/gm4_calling_bell/data/gm4/advancement/calling_bell.json b/gm4_calling_bell/data/gm4/advancement/calling_bell.json index b534746d96..c24ccfc016 100644 --- a/gm4_calling_bell/data/gm4/advancement/calling_bell.json +++ b/gm4_calling_bell/data/gm4/advancement/calling_bell.json @@ -3,7 +3,7 @@ "icon": { "id": "emerald", "components": { - "minecraft:custom_model_data": "gui/advancement/calling_bell" + "minecraft:custom_model_data": {"strings":["gm4_calling_bell:gui/advancement/calling_bell"]} } }, "title": { diff --git a/gm4_calling_bell/data/gm4_calling_bell/function/trader/summon.mcfunction b/gm4_calling_bell/data/gm4_calling_bell/function/trader/summon.mcfunction index 53a36d050a..932da06e72 100644 --- a/gm4_calling_bell/data/gm4_calling_bell/function/trader/summon.mcfunction +++ b/gm4_calling_bell/data/gm4_calling_bell/function/trader/summon.mcfunction @@ -15,7 +15,3 @@ item modify entity @s[gamemode=!creative] weapon.mainhand gm4_calling_bell:minus # update player scoreboard players operation @s gm4_calling_bell = $day gm4_calling_bell advancement grant @s only gm4:calling_bell - -# set up trader -function #gm4_trades:register_trades -execute as @e[type=wandering_trader,tag=gm4_calling_bell_trader,tag=!gm4_trader,limit=1,sort=nearest] run function #gm4_trades:modify_external_trader diff --git a/gm4_cement_mixers/README.md b/gm4_cement_mixers/README.md index b5f66564ec..c0440189a4 100644 --- a/gm4_cement_mixers/README.md +++ b/gm4_cement_mixers/README.md @@ -1,4 +1,4 @@ -# Cement ixers +# Cement Mixers Automating concrete conversion with a porous solution! diff --git a/gm4_chairs/data/gm4/advancement/chairs_creation.json b/gm4_chairs/data/gm4/advancement/chairs_creation.json index 04097bfd7e..3714c044e0 100644 --- a/gm4_chairs/data/gm4/advancement/chairs_creation.json +++ b/gm4_chairs/data/gm4/advancement/chairs_creation.json @@ -3,7 +3,7 @@ "icon": { "id": "birch_stairs", "components": { - "minecraft:custom_model_data": "gui/advancement/chairs_creation" + "minecraft:custom_model_data": {"strings":["gm4_chairs:gui/advancement/chairs_creation"]} } }, "title": { diff --git a/gm4_chairs/data/gm4/advancement/chairs_sit.json b/gm4_chairs/data/gm4/advancement/chairs_sit.json index 0ffc54c1c0..e7503ed563 100644 --- a/gm4_chairs/data/gm4/advancement/chairs_sit.json +++ b/gm4_chairs/data/gm4/advancement/chairs_sit.json @@ -3,7 +3,7 @@ "icon": { "id": "poisonous_potato", "components": { - "minecraft:custom_model_data": "gui/advancement/chairs_sit" + "minecraft:custom_model_data": {"strings":["gm4_chairs:gui/advancement/chairs_sit"]} } }, "title": { diff --git a/gm4_cooler_caves/backport_81/data/minecraft/worldgen/noise_settings/overworld.json b/gm4_cooler_caves/backport_81/data/minecraft/worldgen/noise_settings/overworld.json deleted file mode 100644 index ec796ebbe1..0000000000 --- a/gm4_cooler_caves/backport_81/data/minecraft/worldgen/noise_settings/overworld.json +++ /dev/null @@ -1,2621 +0,0 @@ -{ - "sea_level": 63, - "disable_mob_generation": false, - "aquifers_enabled": true, - "ore_veins_enabled": true, - "legacy_random_source": false, - "default_block": { - "Name": "minecraft:stone" - }, - "default_fluid": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } - }, - "noise": { - "min_y": -64, - "height": 384, - "size_horizontal": 1, - "size_vertical": 2 - }, - "noise_router": { - "barrier": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_barrier", - "xz_scale": 1, - "y_scale": 0.5 - }, - "fluid_level_floodedness": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_fluid_level_floodedness", - "xz_scale": 1, - "y_scale": 0.67 - }, - "fluid_level_spread": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_fluid_level_spread", - "xz_scale": 1, - "y_scale": 0.7142857142857143 - }, - "lava": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_lava", - "xz_scale": 1, - "y_scale": 1 - }, - "temperature": { - "type": "minecraft:shifted_noise", - "noise": "minecraft:temperature", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - }, - "vegetation": { - "type": "minecraft:shifted_noise", - "noise": "minecraft:vegetation", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - }, - "continents": "minecraft:overworld/continents", - "erosion": "minecraft:overworld/erosion", - "depth": "minecraft:overworld/depth", - "ridges": "minecraft:overworld/ridges", - "initial_density_without_jaggedness": { - "type": "minecraft:add", - "argument1": 0.1171875, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": -64, - "to_y": -40, - "from_value": 0, - "to_value": 1 - }, - "argument2": { - "type": "minecraft:add", - "argument1": -0.1171875, - "argument2": { - "type": "minecraft:add", - "argument1": -0.078125, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 240, - "to_y": 256, - "from_value": 1, - "to_value": 0 - }, - "argument2": { - "type": "minecraft:add", - "argument1": 0.078125, - "argument2": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": -0.703125, - "argument2": { - "type": "minecraft:mul", - "argument1": 4, - "argument2": { - "type": "minecraft:quarter_negative", - "argument": { - "type": "minecraft:mul", - "argument1": "minecraft:overworld/depth", - "argument2": { - "type": "minecraft:cache_2d", - "argument": "minecraft:overworld/factor" - } - } - } - } - }, - "min": -64, - "max": 64 - } - } - } - } - } - } - }, - "final_density": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:squeeze", - "argument": { - "type": "minecraft:mul", - "argument1": 0.64, - "argument2": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:blend_density", - "argument": { - "type": "minecraft:add", - "argument1": 0.1171875, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": -64, - "to_y": -40, - "from_value": 0, - "to_value": 1 - }, - "argument2": { - "type": "minecraft:add", - "argument1": -0.1171875, - "argument2": { - "type": "minecraft:add", - "argument1": -0.078125, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 240, - "to_y": 256, - "from_value": 1, - "to_value": 0 - }, - "argument2": { - "type": "minecraft:add", - "argument1": 0.078125, - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:overworld/sloped_cheese", - "min_inclusive": -1000000, - "max_exclusive": 1.5625, - "when_in_range": { - "type": "minecraft:min", - "argument1": "minecraft:overworld/sloped_cheese", - "argument2": { - "type": "minecraft:mul", - "argument1": 5, - "argument2": "minecraft:overworld/caves/entrances" - } - }, - "when_out_of_range": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:min", - "argument1": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:mul", - "argument1": 4, - "argument2": { - "type": "minecraft:square", - "argument": { - "type": "minecraft:noise", - "noise": "minecraft:cave_layer", - "xz_scale": 1, - "y_scale": 8 - } - } - }, - "argument2": { - "type": "minecraft:add", - "argument1": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": 0.27, - "argument2": { - "type": "minecraft:noise", - "noise": "minecraft:cave_cheese", - "xz_scale": 1, - "y_scale": 0.6666666666666666 - } - }, - "min": -1, - "max": 1 - }, - "argument2": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": 1.5, - "argument2": { - "type": "minecraft:mul", - "argument1": -0.64, - "argument2": "minecraft:overworld/sloped_cheese" - } - }, - "min": 0, - "max": 0.5 - } - } - }, - "argument2": "minecraft:overworld/caves/entrances" - }, - "argument2": { - "type": "minecraft:add", - "argument1": "minecraft:overworld/caves/spaghetti_2d", - "argument2": "minecraft:overworld/caves/spaghetti_roughness_function" - } - }, - "argument2": { - "type": "minecraft:range_choice", - "input": "minecraft:overworld/caves/pillars", - "min_inclusive": -1000000, - "max_exclusive": 0.03, - "when_in_range": -1000000, - "when_out_of_range": "minecraft:overworld/caves/pillars" - } - } - } - } - } - } - } - } - } - } - } - } - }, - "argument2": "minecraft:overworld/caves/noodle" - }, - "vein_toggle": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": -60, - "max_exclusive": 51, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:ore_veininess", - "xz_scale": 1.5, - "y_scale": 1.5 - }, - "when_out_of_range": 0 - } - }, - "vein_ridged": { - "type": "minecraft:add", - "argument1": -0.07999999821186066, - "argument2": { - "type": "minecraft:max", - "argument1": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": -60, - "max_exclusive": 51, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:ore_vein_a", - "xz_scale": 4, - "y_scale": 4 - }, - "when_out_of_range": 0 - } - } - }, - "argument2": { - "type": "minecraft:abs", - "argument": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": -60, - "max_exclusive": 51, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:ore_vein_b", - "xz_scale": 4, - "y_scale": 4 - }, - "when_out_of_range": 0 - } - } - } - } - }, - "vein_gap": { - "type": "minecraft:noise", - "noise": "minecraft:ore_gap", - "xz_scale": 1, - "y_scale": 1 - } - }, - "spawn_target": [ - { - "temperature": [ - -1, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - -1, - 1 - ], - "weirdness": [ - -1, - -0.16 - ], - "depth": 0, - "offset": 0 - }, - { - "temperature": [ - -1, - 1 - ], - "humidity": [ - -1, - 1 - ], - "continentalness": [ - -0.11, - 1 - ], - "erosion": [ - -1, - 1 - ], - "weirdness": [ - 0.16, - 1 - ], - "depth": 0, - "offset": 0 - } - ], - "surface_rule": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:vertical_gradient", - "random_name": "minecraft:bedrock_floor", - "true_at_and_below": { - "above_bottom": 0 - }, - "false_at_and_above": { - "above_bottom": 5 - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:bedrock" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:above_preliminary_surface" - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:wooded_badlands" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 97 - }, - "surface_depth_multiplier": 2, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.909, - "max_threshold": -0.5454 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:coarse_dirt" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.1818, - "max_threshold": 0.1818 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:coarse_dirt" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.5454, - "max_threshold": 0.909 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:coarse_dirt" - } - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:grass_block", - "Properties": { - "snowy": "false" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - ] - } - ] - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:swamp" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 62 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 63 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - } - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface_swamp", - "min_threshold": 0, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } - } - } - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 60 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 63 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - } - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface_swamp", - "min_threshold": 0, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } - } - } - } - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:badlands", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 256 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:orange_terracotta" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 74 - }, - "surface_depth_multiplier": 1, - "add_stone_depth": true - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.909, - "max_threshold": -0.5454 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:terracotta" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.1818, - "max_threshold": 0.1818 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:terracotta" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.5454, - "max_threshold": 0.909 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:terracotta" - } - } - }, - { - "type": "minecraft:bandlands" - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": -1, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:red_sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:red_sand" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:hole" - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:orange_terracotta" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": -6, - "surface_depth_multiplier": -1, - "add_stone_depth": true - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:white_terracotta" - } - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 63 - }, - "surface_depth_multiplier": -1, - "add_stone_depth": true - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 63 - }, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:not", - "invert": { - "type": "minecraft:y_above", - "anchor": { - "absolute": 74 - }, - "surface_depth_multiplier": 1, - "add_stone_depth": true - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:orange_terracotta" - } - } - } - }, - { - "type": "minecraft:bandlands" - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": true, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": -6, - "surface_depth_multiplier": -1, - "add_stone_depth": true - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:white_terracotta" - } - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": -1, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_ocean", - "minecraft:deep_frozen_ocean" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:hole" - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:air" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:temperature" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:ice" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } - } - } - ] - } - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_peaks" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:steep" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:packed_ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:packed_ice", - "min_threshold": 0, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:packed_ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:ice", - "min_threshold": 0, - "max_threshold": 0.025 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:snowy_slopes" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:steep" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.35, - "max_threshold": 0.6 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:powder_snow" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:jagged_peaks" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:steep" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:grove" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.35, - "max_threshold": 0.6 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:powder_snow" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_peaks" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:calcite", - "min_threshold": -0.0125, - "max_threshold": 0.0125 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:calcite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_shore" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:gravel", - "min_threshold": -0.05, - "max_threshold": 0.05 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_hills" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:warm_ocean", - "minecraft:beach", - "minecraft:snowy_beach" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sand" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:desert" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sand" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:dripstone_caves" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - } - ] - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_savanna" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.21212121212121213, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.06060606060606061, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:coarse_dirt" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_gravelly_hills" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.24242424242424243, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:grass_block", - "Properties": { - "snowy": "false" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - ] - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:old_growth_pine_taiga", - "minecraft:old_growth_spruce_taiga" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.21212121212121213, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:coarse_dirt" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.11515151515151514, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:podzol", - "Properties": { - "snowy": "false" - } - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_river", - "minecraft:grove", - "minecraft:ice_spikes", - "minecraft:snowy_beach", - "minecraft:snowy_plains", - "minecraft:snowy_slopes", - "minecraft:snowy_taiga" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:mud" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mushroom_fields" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:mycelium", - "Properties": { - "snowy": "false" - } - } - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:grass_block", - "Properties": { - "snowy": "false" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - ] - } - ] - } - ] - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": -6, - "surface_depth_multiplier": -1, - "add_stone_depth": true - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_ocean", - "minecraft:deep_frozen_ocean" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:hole" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:water", - "Properties": { - "level": "0" - } - } - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": true, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_peaks" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:steep" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:packed_ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:packed_ice", - "min_threshold": -0.5, - "max_threshold": 0.2 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:packed_ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:ice", - "min_threshold": -0.0625, - "max_threshold": 0.025 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:ice" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:snowy_slopes" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:steep" - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.45, - "max_threshold": 0.58 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:powder_snow" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:jagged_peaks" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:grove" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", - "min_threshold": 0.45, - "max_threshold": 0.58 - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:water", - "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:powder_snow" - } - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:packed_ice" - } - } - ] - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_peaks" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:calcite", - "min_threshold": -0.0125, - "max_threshold": 0.0125 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:calcite" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_shore" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:gravel", - "min_threshold": -0.05, - "max_threshold": 0.05 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_hills" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:warm_ocean", - "minecraft:beach", - "minecraft:snowy_beach" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sand" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:desert" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sand" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:dripstone_caves" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - } - ] - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_savanna" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.21212121212121213, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_gravelly_hills" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.24242424242424243, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", - "min_threshold": -0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:mud" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_river", - "minecraft:ice_spikes", - "minecraft:snowy_beach", - "minecraft:snowy_plains", - "minecraft:snowy_taiga" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:packed_ice" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:dirt" - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:warm_ocean", - "minecraft:beach", - "minecraft:snowy_beach" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": true, - "secondary_depth_range": 6 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:desert" - ] - }, - "then_run": { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": true, - "secondary_depth_range": 30 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_peaks", - "minecraft:jagged_peaks" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:warm_ocean", - "minecraft:lukewarm_ocean", - "minecraft:deep_lukewarm_ocean" - ] - }, - "then_run": { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sand" - } - } - ] - } - }, - { - "type": "minecraft:sequence", - "sequence": [ - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", - "add_surface_depth": false, - "secondary_depth_range": 0 - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:stone" - } - } - }, - { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:gravel" - } - } - ] - } - ] - } - } - ] - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:vertical_gradient", - "random_name": "minecraft:deepslate", - "true_at_and_below": { - "absolute": 0 - }, - "false_at_and_above": { - "absolute": 8 - } - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:deepslate", - "Properties": { - "axis": "y" - } - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:desert" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:sandstone" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_peaks", - "minecraft:frozen_river", - "minecraft:grove", - "minecraft:ice_spikes", - "minecraft:snowy_beach", - "minecraft:snowy_plains", - "minecraft:snowy_slopes", - "minecraft:snowy_taiga" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:snow_block" - } - } - }, - { - "type": "minecraft:condition", - "if_true": { - "type": "minecraft:biome", - "biome_is": [ - "minecraft:badlands", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ] - }, - "then_run": { - "type": "minecraft:block", - "result_state": { - "Name": "minecraft:terracotta" - } - } - } - ] - } -} diff --git a/gm4_cooler_caves/beet.yaml b/gm4_cooler_caves/beet.yaml index 94a37a1a7f..7df3c56769 100644 --- a/gm4_cooler_caves/beet.yaml +++ b/gm4_cooler_caves/beet.yaml @@ -4,18 +4,10 @@ version: 2.5.X data_pack: load: . - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 81 - min_format: 1 - max_format: 81 - directory: backport_81 pipeline: - gm4.plugins.extend.module - gm4.plugins.include.pfb_biome_extensions - - gm4_cooler_caves.fix_overlays meta: gm4: diff --git a/gm4_cooler_caves/fix_overlays.py b/gm4_cooler_caves/fix_overlays.py deleted file mode 100644 index edc60325fa..0000000000 --- a/gm4_cooler_caves/fix_overlays.py +++ /dev/null @@ -1,8 +0,0 @@ -from beet import Context - -# Due to a bug in beet, we need to manually set the overlay formats -def beet_default(ctx: Context): - overlay = ctx.data.overlays["backport_88"] - overlay.min_format = 1 - overlay.max_format = 88 - overlay.supported_formats = {"min_inclusive": 1, "max_inclusive": 88} diff --git a/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/check_projectile.mcfunction b/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/check_projectile.mcfunction deleted file mode 100644 index 9e2a59342c..0000000000 --- a/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/check_projectile.mcfunction +++ /dev/null @@ -1,33 +0,0 @@ -# Check item in offhand to shoot -# @s = player using the crossbow -# at arrow -# run from shoot/any_arrow - -# tripwire -execute if entity @s[gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/string,x_rotation=-15..15] align xyz positioned ~0.5 ~ ~0.5 run function gm4_crossbow_cartridges:cables/shoot_arrow - -# bucket with fish/axolotl -execute if entity @s[tag=!gm4_cb_use,predicate=gm4_crossbow_cartridges:items/bucket] run function gm4_crossbow_cartridges:projectile/bucket - -# torch -execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/torch] run function gm4_crossbow_cartridges:projectile/torch -execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/redstone_torch] run function gm4_crossbow_cartridges:projectile/redstone_torch -execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/soul_torch] run function gm4_crossbow_cartridges:projectile/soul_torch - -# potions -execute if entity @s[tag=!gm4_cb_use,predicate=gm4_crossbow_cartridges:items/potions] run function gm4_crossbow_cartridges:projectile/potions - -# fireball -execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/fire_charge] run function gm4_crossbow_cartridges:projectile/fireball - -# wind charge -execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/wind_charge] run function gm4_crossbow_cartridges:projectile/wind_charge - -# tnt -execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/tnt] run function gm4_crossbow_cartridges:projectile/tnt - -# beehive -execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/beehive] run function gm4_crossbow_cartridges:projectile/beehive - -tag @s remove gm4_cb_use -data remove storage gm4_crossbow_cartridges:temp projectile diff --git a/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/projectile/copper_torch/check.mcfunction b/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/projectile/copper_torch/check.mcfunction deleted file mode 100644 index a0bc60df4a..0000000000 --- a/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/projectile/copper_torch/check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Check blocks, to place or drop copper torch -# @s = arrow with tag gm4_cb_ctorch, in a block -# at @s -# run from projectile/copper_torch/loop - -# EMPTY TO AVOID ERRORS diff --git a/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/projectile/copper_torch/place.mcfunction b/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/projectile/copper_torch/place.mcfunction deleted file mode 100644 index 7e91ca513a..0000000000 --- a/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/function/projectile/copper_torch/place.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Place copper torch on a valid adjacent block -# @s = arrow with tag gm4_cb_ctorch, in a block -# at @s -# run from projectile/copper_torch/check - -# EMPTY TO AVOID ERRORS diff --git a/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/predicate/items/copper_torch.json b/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/predicate/items/copper_torch.json deleted file mode 100644 index 208cd14970..0000000000 --- a/gm4_crossbow_cartridges/backport_81/data/gm4_crossbow_cartridges/predicate/items/copper_torch.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "offhand": { - "items": [] - } - } - } -} diff --git a/gm4_crossbow_cartridges/beet.yaml b/gm4_crossbow_cartridges/beet.yaml index 769aa3e521..9e1ada4a69 100644 --- a/gm4_crossbow_cartridges/beet.yaml +++ b/gm4_crossbow_cartridges/beet.yaml @@ -4,13 +4,6 @@ version: 1.8.X data_pack: load: . - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 81 - min_format: 1 - max_format: 81 - directory: backport_81 pipeline: - gm4.plugins.extend.module diff --git a/gm4_crossbow_cartridges/data/gm4/advancement/crossbow_cartridges_bucket.json b/gm4_crossbow_cartridges/data/gm4/advancement/crossbow_cartridges_bucket.json index 5c2bd15ac3..bf0f56d1a2 100644 --- a/gm4_crossbow_cartridges/data/gm4/advancement/crossbow_cartridges_bucket.json +++ b/gm4_crossbow_cartridges/data/gm4/advancement/crossbow_cartridges_bucket.json @@ -3,7 +3,7 @@ "icon": { "id": "tropical_fish_bucket", "components": { - "minecraft:custom_model_data": "gui/advancement/crossbow_cartridges_bucket" + "minecraft:custom_model_data": {"strings":["gm4_crossbow_cartridges:gui/advancement/crossbow_cartridges_bucket"]} } }, "title": { diff --git a/gm4_crossbow_cartridges/data/gm4/advancement/crossbow_cartridges_string.json b/gm4_crossbow_cartridges/data/gm4/advancement/crossbow_cartridges_string.json index 63941aeacd..660a8b3a82 100644 --- a/gm4_crossbow_cartridges/data/gm4/advancement/crossbow_cartridges_string.json +++ b/gm4_crossbow_cartridges/data/gm4/advancement/crossbow_cartridges_string.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:tripwire_hook", "components": { - "minecraft:custom_model_data": "gui/advancement/crossbow_cartridges_string" + "minecraft:custom_model_data": {"strings":["gm4_crossbow_cartridges:gui/advancement/crossbow_cartridges_string"]} } }, "title": { diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/block/torch.json b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/block/torch.json index aac4b1bf51..34dda3d9a6 100644 --- a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/block/torch.json +++ b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/block/torch.json @@ -3,10 +3,10 @@ "minecraft:torch", "minecraft:soul_torch", "minecraft:redstone_torch", - {"id": "minecraft:copper_torch", "required": false}, + "minecraft:copper_torch", "minecraft:wall_torch", "minecraft:soul_wall_torch", "minecraft:redstone_wall_torch", - {"id": "minecraft:copper_wall_torch", "required": false} + "minecraft:copper_wall_torch" ] } diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/item/valid_items.json b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/item/valid_items.json index 04601e9275..c1f5e39ecf 100644 --- a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/item/valid_items.json +++ b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/item/valid_items.json @@ -5,7 +5,7 @@ "minecraft:torch", "minecraft:soul_torch", "minecraft:redstone_torch", - {"id": "minecraft:copper_torch", "required": false}, + "minecraft:copper_torch", "minecraft:splash_potion", "minecraft:lingering_potion", "minecraft:fire_charge", diff --git a/gm4_crossbow_cartridges/mod.mcdoc b/gm4_crossbow_cartridges/mod.mcdoc new file mode 100644 index 0000000000..78d5c51316 --- /dev/null +++ b/gm4_crossbow_cartridges/mod.mcdoc @@ -0,0 +1,9 @@ +use ::java::world::entity::AnyEntity +use ::java::world::component::block::Occupant +use ::java::world::component::item::PotionContents + +dispatch minecraft:storage[gm4_crossbow_cartridges:temp] to struct { + projectile?: AnyEntity, + bees?: [Occupant], + potion_contents?: PotionContents +} diff --git a/gm4_desire_lines/data/gm4/advancement/desire_lines_10000.json b/gm4_desire_lines/data/gm4/advancement/desire_lines_10000.json index d6f2502fee..da1cebf3a9 100644 --- a/gm4_desire_lines/data/gm4/advancement/desire_lines_10000.json +++ b/gm4_desire_lines/data/gm4/advancement/desire_lines_10000.json @@ -3,7 +3,7 @@ "icon": { "id": "coarse_dirt", "components": { - "minecraft:custom_model_data": "gui/advancement/desire_lines_10000" + "minecraft:custom_model_data": {"strings":["gm4_desire_lines:gui/advancement/desire_lines_10000"]} } }, "title": { diff --git a/gm4_desire_lines/data/gm4/advancement/desire_lines_8000.json b/gm4_desire_lines/data/gm4/advancement/desire_lines_8000.json index bc0748437d..84354c78de 100644 --- a/gm4_desire_lines/data/gm4/advancement/desire_lines_8000.json +++ b/gm4_desire_lines/data/gm4/advancement/desire_lines_8000.json @@ -3,7 +3,7 @@ "icon": { "id": "oak_planks", "components": { - "minecraft:custom_model_data": "gui/advancement/desire_lines_8000" + "minecraft:custom_model_data": {"strings":["gm4_desire_lines:gui/advancement/desire_lines_8000"]} } }, "title": { diff --git a/gm4_desire_lines/data/gm4_celaro_shamir/loot_table/band.json b/gm4_desire_lines/data/gm4_celaro_shamir/loot_table/band.json index 0b54fd9289..cf0621ebcc 100644 --- a/gm4_desire_lines/data/gm4_celaro_shamir/loot_table/band.json +++ b/gm4_desire_lines/data/gm4_celaro_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/celaro" + "minecraft:custom_model_data": {"strings":["gm4_desire_lines:shamir/celaro"]} } }, { diff --git a/gm4_disassemblers/assets/translations.csv b/gm4_disassemblers/assets/translations.csv index 0035b4fd16..70cc2c0eba 100644 --- a/gm4_disassemblers/assets/translations.csv +++ b/gm4_disassemblers/assets/translations.csv @@ -4,6 +4,6 @@ container.gm4.disassembler,Disassembler advancement.gm4.disassemblers.title,Clever Decrafting advancement.gm4.disassemblers.description,Craft a Disassembler text.gm4.guidebook.module_desc.disassemblers,Break apart gold and iron tools and weapons for materials. Attach this to a mob farm to finally make use of those extra armour sets! -text.gm4.guidebook.disassmeblers.description,"Disassmeblers can be crafted in Custom Crafters.\n\nDisassemblers can take apart metal armour, tools, and weapons and return ingots based on the item's durability." -text.gm4.guidebook.disassemblers.crafting,A Disassembler can be crafted in a Custom Crafter: +text.gm4.guidebook.disassmeblers.description,"Disassmeblers can be crafted in a crafting table.\n\nDisassemblers can take apart metal armour, tools, and weapons and return ingots based on the item's durability." +text.gm4.guidebook.disassemblers.crafting,A Disassembler can be crafted in a crafting table: text.gm4.guidebook.disassemblers.usage,Items placed inside a disassembler will be broken into its base ingots.\n\nThe return is based on the percent durability left on the item. diff --git a/gm4_disassemblers/beet.yaml b/gm4_disassemblers/beet.yaml index 8ce08d4fc8..2024174716 100644 --- a/gm4_disassemblers/beet.yaml +++ b/gm4_disassemblers/beet.yaml @@ -4,25 +4,6 @@ version: 2.5.X data_pack: load: . - overlays: - - formats: - min_inclusive: 88 - max_inclusive: 94 - min_format: 88 - max_format: 94 - directory: since_88 - - formats: - min_inclusive: 94 - max_inclusive: 94 - min_format: 94 - max_format: 94 - directory: since_94 - - formats: - min_inclusive: 81 - max_inclusive: 88 - min_format: 81 - max_format: 88 - directory: empty resource_pack: load: . @@ -31,13 +12,11 @@ pipeline: - gm4_disassemblers.generate_disassembly - gm4.plugins.extend.module - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters meta: gm4: versioning: required: - lib_custom_crafters: 3.4.0 lib_machines: 1.4.0 schedule_loops: [main] model_data: @@ -78,7 +57,6 @@ meta: description: Break apart gold and iron tools and weapons for materials. Attach this to a mob farm to finally make use of those extra armour sets! recommended: - gm4_resource_pack - - gm4_relocators - gm4_standard_crafting - gm4_ender_hoppers - gm4_enchantment_extractors diff --git a/gm4_disassemblers/data/gm4/advancement/disassemblers.json b/gm4_disassemblers/data/gm4/advancement/disassemblers.json index 4e94863d5a..bbfcbcc3eb 100644 --- a/gm4_disassemblers/data/gm4/advancement/disassemblers.json +++ b/gm4_disassemblers/data/gm4/advancement/disassemblers.json @@ -3,7 +3,7 @@ "icon": { "id": "tnt", "components": { - "minecraft:custom_model_data": "gui/advancement/disassemblers" + "minecraft:custom_model_data": {"strings":["gm4_disassemblers:gui/advancement/disassemblers"]} } }, "title": { @@ -16,7 +16,7 @@ "color": "gray" } }, - "parent": "gm4:custom_crafters", + "parent": "gm4:root", "criteria": { "obtain_disassembler": { "trigger": "minecraft:inventory_changed", diff --git a/gm4_disassemblers/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_disassemblers/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 17abb93562..0000000000 --- a/gm4_disassemblers/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values":[ - "gm4_disassemblers:check_recipes" - ] - -} diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/check_disassemble_recipe.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/check_disassemble_recipe.mcfunction index 0e160ef280..a4aab765ca 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/function/check_disassemble_recipe.mcfunction +++ b/gm4_disassemblers/data/gm4_disassemblers/function/check_disassemble_recipe.mcfunction @@ -1,7 +1,7 @@ # processes each item # @s = armor stand display (we need the hand) [tag=gm4_disassembler_stand] # located at the disassembler block -# run from gm4_disassemblers:check_recipe (#gm4_disassemblers:during_base) +# run from gm4_disassemblers:check_item (#gm4_disassemblers:during_base) # generated loot table execute if score $dropped gm4_disassembler matches 0 store result score $dropped gm4_disassembler run loot replace block ~ ~ ~ container.0 fish gm4_disassemblers:caller ~ ~ ~ mainhand diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/check_recipes.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/check_recipes.mcfunction deleted file mode 100644 index a4d2fc23f5..0000000000 --- a/gm4_disassemblers/data/gm4_disassemblers/function/check_recipes.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# @s = custom crafter running recipes -# run from #gm4_custom_crafters:check_recipes - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:iron_ingot"},{Slot:1b,id:"minecraft:tnt"},{Slot:2b,id:"minecraft:iron_ingot"},{Slot:3b,id:"minecraft:obsidian"},{Slot:4b,id:"minecraft:stonecutter"},{Slot:5b,id:"minecraft:obsidian"},{Slot:6b,id:"minecraft:cobblestone"},{Slot:7b,id:"minecraft:cobblestone"},{Slot:8b,id:"minecraft:cobblestone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_disassemblers:crafting/disassembler diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/down.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/down.mcfunction index b1fbe4d3d2..496ebfd6d2 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/down.mcfunction +++ b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/down.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ dropper[facing=down]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.disassembler","fallback":"Disassembler"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:offscreen"},{"translate":"gui.gm4.disassembler","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":"block/disassembler_down"}}},Rotation:[180.0f,0.0f]} +summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_disassemblers:block/disassembler_down"]}}}},Rotation:[180.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_disassembler","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_disassembler",Rotation:[180.0f,0.0f]} diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/east.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/east.mcfunction index edec9d2048..d458a80d56 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/east.mcfunction +++ b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/east.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ dropper[facing=east]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.disassembler","fallback":"Disassembler"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:offscreen"},{"translate":"gui.gm4.disassembler","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":"block/disassembler_side"}}},Rotation:[-90.0f,0.0f]} +summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_disassemblers:block/disassembler_side"]}}}},Rotation:[-90.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_disassembler","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_disassembler",Rotation:[-90.0f,0.0f]} diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/north.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/north.mcfunction index a063a94749..64e07a03d4 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/north.mcfunction +++ b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/north.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ dropper[facing=north]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.disassembler","fallback":"Disassembler"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:offscreen"},{"translate":"gui.gm4.disassembler","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":"block/disassembler_side"}}},Rotation:[180.0f,0.0f]} +summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_disassemblers:block/disassembler_side"]}}}},Rotation:[180.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_disassembler","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_disassembler",Rotation:[180.0f,0.0f]} diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/south.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/south.mcfunction index a7ef4ce33d..58e99c39b1 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/south.mcfunction +++ b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/south.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ dropper[facing=south]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.disassembler","fallback":"Disassembler"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:offscreen"},{"translate":"gui.gm4.disassembler","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":"block/disassembler_side"}}},Rotation:[0.0f,0.0f]} +summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_disassemblers:block/disassembler_side"]}}}},Rotation:[0.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_disassembler","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_disassembler",Rotation:[0.0f,0.0f]} diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/up.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/up.mcfunction index 1f79eb5881..74720a867b 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/up.mcfunction +++ b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/up.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ dropper[facing=up]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.disassembler","fallback":"Disassembler"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:offscreen"},{"translate":"gui.gm4.disassembler","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":"block/disassembler"}}},Rotation:[0.0f,0.0f]} +summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_disassemblers:block/disassembler"]}}}},Rotation:[0.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_disassembler","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_disassembler",Rotation:[0.0f,0.0f]} diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/west.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/west.mcfunction index 917680f4c3..dec4b4f0b8 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/west.mcfunction +++ b/gm4_disassemblers/data/gm4_disassemblers/function/machine/rotate/west.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ dropper[facing=west]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.disassembler","fallback":"Disassembler"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:offscreen"},{"translate":"gui.gm4.disassembler","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:half_invert"},{"translate":"container.gm4.disassembler","fallback":"Disassembler","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":"block/disassembler_side"}}},Rotation:[90.0f,0.0f]} +summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_disassemblers:block/disassembler_side"]}}}},Rotation:[90.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_disassembler","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_disassembler",Rotation:[90.0f,0.0f]} diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/relocate/pick_up_check.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/relocate/pick_up_check.mcfunction deleted file mode 100644 index 5569929972..0000000000 --- a/gm4_disassemblers/data/gm4_disassemblers/function/relocate/pick_up_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from #gm4_relocators:pick_up_check - -execute if score gm4_disassemblers load.status matches 1.. if entity @s[tag=gm4_disassembler] run function gm4_disassemblers:relocate/set_pick_up_data diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/relocate/place_down.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/relocate/place_down.mcfunction deleted file mode 100644 index 5c2fe3653f..0000000000 --- a/gm4_disassemblers/data/gm4_disassemblers/function/relocate/place_down.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# @s = command block placed by "gm4_relocators:backwards_compatibility/place_down/replace_head" -# located at the command block (where the player head was) - -execute if block ~ ~ ~ command_block[facing=east] run setblock ~ ~ ~ dropper[facing=west] -execute if block ~ ~ ~ command_block[facing=west] run setblock ~ ~ ~ dropper[facing=east] -execute if block ~ ~ ~ command_block[facing=south] run setblock ~ ~ ~ dropper[facing=north] -execute if block ~ ~ ~ command_block[facing=north] run setblock ~ ~ ~ dropper[facing=south] -execute if block ~ ~ ~ command_block[facing=down] run setblock ~ ~ ~ dropper[facing=up] - -data merge block ~ ~ ~ {CustomName:{"translate":"container.gm4.disassembler","fallback":"Disassembler"}} -summon armor_stand ~ ~-.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,DisabledSlots:2039552,Tags:["gm4_no_edit","gm4_disassembler"],HasVisualFire:1b,CustomName:"gm4_disassembler",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":"block/disassembler"}}}} -playsound minecraft:block.anvil.place master @a ~ ~ ~ 0.9 0.1 diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/relocate/place_down_check.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/relocate/place_down_check.mcfunction deleted file mode 100644 index 780aa898d9..0000000000 --- a/gm4_disassemblers/data/gm4_disassemblers/function/relocate/place_down_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = player who placed the block -# located at the center of the block to be placed -# run from #gm4_relocators:place_down_check - -execute if score $placed_block gm4_rl_data matches 0 if score gm4_disassemblers load.status matches 2 if data storage gm4_relocators:temp gm4_relocation{custom_block:"gm4_disassembler"} run function gm4_disassemblers:relocate/summon_block_markers diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/relocate/set_pick_up_data.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/relocate/set_pick_up_data.mcfunction deleted file mode 100644 index f964e3d003..0000000000 --- a/gm4_disassemblers/data/gm4_disassemblers/function/relocate/set_pick_up_data.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# sets the specific relocator data -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from gm4_disassemblers:relocate/pick_up_check - -data modify storage gm4_relocators:temp merge_data set value {custom_block:"gm4_disassembler",lore:{"translate":"block.gm4.disassembler","fallback":"Disassembler","color":"gray","italic":true}} -data modify storage gm4_relocators:temp merge_data.entity_data.Rotation set from entity @s Rotation -data modify storage gm4_relocators:temp merge_data.entity_data.equipment set from entity @e[type=armor_stand,tag=gm4_disassembler_stand,distance=..0.5,limit=1] equipment - -execute positioned ~ ~-0.4 ~ run kill @e[type=armor_stand,tag=gm4_disassembler_stand,limit=1,distance=..0.01] -kill @s -scoreboard players set $found_marker gm4_rl_data 1 diff --git a/gm4_disassemblers/data/gm4_disassemblers/function/relocate/summon_block_markers.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/function/relocate/summon_block_markers.mcfunction deleted file mode 100644 index 66203db507..0000000000 --- a/gm4_disassemblers/data/gm4_disassemblers/function/relocate/summon_block_markers.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -# summons the entities for this machine -# @s = player who placed the block -# located at the center of the block to be placed -# run from gm4_disassemblers:relocate/place_down_check - -scoreboard players set $placed_block gm4_rl_data 1 - -summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_disassembler_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_disassembler_stand",equipment:{head:{id:"minecraft:tnt",count:1,components:{"minecraft:custom_model_data":"block/disassembler"}}},Rotation:[0.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_disassembler","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_disassembler",Rotation:[0.0f,0.0f]} - -execute as @e[tag=gm4_new_machine,distance=..2] run data modify entity @s Rotation set from storage gm4_relocators:temp gm4_relocation.entity_data.Rotation -execute as @e[tag=gm4_new_machine,distance=..2] at @s rotated as @e[type=marker,tag=gm4_new_machine,distance=..2,limit=1] run tp ~ ~ ~ -execute as @e[type=armor_stand,tag=gm4_new_machine,distance=..2] run data modify entity @s equipment set from storage gm4_relocators:temp gm4_relocation.entity_data.equipment -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 1 -tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_disassemblers/data/gm4_disassemblers/gm4_recipes/disassembler.json b/gm4_disassemblers/data/gm4_disassemblers/gm4_recipes/disassembler.json deleted file mode 100644 index d71f77438f..0000000000 --- a/gm4_disassemblers/data/gm4_disassemblers/gm4_recipes/disassembler.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "ITI", - "OSO", - "CCC" - ], - "key": { - "I": { - "item": "minecraft:iron_ingot" - }, - "T": { - "item": "minecraft:tnt" - }, - "O": { - "item": "minecraft:obsidian" - }, - "S": { - "item": "minecraft:stonecutter" - }, - "C": { - "item": "minecraft:cobblestone" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_disassemblers:items/disassembler", - "count": 1 - } - } -} diff --git a/gm4_disassemblers/data/gm4_disassemblers/guidebook/disassemblers.json b/gm4_disassemblers/data/gm4_disassemblers/guidebook/disassemblers.json index 6c45acc4ae..73bd9974c5 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/guidebook/disassemblers.json +++ b/gm4_disassemblers/data/gm4_disassemblers/guidebook/disassemblers.json @@ -6,43 +6,6 @@ "id": "minecraft:tnt" }, "criteria": { - "create_custom_crafter": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type_specific": { - "type": "player", - "advancements": { - "gm4:custom_crafters": true - } - } - } - } - ] - } - }, - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, "obtain_tnt": { "trigger": "minecraft:inventory_changed", "conditions": { @@ -78,14 +41,7 @@ { "name": "description", "enable": [], - "requirements": [ - [ - "create_custom_crafter" - ], - [ - "open_custom_crafter" - ] - ], + "requirements": [], "pages": [ [ { @@ -93,7 +49,7 @@ }, { "translate": "text.gm4.guidebook.disassmeblers.description", - "fallback": "Disassmeblers can be crafted in Custom Crafters.\n\nDisassemblers can take apart metal armour, tools, and weapons and return ingots based on the item's durability." + "fallback": "Disassmeblers can be crafted in a crafting table.\n\nDisassemblers can take apart metal armour, tools, and weapons and return ingots based on the item's durability." } ] ] @@ -110,7 +66,7 @@ [ { "translate": "text.gm4.guidebook.disassemblers.crafting", - "fallback": "A Disassembler can be crafted in a Custom Crafter:" + "fallback": "A Disassembler can be crafted in a crafting table:" }, "\n", { diff --git a/gm4_disassemblers/data/gm4_disassemblers/loot_table/crafting/disassembler.json b/gm4_disassemblers/data/gm4_disassemblers/loot_table/crafting/disassembler.json deleted file mode 100644 index 506ff220b1..0000000000 --- a/gm4_disassemblers/data/gm4_disassemblers/loot_table/crafting/disassembler.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_disassemblers:items/disassembler", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_disassemblers/data/gm4_disassemblers/loot_table/items/disassembler.json b/gm4_disassemblers/data/gm4_disassemblers/loot_table/items/disassembler.json index 8a7ce9e740..c7ec0267b2 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/loot_table/items/disassembler.json +++ b/gm4_disassemblers/data/gm4_disassemblers/loot_table/items/disassembler.json @@ -11,7 +11,7 @@ { "function": "set_components", "components": { - "minecraft:custom_model_data": "item/disassembler", + "minecraft:custom_model_data": {"strings":["gm4_disassemblers:item/disassembler"]}, "minecraft:profile": "$disassembler" } }, diff --git a/gm4_disassemblers/data/gm4_disassemblers/recipe/disassembler.json b/gm4_disassemblers/data/gm4_disassemblers/recipe/disassembler.json index 7d54e1c06f..b78d44c089 100644 --- a/gm4_disassemblers/data/gm4_disassemblers/recipe/disassembler.json +++ b/gm4_disassemblers/data/gm4_disassemblers/recipe/disassembler.json @@ -16,7 +16,7 @@ "result": { "id": "minecraft:player_head", "components": { - "minecraft:custom_model_data": "item/disassembler", + "minecraft:custom_model_data": {"strings":["gm4_disassemblers:item/disassembler"]}, "minecraft:profile": "$disassembler", "minecraft:custom_data": "{gm4_machines:{id:'disassembler'}}", "minecraft:custom_name": {"translate":"block.gm4.disassembler","fallback":"Disassembler","color":"white","italic":false} diff --git a/gm4_disassemblers/data/gm4_disassemblers/test/craft.mcfunction b/gm4_disassemblers/data/gm4_disassemblers/test/craft.mcfunction deleted file mode 100644 index 0bd43fa687..0000000000 --- a/gm4_disassemblers/data/gm4_disassemblers/test/craft.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.0 with minecraft:iron_ingot -item replace block ~1 ~1 ~1 container.1 with minecraft:tnt -item replace block ~1 ~1 ~1 container.2 with minecraft:iron_ingot -item replace block ~1 ~1 ~1 container.3 with minecraft:obsidian -item replace block ~1 ~1 ~1 container.4 with minecraft:stonecutter -item replace block ~1 ~1 ~1 container.5 with minecraft:obsidian -item replace block ~1 ~1 ~1 container.6 with minecraft:cobblestone -item replace block ~1 ~1 ~1 container.7 with minecraft:cobblestone -item replace block ~1 ~1 ~1 container.8 with minecraft:cobblestone - -await items block ~1 ~1 ~1 container.* minecraft:player_head[custom_data~{gm4_machines:{id:"disassembler"}}] diff --git a/gm4_disassemblers/data/gm4_relocators/tags/function/pick_up_check.json b/gm4_disassemblers/data/gm4_relocators/tags/function/pick_up_check.json deleted file mode 100644 index 52156ba1cd..0000000000 --- a/gm4_disassemblers/data/gm4_relocators/tags/function/pick_up_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_disassemblers:relocate/pick_up_check" - ] -} diff --git a/gm4_disassemblers/data/gm4_relocators/tags/function/place_down_check.json b/gm4_disassemblers/data/gm4_relocators/tags/function/place_down_check.json deleted file mode 100644 index 783ba069cd..0000000000 --- a/gm4_disassemblers/data/gm4_relocators/tags/function/place_down_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_disassemblers:relocate/place_down_check" - ] -} diff --git a/gm4_disassemblers/generate_disassembly.py b/gm4_disassemblers/generate_disassembly.py index f12b9a2044..d8426c0168 100644 --- a/gm4_disassemblers/generate_disassembly.py +++ b/gm4_disassemblers/generate_disassembly.py @@ -70,8 +70,6 @@ def beet_default(ctx: Context): recipes = vanilla.data.recipes for item, durability in ITEMS.items(): - output_pack = ctx.data.overlays["since_94"] if "spear" in item else (ctx.data.overlays["since_88"] if "copper" in item else ctx.data) - recipe = recipes[f"minecraft:{item}"].data ingredients: list[tuple[str, int]] = [] if recipe["type"] == "minecraft:crafting_shaped": @@ -135,8 +133,8 @@ def beet_default(ctx: Context): ] }] }) - - output_pack[f"{ctx.project_id}:disassembleables/{item}"] = LootTable({ + + ctx.data[f"{ctx.project_id}:disassembleables/{item}"] = LootTable({ "__comment": "Generated by generate_disassembly.py", "type": "minecraft:generic", "pools": pools @@ -152,8 +150,6 @@ def beet_default(ctx: Context): }] } for item in ITEMS: - if "spear" in item or "copper" in item: - continue caller["pools"][0]["entries"][0]["children"].append({ "type": "minecraft:loot_table", "value": f'gm4_disassemblers:disassembleables/{item}', @@ -172,61 +168,3 @@ def beet_default(ctx: Context): }) ctx.data[f"{ctx.project_id}:caller"] = LootTable(caller) - - # since 88 overlay - caller_88: dict[str, Any] = { - "__comment": "Generated by generate_disassembly.py", - "type": "minecraft:fishing", - "pools": [{ - "rolls": 1, - "entries": [{"type":"minecraft:alternatives","children":[]}] - }] - } - for item in ITEMS: - if "spear" in item: - continue - caller_88["pools"][0]["entries"][0]["children"].append({ - "type": "minecraft:loot_table", - "value": f'gm4_disassemblers:disassembleables/{item}', - "conditions": [{ - "condition": "match_tool", - "predicate": { - "items": [f"minecraft:{item}"] - } - }] - }) - if item.startswith("diamond_"): - caller_88["pools"][0]["entries"][0]["children"][-1]["conditions"].append({ - "condition": "value_check", - "range": 1, - "value": {"type":"score","target":{"type":"fixed","name":"disassemble_diamonds"},"score":"gm4_disassembler"} - }) - ctx.data.overlays["since_88"][f"{ctx.project_id}:caller"] = LootTable(caller_88) - - # since 94 overlay - caller_94: dict[str, Any] = { - "__comment": "Generated by generate_disassembly.py", - "type": "minecraft:fishing", - "pools": [{ - "rolls": 1, - "entries": [{"type":"minecraft:alternatives","children":[]}] - }] - } - for item in ITEMS: - caller_94["pools"][0]["entries"][0]["children"].append({ - "type": "minecraft:loot_table", - "value": f'gm4_disassemblers:disassembleables/{item}', - "conditions": [{ - "condition": "match_tool", - "predicate": { - "items": [f"minecraft:{item}"] - } - }] - }) - if item.startswith("diamond_"): - caller_94["pools"][0]["entries"][0]["children"][-1]["conditions"].append({ - "condition": "value_check", - "range": 1, - "value": {"type":"score","target":{"type":"fixed","name":"disassemble_diamonds"},"score":"gm4_disassembler"} - }) - ctx.data.overlays["since_94"][f"{ctx.project_id}:caller"] = LootTable(caller_94) diff --git a/gm4_disassemblers/mod.mcdoc b/gm4_disassemblers/mod.mcdoc new file mode 100644 index 0000000000..13b8e74cfb --- /dev/null +++ b/gm4_disassemblers/mod.mcdoc @@ -0,0 +1,5 @@ +use ::java::world::item::ItemStack + +dispatch minecraft:storage[gm4_disassemblers:temp] to struct { + Items?: [ItemStack] +} diff --git a/gm4_display_frames/data/gm4/advancement/display_frames.json b/gm4_display_frames/data/gm4/advancement/display_frames.json index 905ffe4ef8..885f84c68c 100644 --- a/gm4_display_frames/data/gm4/advancement/display_frames.json +++ b/gm4_display_frames/data/gm4/advancement/display_frames.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:splash_potion", "components": { - "minecraft:custom_model_data": "gui/advancement/display_frames", + "minecraft:custom_model_data": {"strings":["gm4_display_frames:gui/advancement/display_frames"]}, "minecraft:potion_contents": "minecraft:invisibility" } }, diff --git a/gm4_double_doors/generate.py b/gm4_double_doors/generate.py index e6eb8791ec..05f3aa4bd3 100644 --- a/gm4_double_doors/generate.py +++ b/gm4_double_doors/generate.py @@ -63,7 +63,7 @@ def beet_default(ctx: Context): # prepare list of door materials door_materials = [ door.removeprefix("minecraft:").removesuffix("_door") - for door in resolve_blocktag(ctx, "1.21.5", "minecraft:mob_interactable_doors") + for door in resolve_blocktag(ctx, "1.21.11", "minecraft:mob_interactable_doors") ] # make list of wood types accessible for bolt ctx.meta['door_materials'] = door_materials diff --git a/gm4_dripleaf_filters/mod.mcdoc b/gm4_dripleaf_filters/mod.mcdoc new file mode 100644 index 0000000000..bc2ebd8a30 --- /dev/null +++ b/gm4_dripleaf_filters/mod.mcdoc @@ -0,0 +1,6 @@ +use ::java::world::item::ItemStack + +dispatch minecraft:storage[gm4_dripleaf_filters:cache] to struct { + compare_id?: #[id="item"] string, + whitelisted_items?: [ItemStack] @ ..5, +} diff --git a/gm4_dripleaf_filters/pack.png b/gm4_dripleaf_filters/pack.png new file mode 100644 index 0000000000..a7185dfdbc Binary files /dev/null and b/gm4_dripleaf_filters/pack.png differ diff --git a/gm4_enchantment_extractors/README.md b/gm4_enchantment_extractors/README.md deleted file mode 100644 index 8efb22b60d..0000000000 --- a/gm4_enchantment_extractors/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Enchantment Extractors - -Transfer enchantments from tools onto books! - -### Features -- Place the enchanted item inside the extractor and the enchantments will be turned into enchanted books -- Not all attempts will be successful, and will sometimes bring an enchantment to life as a bothersome Vex -- More powerful enchantments have a chance to receive a curse upon success - -Read more about the success rates on the [Wiki](https://wiki.gm4.co/Enchantment_Extractors) diff --git a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_bottom.png b/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_bottom.png deleted file mode 100644 index 869e547308..0000000000 Binary files a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_bottom.png and /dev/null differ diff --git a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_front.png b/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_front.png deleted file mode 100644 index 27ea82898a..0000000000 Binary files a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_front.png and /dev/null differ diff --git a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_side.png b/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_side.png deleted file mode 100644 index 0e2c8af045..0000000000 Binary files a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_side.png and /dev/null differ diff --git a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_side_front.png b/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_side_front.png deleted file mode 100644 index 38cb0ec2c1..0000000000 Binary files a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_side_front.png and /dev/null differ diff --git a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_top.png b/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_top.png deleted file mode 100644 index 4242cdc877..0000000000 Binary files a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_top.png and /dev/null differ diff --git a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_top_out.png b/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_top_out.png deleted file mode 100644 index 60a81f9b78..0000000000 Binary files a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/block/enchantment_extractor_top_out.png and /dev/null differ diff --git a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/gui/container/enchantment_extractor.png b/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/gui/container/enchantment_extractor.png deleted file mode 100644 index b81c73c1da..0000000000 Binary files a/gm4_enchantment_extractors/assets/gm4_enchantment_extractors/textures/gui/container/enchantment_extractor.png and /dev/null differ diff --git a/gm4_enchantment_extractors/assets/translations.csv b/gm4_enchantment_extractors/assets/translations.csv deleted file mode 100644 index 80596dbfa4..0000000000 --- a/gm4_enchantment_extractors/assets/translations.csv +++ /dev/null @@ -1,15 +0,0 @@ -key,en_us -block.gm4.enchantment_extractor,Enchantment Extractor -container.gm4.enchantment_extractor,Enchantment Extractor -entity.gm4.congealed_enchantment,Congealed Enchantment\u00A7 -entity.gm4.living_enchantment,Living Enchantment\u00A7 -advancement.gm4.enchantment_extractors.title,Clever Enchanting -advancement.gm4.enchantment_extractors.description,Construct an Enchantment Extractor -advancement.gm4.enchantment_extractors.mending.title,Magical Thief -advancement.gm4.enchantment_extractors.mending.description,Successfully extract the mending enchantment from a tool with an Enchantment Extractor -text.gm4.guidebook.module_desc.enchantment_extractors,"Remove enchantments from enchanted tools, armour, and weapons. But be careful, there might be unexpected side-effects." -text.gm4.guidebook.enchantment_extractors.description,"Enchantment Extractors are used to remove enchantments from tools, weapons, and armour." -text.gm4.guidebook.enchantment_extractors.crafting,An Enchantment Extractor can be crafted in a Custom Crafter: -text.gm4.guidebook.enchantment extractors.unenchanting,"Placing enchanted items inside the enchantment extractor will unenchant it.\n\nWhen extracted, there is a chance to generate enchanted books containing those enchantments." -text.gm4.guidebook.enchantment extractors.extraction,The chance of extraction is lower for more powerful enchantments.\n\nSome high level enchants may become cursed with vanishing. -text.gm4.guidebook.enchantment extractors.failed_extraction,"If an extraction fails, a puff of smoke or a congealed enchantment (Vex) will appear." diff --git a/gm4_enchantment_extractors/beet.yaml b/gm4_enchantment_extractors/beet.yaml deleted file mode 100644 index 3be312da44..0000000000 --- a/gm4_enchantment_extractors/beet.yaml +++ /dev/null @@ -1,103 +0,0 @@ -id: gm4_enchantment_extractors -name: Enchantment Extractors -version: 2.5.X - -data_pack: - load: . - overlays: - - formats: - min_inclusive: 94 - max_inclusive: 94 - min_format: 94 - max_format: 94 - directory: since_94 - -resource_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters - -meta: - gm4: - versioning: - required: - lib_custom_crafters: 3.4.0 - lib_machines: 1.4.0 - schedule_loops: [main] - model_data: - - item: player_head - reference: item/enchantment_extractor - model: block/enchantment_extractor - - item: enchanting_table - template: block - transforms: - - name: item_display - origin: [0.5,1,0.5] - scale: [0.625, 0.625,0.625] - translation: [0,-0.01,0] - display: head - broadcast: - - reference: block/enchantment_extractor - textures: - side: block/enchantment_extractor_side - top: block/enchantment_extractor_top_out - bottom: minecraft:block/furnace_top - front: block/enchantment_extractor_side - - reference: block/enchantment_extractor_side - textures: - side: block/enchantment_extractor_side - top: block/enchantment_extractor_top - bottom: minecraft:block/furnace_top - front: block/enchantment_extractor_front - - reference: block/enchantment_extractor_down - textures: - side: block/enchantment_extractor_side - top: block/enchantment_extractor_top - bottom: block/enchantment_extractor_bottom - front: block/enchantment_extractor_side - - item: enchanted_book - reference: gui/advancement/enchantment_extractors_mending - template: advancement - - item: enchanting_table - reference: gui/advancement/enchantment_extractors - template: - name: advancement - forward: block/enchantment_extractor - gui_fonts: - - translation: gui.gm4.enchantment_extractor - container: dropper - texture: gui/container/enchantment_extractor - website: - description: Remove enchantments from enchanted tools, armour, and weapons. But be careful, there might be unexpected side-effects. - recommended: - - gm4_resource_pack - - gm4_relocators - - gm4_standard_crafting - - gm4_ender_hoppers - - gm4_forming_press - - gm4_block_compressors - - gm4_disassemblers - - gm4_tunnel_bores - - gm4_boots_of_ostara - - gm4_heart_canisters - - gm4_smelteries - - gm4_liquid_tanks - notes: [] - modrinth: - project_id: eoRo8GBL - video: https://www.youtube.com/watch?v=DT4PPHC23iM - wiki: https://wiki.gm4.co/wiki/Enchantment_Extractors - credits: - Creator: - - The8BitMonkey - Updated by: - - SpecialBuilder32 - - Misode - - BPR - Textures by: - - Kyrius - Icon Design: - - DuckJr diff --git a/gm4_enchantment_extractors/data/gm4/advancement/enchantment_extractors.json b/gm4_enchantment_extractors/data/gm4/advancement/enchantment_extractors.json deleted file mode 100644 index 2d59d679cf..0000000000 --- a/gm4_enchantment_extractors/data/gm4/advancement/enchantment_extractors.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "display": { - "icon": { - "id": "enchanting_table", - "components": { - "minecraft:custom_model_data": "gui/advancement/enchantment_extractors" - } - }, - "title": { - "translate": "advancement.gm4.enchantment_extractors.title", - "fallback": "Clever Enchanting" - }, - "description": { - "translate": "advancement.gm4.enchantment_extractors.description", - "fallback": "Construct an Enchantment Extractor", - "color": "gray" - } - }, - "parent": "gm4:custom_crafters", - "criteria": { - "obtain_enchantment_extractor": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:player_head" - ], - "predicates": { - "minecraft:custom_data": "{gm4_machines:{id:\"enchantment_extractor\"}}" - } - } - ] - } - } - } -} diff --git a/gm4_enchantment_extractors/data/gm4/advancement/enchantment_extractors_mending.json b/gm4_enchantment_extractors/data/gm4/advancement/enchantment_extractors_mending.json deleted file mode 100644 index b25d692827..0000000000 --- a/gm4_enchantment_extractors/data/gm4/advancement/enchantment_extractors_mending.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "enchanted_book", - "components": { - "minecraft:custom_model_data": "gui/advancement/enchantment_extractors_mending" - } - }, - "frame": "goal", - "title": { - "translate": "advancement.gm4.enchantment_extractors.mending.title", - "fallback": "Magical Thief" - }, - "description": { - "translate": "advancement.gm4.enchantment_extractors.mending.description", - "fallback": "Successfully extract the mending enchantment from a tool with an Enchantment Extractor", - "color": "gray" - } - }, - "parent": "gm4:enchantment_extractors", - "criteria": { - "extract_mending": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_enchantment_extractors/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_enchantment_extractors/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index db969b41fc..0000000000 --- a/gm4_enchantment_extractors/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values":[ - "gm4_enchantment_extractors:check_recipes" - ] - -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/advancement/recipes/enchantment_extractor.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/advancement/recipes/enchantment_extractor.json deleted file mode 100644 index 00a4ba5833..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/advancement/recipes/enchantment_extractor.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "gm4_enchantment_extractors:enchantment_extractor" - } - }, - "has_materials": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:enchanting_table", - "minecraft:grindstone" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_materials" - ] - ], - "rewards": { - "recipes": [ - "gm4_enchantment_extractors:enchantment_extractor" - ] - } -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/check_recipes.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/check_recipes.mcfunction deleted file mode 100644 index 2032d3409f..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/check_recipes.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# @s = custom crafter running recipes -# run from #gm4_custom_crafters:check_recipes - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 7 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:enchanting_table"},{Slot:3b,id:"minecraft:gold_ingot"},{Slot:4b,id:"minecraft:grindstone"},{Slot:5b,id:"minecraft:gold_ingot"},{Slot:6b,id:"minecraft:cobblestone"},{Slot:7b,id:"minecraft:cobblestone"},{Slot:8b,id:"minecraft:cobblestone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_enchantment_extractors:crafting/enchantment_extractor diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract.mcfunction deleted file mode 100644 index af5240e4a8..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# starts processing items in the enchantment extractor -# @s = armor stand display (we need the hand) -# located at the enchantment extractor block -# run from process - -# set up storage and armor stand -data modify storage gm4_enchantment_extractors:temp items set from block ~ ~ ~ Items -execute store result score $slot_count gm4_ench_data run data get storage gm4_enchantment_extractors:temp items - -# loop through all items -execute unless score $slot_count gm4_ench_data matches 9 run function gm4_enchantment_extractors:process_items - -# clean up -data remove storage gm4_enchantment_extractors:temp items diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_binding.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_binding.mcfunction deleted file mode 100644 index cfb1287fa9..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_binding.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# extracts binding_curse from the tool -# @s = armor stand display (we need the hand) -# located at the enchantment extractor block -# run from enchantment_extractors:extract_item - -execute store result score $added_curse gm4_ench_data run loot insert ~ ~ ~ fish gm4_enchantment_extractors:technical/extract/binding_curse ~ ~ ~ mainhand -scoreboard players set $extracted_curse gm4_ench_data 1 -execute unless score $added_curse gm4_ench_data matches 0 run scoreboard players add $added_books gm4_ench_data 1 diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_failed.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_failed.mcfunction deleted file mode 100644 index 94065b4291..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_failed.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -# runs fail events if nothing was extracted -# @s = armor stand display -# located at the enchantment extractor block -# run from extract_item - -# smoke: 80% -> (1 * 0.8) -scoreboard players set $failed_smoke gm4_ench_data 0 -execute if predicate gm4_enchantment_extractors:failed_smoke_chance store success score $failed_smoke gm4_ench_data run particle poof ~ ~1.5 ~ 0.2 0.2 0.2 0.05 5 -execute if score $failed_smoke gm4_ench_data matches 1 run playsound item.shield.break block @a[distance=..8] ~ ~ ~ 0.6 0.3 - -# congealed enchantment: 10% -> (1 - 0.8) * 0.5 -scoreboard players set $failed_congealed_ench gm4_ench_data 0 -execute if score $failed_smoke gm4_ench_data matches 0 if predicate gm4_enchantment_extractors:failed_congealed_chance store success score $failed_congealed_ench gm4_ench_data run summon vex ~ ~ ~ {CustomName:{"translate":"entity.gm4.congealed_enchantment","fallback":"Congealed Enchantment§"},CustomNameVisible:0b,Team:"gm4_hide_name",life_ticks:100,attributes:[{id:"minecraft:attack_damage",base:2}],Health:4.0f,Motion:[0.0,0.35,0.0]} -execute if score $failed_congealed_ench gm4_ench_data matches 1 run playsound entity.evoker.prepare_attack block @a[distance=..8] ~ ~ ~ .8 1.8 - -# living enchantment: 10% -> (1 - 0.8 - ((1 - 0.8) * 0.5)) -scoreboard players set $failed_living_ench gm4_ench_data 0 -execute if score $failed_smoke gm4_ench_data matches 0 if score $failed_congealed_ench gm4_ench_data matches 0 store success score $failed_living_ench gm4_ench_data run summon vex ~ ~ ~ {CustomName:{"translate":"entity.gm4.living_enchantment","fallback":"Living Enchantment§"},CustomNameVisible:0b,Team:"gm4_hide_name",equipment:{mainhand:{id:"minecraft:golden_sword",count:1}},drop_chances:{mainhand:0.0f},Motion:[0.0,0.25,0.0]} -execute if score $failed_living_ench gm4_ench_data matches 1 run playsound entity.evoker.prepare_attack block @a[distance=..8] ~ ~ ~ 1.3 .6 diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_item.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_item.mcfunction deleted file mode 100644 index bc06851820..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_item.mcfunction +++ /dev/null @@ -1,38 +0,0 @@ -# extracts enchantments from this item -# @s = armor stand display (we need the hand) -# located at the enchantment extractor block -# run from process_items - -data modify entity @s equipment.mainhand set from storage gm4_enchantment_extractors:temp current_item - -# check if mending already in extractor -execute store result score $existing_mending gm4_ench_data if items block ~ ~ ~ container.* *[stored_enchantments~[{enchantments:"minecraft:mending"}]] - -# if cursed extract only the curse -execute if data storage gm4_enchantment_extractors:temp current_item.components."minecraft:enchantments"."minecraft:vanishing_curse" run function gm4_enchantment_extractors:extract_vanishing -execute if data storage gm4_enchantment_extractors:temp current_item.components."minecraft:enchantments"."minecraft:binding_curse" run function gm4_enchantment_extractors:extract_binding - -# extract -execute unless score $curse_extracted gm4_ench_data matches 1 store result score $added_books gm4_ench_data run loot insert ~ ~ ~ fish gm4_enchantment_extractors:technical/extract/check ~ ~ ~ mainhand - -# visuals -playsound block.enchantment_table.use block @a[distance=..5] ~ ~ ~ 1 0.8 -playsound block.grindstone.use block @a[distance=..5] ~ ~ ~ .6 0.8 -particle enchant ~ ~1.3 ~ 0 0 0 .5 10 - -# failed extraction -execute unless score $added_books gm4_ench_data matches 1.. run function gm4_enchantment_extractors:extract_failed - -# update block inventory -scoreboard players operation $slot_count gm4_ench_data += $added_books gm4_ench_data -data remove storage gm4_enchantment_extractors:temp current_item.components."minecraft:enchantments" -data modify block ~ ~ ~ Items append from storage gm4_enchantment_extractors:temp current_item - -# grant mending advancement -execute unless score $existing_mending gm4_ench_data matches 1.. if items block ~ ~ ~ container.* *[stored_enchantments~[{enchantments:"minecraft:mending"}]] unless items block ~ ~ ~ container.* *[stored_enchantments~[{enchantments:"minecraft:mending"},{enchantments:"minecraft:vanishing_curse"}]] run advancement grant @a[distance=..5] only gm4:enchantment_extractors_mending - -# clean up -data remove entity @s equipment.mainhand -scoreboard players reset $existing_mending gm4_ench_data -scoreboard players reset $curse_extracted gm4_ench_data -scoreboard players reset $added_books gm4_ench_data diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_vanishing.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_vanishing.mcfunction deleted file mode 100644 index 37d2a21aca..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/extract_vanishing.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# extracts vanishing_curse from the tool -# @s = armor stand display (we need the hand) -# located at the enchantment extractor block -# run from enchantment_extractors:extract_item - -execute store result score $added_curse gm4_ench_data run loot insert ~ ~ ~ fish gm4_enchantment_extractors:technical/extract/vanishing_curse ~ ~ ~ mainhand -scoreboard players set $extracted_curse gm4_ench_data 1 -execute unless score $added_curse gm4_ench_data matches 0 run scoreboard players add $added_books gm4_ench_data 1 diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/init.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/init.mcfunction deleted file mode 100644 index ee806522bc..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/init.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -scoreboard objectives add gm4_ench_data dummy -team add gm4_hide_name -team modify gm4_hide_name nametagVisibility never - -execute unless score enchantment_extractors gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Enchantment Extractors"} -execute unless score enchantment_extractors gm4_earliest_version < enchantment_extractors gm4_modules run scoreboard players operation enchantment_extractors gm4_earliest_version = enchantment_extractors gm4_modules -scoreboard players set enchantment_extractors gm4_modules 1 - -schedule function gm4_enchantment_extractors:main 1t - - - -#$moduleUpdateList diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/create.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/create.mcfunction deleted file mode 100644 index 37951b53b9..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/create.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -# places the enchantment_extractor down -# @s = player who placed the enchantment_extractor -# located at the center of the placed block -# run from gm4_enchantment_extractors:machine/verify_place_down - -# place block depending on rotation -execute if score $rotation gm4_machine_data matches 1 run function gm4_enchantment_extractors:machine/rotate/down -execute if score $rotation gm4_machine_data matches 2 run function gm4_enchantment_extractors:machine/rotate/up -execute if score $rotation gm4_machine_data matches 3 run function gm4_enchantment_extractors:machine/rotate/south -execute if score $rotation gm4_machine_data matches 4 run function gm4_enchantment_extractors:machine/rotate/west -execute if score $rotation gm4_machine_data matches 5 run function gm4_enchantment_extractors:machine/rotate/north -execute if score $rotation gm4_machine_data matches 6 run function gm4_enchantment_extractors:machine/rotate/east - -# mark block as placed -playsound entity.experience_orb.pickup master @a[distance=..5] ~ ~ ~ 1 0.7 1 -scoreboard players set $placed_block gm4_machine_data 1 -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 1 -tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/destroy.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/destroy.mcfunction deleted file mode 100644 index 322c4c07ee..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/destroy.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# destroys the enchantment_extractor -# @s = enchantment_extractor marker -# located at @s -# run from gm4_enchantment_extractors:machine/verify_destroy - -# kill entities related to machine block -execute positioned ~ ~-1.2 ~ run kill @e[type=armor_stand,tag=gm4_enchantment_extractor_stand,limit=1,distance=..0.01] -execute store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:dropper",count:1,components:{}}},limit=1,sort=nearest] -kill @s - -# drop item (unless broken in creative mode) -particle minecraft:block{block_state:"minecraft:enchanting_table"} ~ ~ ~ .1 .25 .1 .05 30 normal @a -execute if score $dropped_item gm4_machine_data matches 1 run loot spawn ~ ~ ~ loot gm4_enchantment_extractors:items/enchantment_extractor diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/down.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/down.mcfunction deleted file mode 100644 index a06e6b1d1b..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/down.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the enchantment_extractor down based on rotation -# @s = player who placed the enchantment_extractor -# located at the center of the placed block -# run from gm4_enchantment_extractors:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=down]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:offscreen"},{"translate":"gui.gm4.enchantment_extractor","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-1.2 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_enchantment_extractor_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_enchantment_extractor_stand",equipment:{head:{id:"minecraft:enchanting_table",count:1,components:{"minecraft:custom_model_data":"block/enchantment_extractor_down"}}},Rotation:[180.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_enchantment_extractor","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_enchantment_extractor",Rotation:[180.0f,0.0f]} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/east.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/east.mcfunction deleted file mode 100644 index 0b5b135d91..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/east.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the enchantment_extractor down based on rotation -# @s = player who placed the enchantment_extractor -# located at the center of the placed block -# run from gm4_enchantment_extractors:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=east]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:offscreen"},{"translate":"gui.gm4.enchantment_extractor","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-1.2 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_enchantment_extractor_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_enchantment_extractor_stand",equipment:{head:{id:"minecraft:enchanting_table",count:1,components:{"minecraft:custom_model_data":"block/enchantment_extractor_side"}}},Rotation:[-90.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_enchantment_extractor","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_enchantment_extractor",Rotation:[-90.0f,0.0f]} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/north.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/north.mcfunction deleted file mode 100644 index 70f01a7b80..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/north.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the enchantment_extractor down based on rotation -# @s = player who placed the enchantment_extractor -# located at the center of the placed block -# run from gm4_enchantment_extractors:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=north]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:offscreen"},{"translate":"gui.gm4.enchantment_extractor","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-1.2 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_enchantment_extractor_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_enchantment_extractor_stand",equipment:{head:{id:"minecraft:enchanting_table",count:1,components:{"minecraft:custom_model_data":"block/enchantment_extractor_side"}}},Rotation:[180.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_enchantment_extractor","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_enchantment_extractor",Rotation:[180.0f,0.0f]} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/south.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/south.mcfunction deleted file mode 100644 index e6cc439203..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/south.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the enchantment_extractor down based on rotation -# @s = player who placed the enchantment_extractor -# located at the center of the placed block -# run from gm4_enchantment_extractors:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=south]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:offscreen"},{"translate":"gui.gm4.enchantment_extractor","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-1.2 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_enchantment_extractor_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_enchantment_extractor_stand",equipment:{head:{id:"minecraft:enchanting_table",count:1,components:{"minecraft:custom_model_data":"block/enchantment_extractor_side"}}},Rotation:[0.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_enchantment_extractor","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_enchantment_extractor",Rotation:[0.0f,0.0f]} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/up.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/up.mcfunction deleted file mode 100644 index b4135c5014..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/up.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the enchantment_extractor down based on rotation -# @s = player who placed the enchantment_extractor -# located at the center of the placed block -# run from gm4_enchantment_extractors:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=up]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:offscreen"},{"translate":"gui.gm4.enchantment_extractor","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-1.2 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_enchantment_extractor_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_enchantment_extractor_stand",equipment:{head:{id:"minecraft:enchanting_table",count:1,components:{"minecraft:custom_model_data":"block/enchantment_extractor"}}},Rotation:[0.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_enchantment_extractor","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_enchantment_extractor",Rotation:[0.0f,0.0f]} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/west.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/west.mcfunction deleted file mode 100644 index fbe7d2e2fb..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/rotate/west.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the enchantment_extractor down based on rotation -# @s = player who placed the enchantment_extractor -# located at the center of the placed block -# run from gm4_enchantment_extractors:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=west]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:offscreen"},{"translate":"gui.gm4.enchantment_extractor","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:half_invert"},{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-1.2 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_enchantment_extractor_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_enchantment_extractor_stand",equipment:{head:{id:"minecraft:enchanting_table",count:1,components:{"minecraft:custom_model_data":"block/enchantment_extractor_side"}}},Rotation:[90.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_enchantment_extractor","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_enchantment_extractor",Rotation:[90.0f,0.0f]} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/verify_destroy.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/verify_destroy.mcfunction deleted file mode 100644 index 0f076ff2c2..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/verify_destroy.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# verifies that the destroyed machine was from this module -# @s = machine block marker -# located at @s -# run from #gm4_machines:destroy - -execute if entity @s[tag=gm4_enchantment_extractor] run function gm4_enchantment_extractors:machine/destroy diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/verify_place_down.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/verify_place_down.mcfunction deleted file mode 100644 index f8d5e1cb2c..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/machine/verify_place_down.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# verifies that the placed down machine was from this module -# @s = player who placed down the machine -# located at the machine block marker (at the center of the placed down block) -# run from #gm4_machines:place_down - -execute if score $placed_block gm4_machine_data matches 0 if data storage gm4_machines:temp {id:"enchantment_extractor"} run function gm4_enchantment_extractors:machine/create diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/main.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/main.mcfunction deleted file mode 100644 index 70ef9249e3..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/main.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# process machine -execute as @e[type=marker,tag=gm4_enchantment_extractor] at @s run function gm4_enchantment_extractors:process - -schedule function gm4_enchantment_extractors:main 16t diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/process.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/process.mcfunction deleted file mode 100644 index a034d5340b..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/process.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# @s = enchantment extractor marker_entity -# positioned 1 block above (at the dropper) -# run from main - -particle portal ~ ~0.5 ~ 0 0 0 .5 1 -execute if items block ~ ~ ~ container.* *[!enchantments={}] positioned ~ ~-1.2 ~ as @e[type=armor_stand,tag=gm4_enchantment_extractor_stand,limit=1,distance=..0.01] positioned ~ ~1.2 ~ run function gm4_enchantment_extractors:extract diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/process_items.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/process_items.mcfunction deleted file mode 100644 index 8de7387841..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/process_items.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -# processes each item in the enchantment extractor -# @s = armor stand display (we need the hand) -# located at the enchantment extractor block -# run from extract - -# run for last item in storage -data modify storage gm4_enchantment_extractors:temp current_item set from storage gm4_enchantment_extractors:temp items[0] - -# check if the item has enchantments -execute store result score $has_enchantments gm4_ench_data run data get storage gm4_enchantment_extractors:temp current_item.components."minecraft:enchantments" - -# extract enchantments if there is room in the dropper inventory -execute if score $has_enchantments gm4_ench_data matches 1.. if score $slot_count gm4_ench_data matches ..8 run function gm4_enchantment_extractors:extract_item - -# run for next item in storage unless the inventory is full -data remove storage gm4_enchantment_extractors:temp current_item -data remove storage gm4_enchantment_extractors:temp items[0] -execute if score $slot_count gm4_ench_data matches ..8 if data storage gm4_enchantment_extractors:temp items[-1] run function gm4_enchantment_extractors:process_items diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/pick_up_check.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/pick_up_check.mcfunction deleted file mode 100644 index d56d52335c..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/pick_up_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from #gm4_relocators:pick_up_check - -execute if score gm4_enchantment_extractors load.status matches 1.. if entity @s[tag=gm4_enchantment_extractor] run function gm4_enchantment_extractors:relocate/set_pick_up_data diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/place_down.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/place_down.mcfunction deleted file mode 100644 index f66b52e94c..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/place_down.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# @s = command block placed by "gm4_relocators:backwards_compatibility/place_down/replace_head" -# located at the command block (where the player head was) - -execute if block ~ ~ ~ command_block[facing=east] run setblock ~ ~ ~ dropper[facing=west] -execute if block ~ ~ ~ command_block[facing=west] run setblock ~ ~ ~ dropper[facing=east] -execute if block ~ ~ ~ command_block[facing=south] run setblock ~ ~ ~ dropper[facing=north] -execute if block ~ ~ ~ command_block[facing=north] run setblock ~ ~ ~ dropper[facing=south] -execute if block ~ ~ ~ command_block[facing=down] run setblock ~ ~ ~ dropper[facing=up] - -data merge block ~ ~ ~ {CustomName:{"translate":"container.gm4.enchantment_extractor","fallback":"Enchantment Extractor"}} -summon armor_stand ~ ~-1.2 ~ {CustomName:"GM4 Enchantment Extractor",Invisible:1b,Invulnerable:1b,Marker:1b,NoGravity:1b,Tags:["gm4_enchantment_extractor","gm4_no_edit"],equipment:{head:{id:"minecraft:enchanting_table",count:1,components:{"minecraft:custom_model_data":"block/enchantment_extractor"}}},DisabledSlots:2039583} -playsound entity.experience_orb.pickup master @a[distance=..5] ~ ~ ~ 1 0.7 1 diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/place_down_check.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/place_down_check.mcfunction deleted file mode 100644 index ff73df2bde..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/place_down_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = player who placed the block -# located at the center of the block to be placed -# run from #gm4_relocators:place_down_check - -execute if score $placed_block gm4_rl_data matches 0 if score gm4_enchantment_extractors load.status matches 2 if data storage gm4_relocators:temp gm4_relocation{custom_block:"gm4_enchantment_extractor"} run function gm4_enchantment_extractors:relocate/summon_block_markers diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/set_pick_up_data.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/set_pick_up_data.mcfunction deleted file mode 100644 index 88a3cf2e74..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/set_pick_up_data.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# sets the specific relocator data -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from gm4_enchantment_extractors:relocate/pick_up_check - -data modify storage gm4_relocators:temp merge_data set value {custom_block:"gm4_enchantment_extractor",lore:{"translate":"block.gm4.enchantment_extractor","fallback":"Enchantment Extractor","color":"gray","italic":true}} -data modify storage gm4_relocators:temp merge_data.entity_data.Rotation set from entity @s Rotation -execute positioned ~ ~-1.2 ~ run data modify storage gm4_relocators:temp merge_data.entity_data.equipment set from entity @e[type=armor_stand,tag=gm4_enchantment_extractor_stand,distance=..0.1,limit=1] equipment - -execute positioned ~ ~-1.2 ~ run kill @e[type=armor_stand,tag=gm4_enchantment_extractor_stand,limit=1,distance=..0.01] -kill @s -scoreboard players set $found_marker gm4_rl_data 1 diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/summon_block_markers.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/summon_block_markers.mcfunction deleted file mode 100644 index 2446799561..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/function/relocate/summon_block_markers.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -# summons the entities for this machine -# @s = player who placed the block -# located at the center of the block to be placed -# run from gm4_disassemblers:relocate/place_down_check - -scoreboard players set $placed_block gm4_rl_data 1 - -summon armor_stand ~ ~-1.2 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_enchantment_extractor_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_enchantment_extractor_stand",equipment:{head:{id:"minecraft:enchanting_table",count:1,components:{"minecraft:custom_model_data":"block/enchantment_extractor"}}},Rotation:[0.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_enchantment_extractor","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_enchantment_extractor",Rotation:[0.0f,0.0f]} - -execute as @e[tag=gm4_new_machine,distance=..2] run data modify entity @s Rotation set from storage gm4_relocators:temp gm4_relocation.entity_data.Rotation -execute as @e[tag=gm4_new_machine,distance=..2] at @s rotated as @e[type=marker,tag=gm4_new_machine,distance=..2,limit=1] run tp ~ ~ ~ -execute as @e[type=armor_stand,tag=gm4_new_machine,distance=..2] run data modify entity @s equipment set from storage gm4_relocators:temp gm4_relocation.entity_data.equipment -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 1 -tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/gm4_recipes/enchantment_extractor.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/gm4_recipes/enchantment_extractor.json deleted file mode 100644 index ed94353e7d..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/gm4_recipes/enchantment_extractor.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - " E ", - "GSG", - "CCC" - ], - "key": { - "E": { - "item": "minecraft:enchanting_table" - }, - "G": { - "item": "minecraft:gold_ingot" - }, - "S": { - "item": "minecraft:grindstone" - }, - "C": { - "item": "minecraft:cobblestone" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_enchantment_extractors:items/enchantment_extractor", - "count": 1 - } - } -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/guidebook/enchantment_extractors.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/guidebook/enchantment_extractors.json deleted file mode 100644 index 3110afb8ce..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/guidebook/enchantment_extractors.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "id": "enchantment_extractors", - "name": "Enchantment Extractors", - "module_type": "module", - "icon": { - "id": "minecraft:enchanting_table" - }, - "criteria": { - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, - "obtain_enchanting_table": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:enchanting_table" - ] - } - ] - } - }, - "obtain_enchantment_extractor": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:player_head" - ], - "predicates": { - "minecraft:custom_data": "{gm4_machines:{id:\"enchantment_extractor\"}}" - } - } - ] - } - }, - "open_enchantment_extractor": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.enchantment_extractor\",\"fallback\":\"Enchantment Extractor\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.enchantment_extractor\",\"fallback\":\"Enchantment Extractor\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.enchantment_extractor\",\"fallback\":\"Enchantment Extractor\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.enchantment_extractor\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.enchantment_extractor\",\"fallback\":\"Enchantment Extractor\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.enchantment_extractor\",\"fallback\":\"Enchantment Extractor\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.enchantment_extractors.description", - "fallback": "Enchantment Extractors are used to remove enchantments from tools, weapons, and armour." - } - ] - ] - }, - { - "name": "crafting", - "enable": [], - "requirements": [ - [ - "obtain_enchanting_table", - "obtain_enchantment_extractor" - ], - [ - "open_custom_crafter" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.enchantment_extractors.crafting", - "fallback": "An Enchantment Extractor can be crafted in a Custom Crafter:" - }, - "\n", - { - "insert": "recipe", - "recipe": "gm4_enchantment_extractors:enchantment_extractor" - } - ] - ] - }, - { - "name": "usage", - "enable": [], - "requirements": [ - [ - "obtain_enchantment_extractor", - "open_enchantment_extractor" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.enchantment extractors.unenchanting", - "fallback": "Placing enchanted items inside the enchantment extractor will unenchant it.\n\nWhen extracted, there is a chance to generate enchanted books containing those enchantments." - } - ], - [ - { - "translate": "text.gm4.guidebook.enchantment extractors.extraction", - "fallback": "The chance of extraction is lower for more powerful enchantments.\n\nSome high level enchants may become cursed with vanishing." - } - ], - [ - { - "translate": "text.gm4.guidebook.enchantment extractors.failed_extraction", - "fallback": "If an extraction fails, a puff of smoke or a congealed enchantment (Vex) will appear." - } - ] - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/crafting/enchantment_extractor.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/crafting/enchantment_extractor.json deleted file mode 100644 index b94ff758f4..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/crafting/enchantment_extractor.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:items/enchantment_extractor", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/items/enchantment_extractor.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/items/enchantment_extractor.json deleted file mode 100644 index d373953c08..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/items/enchantment_extractor.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "minecraft:player_head", - "functions": [ - { - "function": "set_components", - "components": { - "minecraft:custom_model_data": "item/enchantment_extractor", - "minecraft:profile": "$enchantment_extractor" - } - }, - { - "function": "set_custom_data", - "tag": "{gm4_machines:{id:'enchantment_extractor'}}" - }, - { - "function": "set_name", - "name": [ - { - "translate": "block.gm4.enchantment_extractor", - "fallback": "Enchantment Extractor", - "color": "white", - "italic": false - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/aqua_affinity.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/aqua_affinity.json deleted file mode 100644 index dcf9e77a91..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/aqua_affinity.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:aqua_affinity": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:aqua_affinity", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.4 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/bane_of_arthropods.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/bane_of_arthropods.json deleted file mode 100644 index 9806937d17..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/bane_of_arthropods.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:bane_of_arthropods": 5 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:bane_of_arthropods", - "levels": 5 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.55 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:bane_of_arthropods": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:bane_of_arthropods", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.65 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:bane_of_arthropods": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:bane_of_arthropods", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.75 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:bane_of_arthropods": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:bane_of_arthropods", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.85 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:bane_of_arthropods": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:bane_of_arthropods", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.95 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/binding_curse.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/binding_curse.json deleted file mode 100644 index 320e6d420b..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/binding_curse.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:binding_curse": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:binding_curse", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.1 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/blast_protection.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/blast_protection.json deleted file mode 100644 index f50e9ce04c..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/blast_protection.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:blast_protection": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:blast_protection", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:blast_protection": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:blast_protection", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.65 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:blast_protection": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:blast_protection", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:blast_protection": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:blast_protection", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.95 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/breach.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/breach.json deleted file mode 100644 index afd02cf14e..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/breach.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:breach": 4, - "minecraft:vanishing_curse": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:breach", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.03 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:breach": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:breach", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.32 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:breach": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:breach", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:breach": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:breach", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:breach": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:breach", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.85 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/channeling.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/channeling.json deleted file mode 100644 index 728b433e5c..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/channeling.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:channeling": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:channeling", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.2 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/check.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/check.json deleted file mode 100644 index e953632b58..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/check.json +++ /dev/null @@ -1,948 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/protection", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:protection" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/fire_protection", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fire_protection" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/blast_protection", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:blast_protection" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/projectile_protection", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:projectile_protection" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/feather_falling", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:feather_falling" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/respiration", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:respiration" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/aqua_affinity", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:aqua_affinity" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/thorns", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:thorns" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/depth_strider", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:depth_strider" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/frost_walker", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:frost_walker" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/soul_speed", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:soul_speed" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/binding_curse", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:binding_curse" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/sharpness", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sharpness" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/smite", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:smite" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/bane_of_arthropods", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:bane_of_arthropods" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/knockback", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:knockback" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/fire_aspect", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fire_aspect" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/looting", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:looting" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/sweeping", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sweeping_edge" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/efficiency", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:efficiency" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/silk_touch", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:silk_touch" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/fortune", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fortune" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/power", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:power" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/punch", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:punch" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/flame", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:flame" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/infinity", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:infinity" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/luck_of_the_sea", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:luck_of_the_sea" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/lure", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:lure" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/impaling", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:impaling" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/riptide", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:riptide" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/loyalty", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:loyalty" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/channeling", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:channeling" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/piercing", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:piercing" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/multishot", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:multishot" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/quick_charge", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:quick_charge" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/breach", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:breach" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/density", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:density" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/wind_burst", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:wind_burst" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/unbreaking", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:unbreaking" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/vanishing_curse", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:vanishing_curse" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/mending", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:mending" - } - ] - } - } - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/density.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/density.json deleted file mode 100644 index 8cbc983ceb..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/density.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:density": 5 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:density", - "levels": 5 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:density": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:density", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:density": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:density", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.6 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:density": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:density", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:density": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:density", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.95 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/depth_strider.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/depth_strider.json deleted file mode 100644 index c9ac42e6ef..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/depth_strider.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:depth_strider": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:depth_strider", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.25 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:depth_strider": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:depth_strider", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.6 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:depth_strider": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:depth_strider", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.85 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/efficiency.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/efficiency.json deleted file mode 100644 index d22f0a080b..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/efficiency.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:efficiency": 5, - "minecraft:vanishing_curse": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:efficiency", - "levels": 5 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.03 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:efficiency": 5 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:efficiency", - "levels": 5 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.17 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:efficiency": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:efficiency", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.6 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:efficiency": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:efficiency", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.75 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:efficiency": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:efficiency", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.85 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:efficiency": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:efficiency", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.95 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/feather_falling.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/feather_falling.json deleted file mode 100644 index 7cc33bf416..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/feather_falling.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:feather_falling": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:feather_falling", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.45 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:feather_falling": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:feather_falling", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.6 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:feather_falling": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:feather_falling", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.75 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:feather_falling": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:feather_falling", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.9 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/fire_aspect.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/fire_aspect.json deleted file mode 100644 index 2145cae172..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/fire_aspect.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:fire_aspect": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fire_aspect", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.35 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:fire_aspect": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fire_aspect", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.85 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/fire_protection.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/fire_protection.json deleted file mode 100644 index e635000e01..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/fire_protection.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:fire_protection": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fire_protection", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:fire_protection": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fire_protection", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.65 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:fire_protection": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fire_protection", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:fire_protection": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fire_protection", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.95 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/flame.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/flame.json deleted file mode 100644 index b4db801586..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/flame.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:flame": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:flame", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.15 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/fortune.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/fortune.json deleted file mode 100644 index ac5aee95ef..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/fortune.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:fortune": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fortune", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.05 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:fortune": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fortune", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:fortune": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fortune", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/frost_walker.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/frost_walker.json deleted file mode 100644 index ab2b1e9cdd..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/frost_walker.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:frost_walker": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:frost_walker", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.1 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:frost_walker": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:frost_walker", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/impaling.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/impaling.json deleted file mode 100644 index 69c24e577d..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/impaling.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:impaling": 5 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:impaling", - "levels": 5 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:impaling": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:impaling", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.65 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:impaling": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:impaling", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:impaling": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:impaling", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.9 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:impaling": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:impaling", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.95 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/infinity.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/infinity.json deleted file mode 100644 index f5f263eebc..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/infinity.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:infinity": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:infinity", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.15 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/knockback.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/knockback.json deleted file mode 100644 index e56ab45a0a..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/knockback.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:knockback": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:knockback", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.45 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:knockback": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:knockback", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.75 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/looting.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/looting.json deleted file mode 100644 index 377fa5e8f8..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/looting.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:looting": 3, - "minecraft:vanishing_curse": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:looting", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.03 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:looting": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:looting", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.37 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:looting": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:looting", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.55 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:looting": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:looting", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/loyalty.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/loyalty.json deleted file mode 100644 index e14498d496..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/loyalty.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:loyalty": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:loyalty", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.15 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:loyalty": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:loyalty", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.25 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:loyalty": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:loyalty", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.35 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/luck_of_the_sea.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/luck_of_the_sea.json deleted file mode 100644 index 5cf7f56b48..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/luck_of_the_sea.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:luck_of_the_sea": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:luck_of_the_sea", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.4 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:luck_of_the_sea": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:luck_of_the_sea", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.6 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:luck_of_the_sea": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:luck_of_the_sea", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/lure.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/lure.json deleted file mode 100644 index 4bc563b776..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/lure.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:lure": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:lure", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.35 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:lure": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:lure", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.65 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:lure": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:lure", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.75 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/mending.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/mending.json deleted file mode 100644 index ac7a476fce..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/mending.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:mending": 1, - "minecraft:vanishing_curse": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:mending", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.03 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:mending": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:mending", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.020000000000000004 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/multishot.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/multishot.json deleted file mode 100644 index 463e46d249..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/multishot.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:multishot": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:multishot", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/piercing.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/piercing.json deleted file mode 100644 index 90124420e8..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/piercing.json +++ /dev/null @@ -1,181 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:piercing": 4, - "minecraft:vanishing_curse": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:piercing", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.03 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:piercing": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:piercing", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.27 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:piercing": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:piercing", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:piercing": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:piercing", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:piercing": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:piercing", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.9 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/power.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/power.json deleted file mode 100644 index ec94f199e3..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/power.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:power": 5, - "minecraft:vanishing_curse": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:power", - "levels": 5 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.03 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:power": 5 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:power", - "levels": 5 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.22 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:power": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:power", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:power": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:power", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.4 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:power": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:power", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.45 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:power": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:power", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/projectile_protection.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/projectile_protection.json deleted file mode 100644 index c293166405..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/projectile_protection.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:projectile_protection": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:projectile_protection", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:projectile_protection": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:projectile_protection", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.65 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:projectile_protection": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:projectile_protection", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:projectile_protection": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:projectile_protection", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.95 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/protection.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/protection.json deleted file mode 100644 index 21acf5f5d9..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/protection.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:protection": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:protection", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:protection": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:protection", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.65 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:protection": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:protection", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:protection": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:protection", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.95 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/punch.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/punch.json deleted file mode 100644 index 3897b0217f..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/punch.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:punch": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:punch", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:punch": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:punch", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/quick_charge.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/quick_charge.json deleted file mode 100644 index 53b2bcd468..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/quick_charge.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:quick_charge": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:quick_charge", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.4 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:quick_charge": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:quick_charge", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.6 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:quick_charge": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:quick_charge", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/respiration.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/respiration.json deleted file mode 100644 index ba333ecb67..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/respiration.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:respiration": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:respiration", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:respiration": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:respiration", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:respiration": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:respiration", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.75 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/riptide.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/riptide.json deleted file mode 100644 index 70c744ef79..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/riptide.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:riptide": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:riptide", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:riptide": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:riptide", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:riptide": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:riptide", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/sharpness.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/sharpness.json deleted file mode 100644 index 6e52f562d1..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/sharpness.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:sharpness": 5, - "minecraft:vanishing_curse": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sharpness", - "levels": 5 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.03 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:sharpness": 5 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sharpness", - "levels": 5 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.27 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:sharpness": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sharpness", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:sharpness": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sharpness", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.6 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:sharpness": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sharpness", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:sharpness": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sharpness", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.95 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/silk_touch.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/silk_touch.json deleted file mode 100644 index f11a4c3f65..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/silk_touch.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:silk_touch": 1, - "minecraft:vanishing_curse": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:silk_touch", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.03 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:silk_touch": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:silk_touch", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.07 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/smite.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/smite.json deleted file mode 100644 index e665638f4d..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/smite.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:smite": 5 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:smite", - "levels": 5 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:smite": 4 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:smite", - "levels": 4 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:smite": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:smite", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.6 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:smite": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:smite", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:smite": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:smite", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.95 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/soul_speed.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/soul_speed.json deleted file mode 100644 index fd495fb281..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/soul_speed.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:soul_speed": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:soul_speed", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.15 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:soul_speed": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:soul_speed", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:soul_speed": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:soul_speed", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.4 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/sweeping.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/sweeping.json deleted file mode 100644 index 76e64c0cee..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/sweeping.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:sweeping_edge": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sweeping_edge", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:sweeping_edge": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sweeping_edge", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:sweeping_edge": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sweeping_edge", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/thorns.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/thorns.json deleted file mode 100644 index 6f182687cb..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/thorns.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:thorns": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:thorns", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.35 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:thorns": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:thorns", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.55 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:thorns": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:thorns", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/unbreaking.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/unbreaking.json deleted file mode 100644 index d511831d9d..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/unbreaking.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:unbreaking": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:unbreaking", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.25 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:unbreaking": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:unbreaking", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.55 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:unbreaking": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:unbreaking", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.9 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/vanishing_curse.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/vanishing_curse.json deleted file mode 100644 index 26d00299b1..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/vanishing_curse.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:vanishing_curse": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:vanishing_curse", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.08 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/wind_burst.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/wind_burst.json deleted file mode 100644 index 5314df596c..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/loot_table/technical/extract/wind_burst.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:wind_burst": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:wind_burst", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:wind_burst": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:wind_burst", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.5 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:wind_burst": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:wind_burst", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.7 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/predicate/failed_congealed_chance.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/predicate/failed_congealed_chance.json deleted file mode 100644 index 632efc263d..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/predicate/failed_congealed_chance.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "condition": "random_chance", - "chance": 0.5 -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/predicate/failed_smoke_chance.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/predicate/failed_smoke_chance.json deleted file mode 100644 index c72366e3eb..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/predicate/failed_smoke_chance.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "condition": "random_chance", - "chance": 0.8 -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/recipe/enchantment_extractor.json b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/recipe/enchantment_extractor.json deleted file mode 100644 index 79b87fddb1..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/recipe/enchantment_extractor.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "redstone", - "pattern": [ - " E ", - "GgG", - "CCC" - ], - "key": { - "E": "minecraft:enchanting_table", - "G": "minecraft:gold_ingot", - "g": "minecraft:grindstone", - "C": "minecraft:cobblestone" - }, - "result": { - "id": "minecraft:player_head", - "components": { - "minecraft:custom_model_data": "item/enchantment_extractor", - "minecraft:profile": "$enchantment_extractor", - "minecraft:custom_data": "{gm4_machines:{id:'enchantment_extractor'}}", - "minecraft:custom_name": {"translate":"block.gm4.enchantment_extractor","fallback":"Enchantment Extractor","color":"white","italic":false} - } - } -} diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/skins/enchantment_extractor.png b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/skins/enchantment_extractor.png deleted file mode 100644 index dd81cc10c9..0000000000 Binary files a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/skins/enchantment_extractor.png and /dev/null differ diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/test/craft.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/test/craft.mcfunction deleted file mode 100644 index 247235fd4c..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/test/craft.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.1 with minecraft:enchanting_table -item replace block ~1 ~1 ~1 container.3 with minecraft:gold_ingot -item replace block ~1 ~1 ~1 container.4 with minecraft:grindstone -item replace block ~1 ~1 ~1 container.5 with minecraft:gold_ingot -item replace block ~1 ~1 ~1 container.6 with minecraft:cobblestone -item replace block ~1 ~1 ~1 container.7 with minecraft:cobblestone -item replace block ~1 ~1 ~1 container.8 with minecraft:cobblestone - -await items block ~1 ~1 ~1 container.* minecraft:player_head[custom_data~{gm4_machines:{id:"enchantment_extractor"}}] diff --git a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/test/place.mcfunction b/gm4_enchantment_extractors/data/gm4_enchantment_extractors/test/place.mcfunction deleted file mode 100644 index 3001b5953b..0000000000 --- a/gm4_enchantment_extractors/data/gm4_enchantment_extractors/test/place.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @template gm4:test_platform -# @dummy ~ ~1 ~ - -loot give @s loot gm4_enchantment_extractors:items/enchantment_extractor -execute at @s run tp @s ~ ~ ~ facing ~1 ~-1.5 ~1 -dummy @s use block ~1 ~ ~1 - -assert block ~1 ~1 ~1 dropper -assert entity @e[tag=gm4_enchantment_extractor,distance=..3] diff --git a/gm4_enchantment_extractors/data/gm4_machines/tags/function/destroy.json b/gm4_enchantment_extractors/data/gm4_machines/tags/function/destroy.json deleted file mode 100644 index e611bdafdc..0000000000 --- a/gm4_enchantment_extractors/data/gm4_machines/tags/function/destroy.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_enchantment_extractors:machine/verify_destroy" - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_machines/tags/function/place_down.json b/gm4_enchantment_extractors/data/gm4_machines/tags/function/place_down.json deleted file mode 100644 index 5984ef9989..0000000000 --- a/gm4_enchantment_extractors/data/gm4_machines/tags/function/place_down.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_enchantment_extractors:machine/verify_place_down" - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_relocators/tags/function/pick_up_check.json b/gm4_enchantment_extractors/data/gm4_relocators/tags/function/pick_up_check.json deleted file mode 100644 index 24ce47ad2e..0000000000 --- a/gm4_enchantment_extractors/data/gm4_relocators/tags/function/pick_up_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_enchantment_extractors:relocate/pick_up_check" - ] -} diff --git a/gm4_enchantment_extractors/data/gm4_relocators/tags/function/place_down_check.json b/gm4_enchantment_extractors/data/gm4_relocators/tags/function/place_down_check.json deleted file mode 100644 index 35ba3c2806..0000000000 --- a/gm4_enchantment_extractors/data/gm4_relocators/tags/function/place_down_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_enchantment_extractors:relocate/place_down_check" - ] -} diff --git a/gm4_enchantment_extractors/pack.png b/gm4_enchantment_extractors/pack.png deleted file mode 100644 index 674d5b41b5..0000000000 Binary files a/gm4_enchantment_extractors/pack.png and /dev/null differ diff --git a/gm4_enchantment_extractors/pack.svg b/gm4_enchantment_extractors/pack.svg deleted file mode 100644 index b8422f4667..0000000000 --- a/gm4_enchantment_extractors/pack.svg +++ /dev/null @@ -1,702 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gm4_enchantment_extractors/since_94/data/gm4_enchantment_extractors/loot_table/technical/extract/check.json b/gm4_enchantment_extractors/since_94/data/gm4_enchantment_extractors/loot_table/technical/extract/check.json deleted file mode 100644 index a7418868a6..0000000000 --- a/gm4_enchantment_extractors/since_94/data/gm4_enchantment_extractors/loot_table/technical/extract/check.json +++ /dev/null @@ -1,971 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/protection", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:protection" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/fire_protection", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fire_protection" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/blast_protection", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:blast_protection" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/projectile_protection", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:projectile_protection" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/feather_falling", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:feather_falling" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/respiration", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:respiration" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/aqua_affinity", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:aqua_affinity" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/thorns", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:thorns" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/depth_strider", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:depth_strider" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/frost_walker", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:frost_walker" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/soul_speed", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:soul_speed" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/binding_curse", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:binding_curse" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/sharpness", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sharpness" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/smite", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:smite" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/bane_of_arthropods", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:bane_of_arthropods" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/knockback", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:knockback" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/fire_aspect", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fire_aspect" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/looting", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:looting" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/sweeping", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:sweeping_edge" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/efficiency", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:efficiency" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/silk_touch", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:silk_touch" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/fortune", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:fortune" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/power", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:power" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/punch", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:punch" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/flame", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:flame" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/infinity", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:infinity" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/luck_of_the_sea", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:luck_of_the_sea" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/lure", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:lure" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/impaling", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:impaling" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/riptide", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:riptide" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/loyalty", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:loyalty" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/channeling", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:channeling" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/piercing", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:piercing" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/multishot", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:multishot" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/quick_charge", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:quick_charge" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/breach", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:breach" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/density", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:density" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/wind_burst", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:wind_burst" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/unbreaking", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:unbreaking" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/vanishing_curse", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:vanishing_curse" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/mending", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:mending" - } - ] - } - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_enchantment_extractors:technical/extract/lunge", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:lunge" - } - ] - } - } - } - ] - } - ] - } - ] -} diff --git a/gm4_enchantment_extractors/since_94/data/gm4_enchantment_extractors/loot_table/technical/extract/lunge.json b/gm4_enchantment_extractors/since_94/data/gm4_enchantment_extractors/loot_table/technical/extract/lunge.json deleted file mode 100644 index a5578a09ce..0000000000 --- a/gm4_enchantment_extractors/since_94/data/gm4_enchantment_extractors/loot_table/technical/extract/lunge.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:lunge": 3 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:lunge", - "levels": 3 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.1 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:lunge": 2 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:lunge", - "levels": 2 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.3 - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:enchanted_book", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:stored_enchantments": { - "minecraft:lunge": 1 - } - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:lunge", - "levels": 1 - } - ] - } - } - }, - { - "condition": "minecraft:random_chance", - "chance": 0.8 - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_end_fishing/data/gm4/advancement/end_fishing.json b/gm4_end_fishing/data/gm4/advancement/end_fishing.json index 34477ddf6b..a1dc8ec327 100644 --- a/gm4_end_fishing/data/gm4/advancement/end_fishing.json +++ b/gm4_end_fishing/data/gm4/advancement/end_fishing.json @@ -3,7 +3,7 @@ "icon": { "id": "fishing_rod", "components": { - "minecraft:custom_model_data": "gui/advancement/end_fishing" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:gui/advancement/end_fishing"]} } }, "title": { diff --git a/gm4_end_fishing/data/gm4/advancement/end_fishing_phantom.json b/gm4_end_fishing/data/gm4/advancement/end_fishing_phantom.json index 8e145a9063..ee87257494 100644 --- a/gm4_end_fishing/data/gm4/advancement/end_fishing_phantom.json +++ b/gm4_end_fishing/data/gm4/advancement/end_fishing_phantom.json @@ -4,7 +4,7 @@ "id": "elytra", "components": { "minecraft:damage": 432, - "minecraft:custom_model_data": "gui/advancement/end_fishing_phantom" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:gui/advancement/end_fishing_phantom"]} } }, "title": { diff --git a/gm4_end_fishing/data/gm4/advancement/end_fishing_swords.json b/gm4_end_fishing/data/gm4/advancement/end_fishing_swords.json index 9583e416df..d05885f725 100644 --- a/gm4_end_fishing/data/gm4/advancement/end_fishing_swords.json +++ b/gm4_end_fishing/data/gm4/advancement/end_fishing_swords.json @@ -3,7 +3,7 @@ "icon": { "id": "diamond_sword", "components": { - "minecraft:custom_model_data": "gui/advancement/end_fishing_swords" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:gui/advancement/end_fishing_swords"]} } }, "title": { diff --git a/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/armor/generate.json b/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/armor/generate.json index 36bb25689c..7435795c11 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/armor/generate.json +++ b/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/armor/generate.json @@ -22,7 +22,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_armor_1" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_armor_1"]} } } ] @@ -46,7 +46,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_armor_2" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_armor_2"]} } } ] @@ -70,7 +70,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_armor_3" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_armor_3"]} } } ] @@ -94,7 +94,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_armor_4" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_armor_4"]} } } ] @@ -118,7 +118,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_armor_5" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_armor_5"]} } } ] @@ -148,7 +148,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_armor_6" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_armor_6"]} } } ] @@ -172,7 +172,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_armor_7" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_armor_7"]} } } ] @@ -196,7 +196,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_armor_8" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_armor_8"]} } } ] @@ -226,7 +226,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_armor_9" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_armor_9"]} } } ] @@ -256,7 +256,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_armor_10" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_armor_10"]} } } ] diff --git a/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/horse_armor/generate.json b/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/horse_armor/generate.json index 6e939c054e..a3493c98c1 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/horse_armor/generate.json +++ b/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/horse_armor/generate.json @@ -22,7 +22,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_horse_armor_1" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_horse_armor_1"]} } } ] @@ -52,7 +52,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_horse_armor_2" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_horse_armor_2"]} } } ] @@ -82,7 +82,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_horse_armor_3" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_horse_armor_3"]} } } ] @@ -106,7 +106,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_horse_armor_4" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_horse_armor_4"]} } } ] @@ -130,7 +130,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_horse_armor_5" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_horse_armor_5"]} } } ] diff --git a/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/ore/generate.json b/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/ore/generate.json index f10311c30b..2f0d501526 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/ore/generate.json +++ b/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/ore/generate.json @@ -22,7 +22,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_ore_1" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_ore_1"]} } } ] @@ -46,7 +46,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_ore_2" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_ore_2"]} } } ] @@ -70,7 +70,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_ore_3" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_ore_3"]} } } ] @@ -94,7 +94,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_ore_4" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_ore_4"]} } } ] @@ -118,7 +118,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_ore_5" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_ore_5"]} } } ] @@ -142,7 +142,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_ore_6" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_ore_6"]} } } ] diff --git a/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/sword/generate.json b/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/sword/generate.json index af4dc026de..9f3e6c7f10 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/sword/generate.json +++ b/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/sword/generate.json @@ -22,7 +22,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_1" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_1"]} } }, { @@ -56,7 +56,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_2" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_2"]} } }, { @@ -84,7 +84,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_3" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_3"]} } }, { @@ -112,7 +112,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_4" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_4"]} } }, { @@ -140,7 +140,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_5" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_5"]} } }, { @@ -168,7 +168,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_6" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_6"]} } }, { @@ -202,7 +202,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_7" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_7"]} } }, { @@ -230,7 +230,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_8" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_8"]} } }, { @@ -258,7 +258,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_9" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_9"]} } }, { @@ -286,7 +286,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_10" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_10"]} } }, { @@ -314,7 +314,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_11" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_11"]} } }, { @@ -348,7 +348,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_12" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_12"]} } }, { @@ -376,7 +376,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_13" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_13"]} } }, { @@ -410,7 +410,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_14" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_14"]} } }, { @@ -438,7 +438,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_15" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_15"]} } }, { @@ -466,7 +466,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_16" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_16"]} } }, { @@ -500,7 +500,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_17" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_17"]} } }, { @@ -528,7 +528,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_18" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_18"]} } }, { @@ -556,7 +556,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_19" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_19"]} } }, { @@ -584,7 +584,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_swords_20" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_swords_20"]} } }, { diff --git a/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/tool/generate.json b/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/tool/generate.json index f2fd6c511c..dba76cbbcb 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/tool/generate.json +++ b/gm4_end_fishing/data/gm4_end_fishing/loot_table/gameplay/fish/end_city_treasure/tool/generate.json @@ -28,7 +28,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_tools_1" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_tools_1"]} } } ] @@ -58,7 +58,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_tools_2" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_tools_2"]} } } ] @@ -82,7 +82,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_tools_3" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_tools_3"]} } } ] @@ -112,7 +112,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_tools_4" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_tools_4"]} } } ] @@ -136,7 +136,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_tools_5" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_tools_5"]} } } ] @@ -166,7 +166,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_tools_6" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_tools_6"]} } } ] @@ -190,7 +190,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_tools_7" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_tools_7"]} } } ] @@ -220,7 +220,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_tools_8" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_tools_8"]} } } ] @@ -244,7 +244,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_tools_9" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_tools_9"]} } } ] @@ -274,7 +274,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/end_city_tools_10" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/end_city_tools_10"]} } } ] diff --git a/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/captains_wings.json b/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/captains_wings.json index 3e5de10144..e88b5270a1 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/captains_wings.json +++ b/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/captains_wings.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/captains_wings" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/captains_wings"]} } }, { diff --git a/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/enderpuff.json b/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/enderpuff.json index 9eedae5de1..280c31698d 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/enderpuff.json +++ b/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/enderpuff.json @@ -9,17 +9,16 @@ "functions": [ { "function": "minecraft:set_name", - "entity": "this", + "target": "item_name", "name": { "translate": "item.gm4.enderpuff", - "fallback": "Enderpuff", - "italic": false + "fallback": "Enderpuff" } }, { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/enderpuff", + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/enderpuff"]}, "minecraft:profile": "$enderpuff", "minecraft:item_model": "minecraft:player_head", "!minecraft:consumable": {} diff --git a/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/ravaged_wings.json b/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/ravaged_wings.json index 46cfa4b71c..3a186e2625 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/ravaged_wings.json +++ b/gm4_end_fishing/data/gm4_end_fishing/loot_table/items/ravaged_wings.json @@ -10,15 +10,15 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/ravaged_wings" + "minecraft:custom_model_data": {"strings":["gm4_end_fishing:item/ravaged_wings"]} } }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.end_fishing.ravaged_wings", - "fallback": "Ravaged Wings", - "italic": false + "fallback": "Ravaged Wings" } }, { diff --git a/gm4_ender_hoppers/assets/translations.csv b/gm4_ender_hoppers/assets/translations.csv index 4734ba3d24..d26949f5fb 100644 --- a/gm4_ender_hoppers/assets/translations.csv +++ b/gm4_ender_hoppers/assets/translations.csv @@ -5,5 +5,5 @@ container.gm4.ender_hopper,Ender Hopper container.gm4.ender_hopper_minecart,Minecart with Ender Hopper text.gm4.guidebook.module_desc.ender_hoppers,Create special hoppers that teleport nearby items to them. text.gm4.guidebook.ender_hoppers.description,"Ender Hoppers teleport items to itself, even through walls.\n\nThey can also be combined with a minecart to create an Ender Hopper Minecart." -text.gm4.guidebook.ender_hoppers.crafting,Ender Hoppers can be crafted in a Custom Crafter: -text.gm4.guidebook.ender_hoppers.usage,"Ender Hoppers can pick up items in a range of 9x9 blocks, centered at itself and extending 3 blocks above itself.\n\nCombining a minecart with an ender hopper in a custom crafter yields an ender hopper minecart." +text.gm4.guidebook.ender_hoppers.crafting,Ender Hoppers can be crafted in a crafting table: +text.gm4.guidebook.ender_hoppers.usage,"Ender Hoppers can pick up items in a range of 9x9 blocks, centered at itself and extending 3 blocks above itself.\n\nCombining a minecart with an ender hopper yields an ender hopper minecart." diff --git a/gm4_ender_hoppers/beet.yaml b/gm4_ender_hoppers/beet.yaml index 007a9f506e..fcd8b69b3f 100644 --- a/gm4_ender_hoppers/beet.yaml +++ b/gm4_ender_hoppers/beet.yaml @@ -11,13 +11,11 @@ resource_pack: pipeline: - gm4.plugins.extend.module - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters meta: gm4: versioning: required: - lib_custom_crafters: 3.4.0 lib_machines: 1.4.0 schedule_loops: [main] model_data: @@ -50,7 +48,6 @@ meta: description: Create special hoppers that teleport nearby items to them. recommended: - gm4_resource_pack - - gm4_relocators - gm4_standard_crafting - gm4_enchantment_extractors - gm4_forming_press diff --git a/gm4_ender_hoppers/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_ender_hoppers/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 1fb1accb50..0000000000 --- a/gm4_ender_hoppers/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values":[ - "gm4_ender_hoppers:check_recipes" - ] - -} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/check_recipes.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/check_recipes.mcfunction deleted file mode 100644 index 90a5276eae..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/check_recipes.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# @s = custom crafter running recipes -# run from #gm4_custom_crafters:check_recipes - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 3 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:ender_eye"},{Slot:3b,id:"minecraft:respawn_anchor"},{Slot:6b,id:"minecraft:hopper"}]} run loot replace block ~ ~ ~ container.0 loot gm4_ender_hoppers:crafting/ender_hopper - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 2 if score $stack_size gm4_crafting matches 1 if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:player_head",components:{"minecraft:custom_data":{gm4_machines:{id:"ender_hopper"}}}},{id:"minecraft:minecart"}]} run loot replace block ~ ~ ~ container.0 loot gm4_ender_hoppers:crafting/ender_hopper_minecart diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/create_cart.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/create_cart.mcfunction index 2f66691a0a..0eb3e5dec5 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/create_cart.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/create_cart.mcfunction @@ -6,7 +6,7 @@ scoreboard players set $placed_block gm4_machine_data 1 # summon new hopper minecart -summon hopper_minecart ~ ~ ~ {Tags:["gm4_ender_hopper_minecart_new","gm4_new_machine"],Passengers:[{id:"minecraft:item_display",CustomName:"gm4_ender_hopper_display",Tags:["gm4_no_edit","gm4_ender_hopper_display","gm4_machine_cart","smithed.entity","smithed.strict","gm4_new_machine"],item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"block/ender_hopper_minecart","minecraft:profile":"$ender_hopper_display"}},item_display:"head",transformation:{scale:[0.83,0.83,0.83],right_rotation:[0,0,0,1],left_rotation:[0,0,0,1],translation:[0.0,0.7275,0.0]}}]} +summon hopper_minecart ~ ~ ~ {Tags:["gm4_ender_hopper_minecart_new","gm4_new_machine"],Passengers:[{id:"minecraft:item_display",CustomName:"gm4_ender_hopper_display",Tags:["gm4_no_edit","gm4_ender_hopper_display","gm4_machine_cart","smithed.entity","smithed.strict","gm4_new_machine"],item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_ender_hoppers:block/ender_hopper_minecart"]},"minecraft:profile":"$ender_hopper_display"}},item_display:"head",transformation:{scale:[0.83,0.83,0.83],right_rotation:[0,0,0,1],left_rotation:[0,0,0,1],translation:[0.0,0.7275,0.0]}}]} particle large_smoke ~ ~0.5 ~ 0.2 0.2 0.2 0 10 playsound minecraft:block.respawn_anchor.charge block @a[distance=..5] ~ ~ ~ 0.3 0.7 scoreboard players set @e[tag=gm4_new_machine,distance=..2] gm4_entity_version 1 diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/down.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/down.mcfunction index 72b7d2a065..f232887e2d 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/down.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/down.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ hopper[facing=down]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper"},[{"translate":"gui.gm4.ender_hopper","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"block/ender_hopper","minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]}} +summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_ender_hoppers:block/ender_hopper"]},"minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]}} summon marker ~ ~ ~ {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_ender_hopper",Rotation:[0.0f,0.0f]} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/east.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/east.mcfunction index 849d4a9207..ce22721f66 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/east.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/east.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ hopper[facing=east]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper"},[{"translate":"gui.gm4.ender_hopper","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"block/ender_hopper","minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]},Rotation:[-90.0f,0.0f]} +summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_ender_hoppers:block/ender_hopper"]},"minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]},Rotation:[-90.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_ender_hopper",Rotation:[-90.0f,0.0f]} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/north.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/north.mcfunction index b3d8a6f7d1..a5650657f1 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/north.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/north.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ hopper[facing=north]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper"},[{"translate":"gui.gm4.ender_hopper","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"block/ender_hopper","minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]},Rotation:[180.0f,0.0f]} +summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_ender_hoppers:block/ender_hopper"]},"minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]},Rotation:[180.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_ender_hopper",Rotation:[180.0f,0.0f]} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/south.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/south.mcfunction index f137d063ec..f650ad04ad 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/south.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/south.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ hopper[facing=south]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper"},[{"translate":"gui.gm4.ender_hopper","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"block/ender_hopper","minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]},Rotation:[0.0f,0.0f]} +summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_ender_hoppers:block/ender_hopper"]},"minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]},Rotation:[0.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_ender_hopper",Rotation:[0.0f,0.0f]} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/west.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/west.mcfunction index bc314f56d9..883fbdc41f 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/west.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/machine/rotate/west.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ hopper[facing=west]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper"},[{"translate":"gui.gm4.ender_hopper","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.ender_hopper","fallback":"Ender Hopper","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"block/ender_hopper","minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]},Rotation:[90.0f,0.0f]} +summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_ender_hoppers:block/ender_hopper"]},"minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]},Rotation:[90.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_ender_hopper",Rotation:[90.0f,0.0f]} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/pick_up_check.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/pick_up_check.mcfunction deleted file mode 100644 index ba7ab06160..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/pick_up_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from #gm4_relocators:pick_up_check - -execute if score gm4_ender_hoppers load.status matches 1.. if entity @s[tag=gm4_ender_hopper] run function gm4_ender_hoppers:relocate/set_pick_up_data diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/place_down_check.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/place_down_check.mcfunction deleted file mode 100644 index 497e9d862c..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/place_down_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = player who placed the block -# located at the center of the block to be placed -# run from #gm4_relocators:place_down_check - -execute if score $placed_block gm4_rl_data matches 0 if score gm4_ender_hoppers load.status matches 1 if data storage gm4_relocators:temp gm4_relocation{custom_block:"gm4_ender_hopper"} run function gm4_ender_hoppers:relocate/summon_block_markers diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/set_pick_up_data.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/set_pick_up_data.mcfunction deleted file mode 100644 index ad2173a5b5..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/set_pick_up_data.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# sets the specific relocator data -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from gm4_ender_hoppers:relocate/pick_up_check - -data modify storage gm4_relocators:temp merge_data set value {custom_block:"gm4_ender_hopper",lore:{"translate":"block.gm4.ender_hopper","fallback":"Ender Hopper","color":"gray","italic":true}} -data modify storage gm4_relocators:temp merge_data.entity_data.Rotation set from entity @s Rotation -data modify storage gm4_relocators:temp merge_data.entity_data.item set from entity @e[type=item_display,tag=gm4_ender_hopper_display,limit=1,distance=..0.01] item - -execute positioned ~ ~ ~ run kill @e[type=item_display,tag=gm4_ender_hopper_display,limit=1,distance=..0.01] -kill @s -scoreboard players set $found_marker gm4_rl_data 1 diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/summon_block_markers.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/summon_block_markers.mcfunction deleted file mode 100644 index 7c3a597d48..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/relocate/summon_block_markers.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -# summons the entities for this machine -# @s = player who placed the block -# located at the center of the block to be placed -# run from gm4_disassemblers:relocate/place_down_check - -scoreboard players set $placed_block gm4_rl_data 1 - -summon item_display ~ ~ ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"block/ender_hopper","minecraft:profile":"$ender_hopper_display"}},item_display:head,CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]}} -summon marker ~ ~ ~ {Tags:["gm4_ender_hopper","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_ender_hopper",Rotation:[0.0f,0.0f]} - -execute as @e[tag=gm4_new_machine,distance=..2] run data modify entity @s Rotation set from storage gm4_relocators:temp gm4_relocation.entity_data.Rotation -execute as @e[tag=gm4_new_machine,distance=..2] at @s rotated as @e[type=marker,tag=gm4_new_machine,distance=..2,limit=1] run tp ~ ~ ~ -execute as @e[type=item_display,tag=gm4_new_machine,distance=..2] run data modify entity @s item set from storage gm4_relocators:temp gm4_relocation.entity_data.item -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 2 -tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/upgrade_paths/1.5/block_upgrade.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/upgrade_paths/1.5/block_upgrade.mcfunction index 29c92f4619..e8a13463e5 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/upgrade_paths/1.5/block_upgrade.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/upgrade_paths/1.5/block_upgrade.mcfunction @@ -1,10 +1,10 @@ # run from upgrade_paths/1.5 # @s = ender hopper display armor stand to be replaced -summon item_display ~ ~0.5 ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"block/ender_hopper","minecraft:profile":"$ender_hopper_display"}},item_display:"head",CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]},Rotation:[0.0f,0.0f]} +summon item_display ~ ~0.5 ~ {item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_ender_hoppers:block/ender_hopper"]},"minecraft:profile":"$ender_hopper_display"}},item_display:"head",CustomName:"gm4_ender_hopper_display",Tags:["gm4_ender_hopper_display","smithed.entity","smithed.strict","gm4_new_machine"],transformation:{scale:[0.83,0.83,0.83],left_rotation:[0,0,0,1],right_rotation:[0,0,0,1],translation:[0.0,0.641,0.0]},Rotation:[0.0f,0.0f]} # side-facing hopper, set the right CMD -execute if items entity @s weapon.mainhand *[minecraft:custom_model_data={floats:[3420008]}] run data modify entity @e[type=item_display,limit=1,distance=..0.6,tag=gm4_new_machine] item.components."minecraft:custom_model_data" set value "block/ender_hopper_side" +execute if items entity @s weapon.mainhand *[minecraft:custom_model_data={floats:[3420008]}] run data modify entity @e[type=item_display,limit=1,distance=..0.6,tag=gm4_new_machine] item.components."minecraft:custom_model_data" set value {strings:["gm4_ender_hoppers:block/ender_hopper_side"]} data modify entity @e[type=item_display,limit=1,distance=..0.6,tag=gm4_new_machine] Rotation set from entity @s Rotation scoreboard players set @e[type=item_display,limit=1,distance=..0.6,tag=gm4_new_machine] gm4_entity_version 2 diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/upgrade_paths/1.5/minecart_upgrade.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/upgrade_paths/1.5/minecart_upgrade.mcfunction index 2106d95222..a7f100edee 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/function/upgrade_paths/1.5/minecart_upgrade.mcfunction +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/function/upgrade_paths/1.5/minecart_upgrade.mcfunction @@ -1,7 +1,7 @@ # run from upgrade_paths/1.5 # @s = existing ender hopper minecart (cart entity) -summon hopper_minecart ~ ~ ~ {Tags:["gm4_ender_hopper_minecart_new","gm4_new_machine"],Passengers:[{id:"minecraft:item_display",CustomName:"gm4_ender_hopper_display",Tags:["gm4_no_edit","gm4_ender_hopper_display","gm4_machine_cart","smithed.entity","smithed.strict","gm4_new_machine"],item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"block/ender_hopper_minecart","minecraft:profile":"$ender_hopper_display"}},item_display:"head",transformation:{scale:[0.83,0.83,0.83],right_rotation:[0,0,0,1],left_rotation:[0,0,0,1],translation:[0.0,0.7275,0.0]}}]} +summon hopper_minecart ~ ~ ~ {Tags:["gm4_ender_hopper_minecart_new","gm4_new_machine"],Passengers:[{id:"minecraft:item_display",CustomName:"gm4_ender_hopper_display",Tags:["gm4_no_edit","gm4_ender_hopper_display","gm4_machine_cart","smithed.entity","smithed.strict","gm4_new_machine"],item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_ender_hoppers:block/ender_hopper_minecart"]},"minecraft:profile":"$ender_hopper_display"}},item_display:"head",transformation:{scale:[0.83,0.83,0.83],right_rotation:[0,0,0,1],left_rotation:[0,0,0,1],translation:[0.0,0.7275,0.0]}}]} data modify entity @e[type=hopper_minecart,tag=gm4_ender_hopper_minecart_new,distance=..0.1,limit=1] {} merge from entity @s {} data merge entity @e[type=hopper_minecart,tag=gm4_ender_hopper_minecart_new,distance=..0.1,limit=1] {CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.ender_hopper_minecart","fallback":"Minecart with Ender Hopper"},[{"translate":"gui.gm4.ender_hopper_minecart","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.ender_hopper_minecart","fallback":"Minecart with Ender Hopper","font":"gm4:default","color":"#404040"}]]},Tags:["gm4_ender_hopper_minecart","gm4_machine_cart"]} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/gm4_recipes/ender_hopper.json b/gm4_ender_hoppers/data/gm4_ender_hoppers/gm4_recipes/ender_hopper.json deleted file mode 100644 index 2b7690f721..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/gm4_recipes/ender_hopper.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "E", - "R", - "H" - ], - "key": { - "E": { - "item": "minecraft:ender_eye" - }, - "R": { - "item": "minecraft:respawn_anchor" - }, - "H": { - "item": "minecraft:hopper" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_ender_hoppers:items/ender_hopper", - "count": 1 - } - } -} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/gm4_recipes/ender_hopper_minecart.json b/gm4_ender_hoppers/data/gm4_ender_hoppers/gm4_recipes/ender_hopper_minecart.json deleted file mode 100644 index 78edd2c8a2..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/gm4_recipes/ender_hopper_minecart.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "E", - "M" - ], - "key": { - "E": { - "item": "minecraft:player_head", - "components": {"minecraft:custom_data":{"gm4_machines":{"id":"ender_hopper"}}} - }, - "M": { - "item": "minecraft:minecart" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_ender_hoppers:items/ender_hopper_minecart", - "count": 1 - } - } -} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/guidebook/ender_hoppers.json b/gm4_ender_hoppers/data/gm4_ender_hoppers/guidebook/ender_hoppers.json index f6f745f282..e625ccef8e 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/guidebook/ender_hoppers.json +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/guidebook/ender_hoppers.json @@ -6,24 +6,6 @@ "id": "minecraft:ender_eye" }, "criteria": { - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, "obtain_ender_eye": { "trigger": "minecraft:inventory_changed", "conditions": { @@ -103,9 +85,6 @@ "name": "crafting", "enable": [], "requirements": [ - [ - "open_custom_crafter" - ], [ "obtain_ender_eye" ], @@ -117,7 +96,7 @@ [ { "translate": "text.gm4.guidebook.ender_hoppers.crafting", - "fallback": "Ender Hoppers can be crafted in a Custom Crafter:" + "fallback": "Ender Hoppers can be crafted in a crafting table:" }, "\n", { @@ -140,7 +119,7 @@ [ { "translate": "text.gm4.guidebook.ender_hoppers.usage", - "fallback": "Ender Hoppers can pick up items in a range of 9x9 blocks, centered at itself and extending 3 blocks above itself.\n\nCombining a minecart with an ender hopper in a custom crafter yields an ender hopper minecart." + "fallback": "Ender Hoppers can pick up items in a range of 9x9 blocks, centered at itself and extending 3 blocks above itself.\n\nCombining a minecart with an ender hopper yields an ender hopper minecart." } ] ] diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/crafting/ender_hopper.json b/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/crafting/ender_hopper.json deleted file mode 100644 index fc5aa8b188..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/crafting/ender_hopper.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_ender_hoppers:items/ender_hopper", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/crafting/ender_hopper_minecart.json b/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/crafting/ender_hopper_minecart.json deleted file mode 100644 index e53d6673ab..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/crafting/ender_hopper_minecart.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_ender_hoppers:items/ender_hopper_minecart", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/items/ender_hopper.json b/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/items/ender_hopper.json index f927501426..34a4e9640c 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/items/ender_hopper.json +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/items/ender_hopper.json @@ -11,7 +11,7 @@ { "function": "set_components", "components": { - "minecraft:custom_model_data": "item/ender_hopper", + "minecraft:custom_model_data": {"strings":["gm4_ender_hoppers:item/ender_hopper"]}, "minecraft:profile": "$ender_hopper" } }, diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/items/ender_hopper_minecart.json b/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/items/ender_hopper_minecart.json index d4bc516a61..ec82ae10e6 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/items/ender_hopper_minecart.json +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/loot_table/items/ender_hopper_minecart.json @@ -11,7 +11,7 @@ { "function": "set_components", "components": { - "minecraft:custom_model_data": "item/ender_hopper_minecart" + "minecraft:custom_model_data": {"strings":["gm4_ender_hoppers:item/ender_hopper_minecart"]} } }, { diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/recipe/ender_hopper.json b/gm4_ender_hoppers/data/gm4_ender_hoppers/recipe/ender_hopper.json index 0b3783bcc6..f0a069b106 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/recipe/ender_hopper.json +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/recipe/ender_hopper.json @@ -14,7 +14,7 @@ "result": { "id": "minecraft:player_head", "components": { - "minecraft:custom_model_data": "item/ender_hopper", + "minecraft:custom_model_data": {"strings":["gm4_ender_hoppers:item/ender_hopper"]}, "minecraft:profile": "$ender_hopper", "minecraft:custom_data": "{gm4_machines:{id:'ender_hopper'}}", "minecraft:custom_name": {"translate":"block.gm4.ender_hopper","fallback":"Ender Hopper","color":"white","italic":false} diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/recipe/ender_hopper_minecart.json b/gm4_ender_hoppers/data/gm4_ender_hoppers/recipe/ender_hopper_minecart.json index 7e47ffbf61..8036af790a 100644 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/recipe/ender_hopper_minecart.json +++ b/gm4_ender_hoppers/data/gm4_ender_hoppers/recipe/ender_hopper_minecart.json @@ -14,7 +14,7 @@ "result": { "id": "minecraft:hopper_minecart", "components": { - "minecraft:custom_model_data": "item/ender_hopper_minecart", + "minecraft:custom_model_data": {"strings":["gm4_ender_hoppers:item/ender_hopper_minecart"]}, "minecraft:custom_data": "{gm4_machines:{id:'ender_hopper_minecart'}}", "minecraft:custom_name": {"translate":"item.gm4.ender_hopper_minecart","fallback":"Minecart with Ender Hopper","color":"white","italic":false} } diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/test/craft.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/test/craft.mcfunction deleted file mode 100644 index a83056ac07..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/test/craft.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.1 with minecraft:ender_eye -item replace block ~1 ~1 ~1 container.4 with minecraft:respawn_anchor -item replace block ~1 ~1 ~1 container.7 with minecraft:hopper - -await items block ~1 ~1 ~1 container.* minecraft:player_head[count=1,custom_data~{gm4_machines:{id:"ender_hopper"}}] diff --git a/gm4_ender_hoppers/data/gm4_ender_hoppers/test/craft_minecart.mcfunction b/gm4_ender_hoppers/data/gm4_ender_hoppers/test/craft_minecart.mcfunction deleted file mode 100644 index 4fd69300ed..0000000000 --- a/gm4_ender_hoppers/data/gm4_ender_hoppers/test/craft_minecart.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.1 with minecraft:minecart -item replace block ~1 ~1 ~1 container.4 with minecraft:player_head[custom_data={gm4_machines:{id:"ender_hopper"}}] - -await items block ~1 ~1 ~1 container.* minecraft:hopper_minecart[count=1,custom_data~{gm4_machines:{id:"ender_hopper_minecart"}}] diff --git a/gm4_ender_hoppers/data/gm4_relocators/tags/function/pick_up_check.json b/gm4_ender_hoppers/data/gm4_relocators/tags/function/pick_up_check.json deleted file mode 100644 index 30aaf6d4f2..0000000000 --- a/gm4_ender_hoppers/data/gm4_relocators/tags/function/pick_up_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_ender_hoppers:relocate/pick_up_check" - ] -} diff --git a/gm4_ender_hoppers/data/gm4_relocators/tags/function/place_down_check.json b/gm4_ender_hoppers/data/gm4_relocators/tags/function/place_down_check.json deleted file mode 100644 index cb0cb66043..0000000000 --- a/gm4_ender_hoppers/data/gm4_relocators/tags/function/place_down_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_ender_hoppers:relocate/place_down_check" - ] -} diff --git a/gm4_enderman_support_class/README.md b/gm4_enderman_support_class/README.md deleted file mode 100644 index 89f1619ff2..0000000000 --- a/gm4_enderman_support_class/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Enderman Support Class - -Monsters in the presence of an Enderman now receive some extra buffs... - -### Features -- Monsters in a 25 block radius get a buff from the Enderman -- Specific hostile mobs have fixed effects, like Cave Spiders been given Jump Boost II - -More info on what effect each monster has applied can be read on the [Wiki](https://wiki.gm4.co/Enderman_Support_Class). diff --git a/gm4_enderman_support_class/assets/translations.csv b/gm4_enderman_support_class/assets/translations.csv deleted file mode 100644 index 5805b6e84a..0000000000 --- a/gm4_enderman_support_class/assets/translations.csv +++ /dev/null @@ -1,7 +0,0 @@ -key,en_us -advancement.gm4.enderman_support_class.title,Ender Aid -advancement.gm4.enderman_support_class.description,Come into contact with a support Enderman -text.gm4.guidebook.module_desc.enderman_support_class,This module allows Endermen to aid nearby hostiles in their fight against the player! -text.gm4.guidebook.enderman_support_class.description,"Endermen will buff nearby hostile mobs, giving them extra abilities.\n\nSome mobs get potion effects, while other mobs give effects when nearby." -text.gm4.guidebook.enderman_support_class.buffs,- Creepers get Regeneration II\n- Cave Spiders get Jump Boost II\n- Silverfish get Resistance II -text.gm4.guidebook.enderman_support_class.buffs_1,- Spiders get Jump Boost I\n-Zombies get Speed II\n-Skeletons give Weakness II\n- Shulkers give Blindness diff --git a/gm4_enderman_support_class/beet.yaml b/gm4_enderman_support_class/beet.yaml deleted file mode 100644 index 566dbb9cfc..0000000000 --- a/gm4_enderman_support_class/beet.yaml +++ /dev/null @@ -1,34 +0,0 @@ -id: gm4_enderman_support_class -name: Enderman Support Class -version: 1.7.X - -data_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - -meta: - gm4: - versioning: - schedule_loops: [main] - model_data: - - item: player_head - reference: gui/advancement/enderman_support_class - template: advancement - website: - description: This module allows Endermen to aid nearby hostiles in their fight against the player! - recommended: - - gm4_bat_grenades - notes: [] - modrinth: - project_id: Dhlwu1G6 - planetminecraft: - uid: 4297148 - video: https://www.youtube.com/watch?v=2hWZ4OKUaqI - wiki: https://wiki.gm4.co/wiki/Enderman_Support_Class - credits: - Creator: - - Sparks - Icon Design: - - DuckJr diff --git a/gm4_enderman_support_class/data/gm4/advancement/enderman_support_class.json b/gm4_enderman_support_class/data/gm4/advancement/enderman_support_class.json deleted file mode 100644 index 84309d4d09..0000000000 --- a/gm4_enderman_support_class/data/gm4/advancement/enderman_support_class.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "player_head", - "components": { - "minecraft:custom_model_data": "gui/advancement/enderman_support_class", - "minecraft:profile": "MHF_Enderman" - } - }, - "title": { - "translate": "advancement.gm4.enderman_support_class.title", - "fallback": "Ender Aid" - }, - "description": { - "translate": "advancement.gm4.enderman_support_class.description", - "fallback": "Come into contact with a support Enderman", - "color": "gray" - } - }, - "parent": "gm4:root", - "criteria": { - "contact_enderman": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_enderman_support_class/data/gm4_enderman_support_class/function/buff.mcfunction b/gm4_enderman_support_class/data/gm4_enderman_support_class/function/buff.mcfunction deleted file mode 100644 index d5da5d0ce7..0000000000 --- a/gm4_enderman_support_class/data/gm4_enderman_support_class/function/buff.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# @s = mob or player in range of an enderman - -# grant advancement to players nearby -advancement grant @s[type=player,gamemode=!spectator] only gm4:enderman_support_class - -# apply buff effect to entities in range -effect give @s[type=cave_spider] jump_boost 4 1 -effect give @s[type=creeper] regeneration 4 0 -effect give @s[type=silverfish] resistance 4 1 -effect give @s[type=spider] jump_boost 4 1 -effect give @s[type=zombie] speed 4 1 -execute at @s[type=skeleton] run effect give @a[gamemode=!spectator,gamemode=!creative,distance=..7] weakness 7 0 -execute at @s[type=shulker] run effect give @a[gamemode=!spectator,gamemode=!creative,distance=..7] blindness 3 9 - -# display particle effect -execute at @s[type=!player] run particle portal ~ ~.5 ~ 0.2 .5 0.2 .5 10 diff --git a/gm4_enderman_support_class/data/gm4_enderman_support_class/function/init.mcfunction b/gm4_enderman_support_class/data/gm4_enderman_support_class/function/init.mcfunction deleted file mode 100644 index e07b3e192e..0000000000 --- a/gm4_enderman_support_class/data/gm4_enderman_support_class/function/init.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -execute unless score enderman_support_class gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Enderman Support Class"} -execute unless score enderman_support_class gm4_earliest_version < enderman_support_class gm4_modules run scoreboard players operation enderman_support_class gm4_earliest_version = enderman_support_class gm4_modules -scoreboard players set enderman_support_class gm4_modules 1 - -schedule function gm4_enderman_support_class:main 1t - - - -#$moduleUpdateList diff --git a/gm4_enderman_support_class/data/gm4_enderman_support_class/function/main.mcfunction b/gm4_enderman_support_class/data/gm4_enderman_support_class/function/main.mcfunction deleted file mode 100644 index 9a6f66c6ff..0000000000 --- a/gm4_enderman_support_class/data/gm4_enderman_support_class/function/main.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# buff all mobs near an enderman -execute at @e[type=enderman,tag=!smithed.entity,tag=!gm4_no_esc] as @e[type=#gm4_enderman_support_class:affected,distance=..25,tag=!smithed.entity,tag=!gm4_no_esc] run function gm4_enderman_support_class:buff - -schedule function gm4_enderman_support_class:main 16t diff --git a/gm4_enderman_support_class/data/gm4_enderman_support_class/guidebook/enderman_support_class.json b/gm4_enderman_support_class/data/gm4_enderman_support_class/guidebook/enderman_support_class.json deleted file mode 100644 index 736efb27aa..0000000000 --- a/gm4_enderman_support_class/data/gm4_enderman_support_class/guidebook/enderman_support_class.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "id": "enderman_support_class", - "name": "Enderman Support Class", - "module_type": "module", - "icon": { - "id": "minecraft:player_head", - "components": { - "minecraft:profile": "MHF_Enderman" - } - }, - "criteria": { - "encounter_enderman": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type_specific": { - "type": "player", - "advancements": { - "gm4:enderman_support_class": true - } - } - } - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.enderman_support_class.description", - "fallback": "Endermen will buff nearby hostile mobs, giving them extra abilities.\n\nSome mobs get potion effects, while other mobs give effects when nearby." - } - ] - ] - }, - { - "name": "buffs", - "enable": [], - "requirements": [ - [ - "encounter_enderman" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.enderman_support_class.buffs", - "fallback": "- Creepers get Regeneration II\n- Cave Spiders get Jump Boost II\n- Silverfish get Resistance II" - } - ], - [ - { - "translate": "text.gm4.guidebook.enderman_support_class.buffs_1", - "fallback": "- Spiders get Jump Boost I\n-Zombies get Speed II\n-Skeletons give Weakness II\n- Shulkers give Blindness" - } - ] - ] - } - ] -} diff --git a/gm4_enderman_support_class/data/gm4_enderman_support_class/tags/entity_type/affected.json b/gm4_enderman_support_class/data/gm4_enderman_support_class/tags/entity_type/affected.json deleted file mode 100644 index 832b3bb5cd..0000000000 --- a/gm4_enderman_support_class/data/gm4_enderman_support_class/tags/entity_type/affected.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "values": [ - "minecraft:player", - "minecraft:zombie", - "minecraft:skeleton", - "minecraft:creeper", - "minecraft:spider", - "minecraft:silverfish", - "minecraft:cave_spider", - "minecraft:shulker" - ] -} diff --git a/gm4_enderman_support_class/data/gm4_enderman_support_class/test/creeper.mcfunction b/gm4_enderman_support_class/data/gm4_enderman_support_class/test/creeper.mcfunction deleted file mode 100644 index 89130ff417..0000000000 --- a/gm4_enderman_support_class/data/gm4_enderman_support_class/test/creeper.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# @template gm4:test_platform -# @batch gm4_midnight -# @beforebatch time set midnight -# @afterbatch time set noon -# @skyaccess - -summon enderman ~0.5 ~1 ~0.5 - -summon creeper ~2.5 ~1 ~2.5 - -await entity @e[type=creeper,distance=..5,nbt={active_effects:[{id:"minecraft:regeneration"}]}] diff --git a/gm4_enderman_support_class/pack.png b/gm4_enderman_support_class/pack.png deleted file mode 100644 index 6ebaa7212d..0000000000 Binary files a/gm4_enderman_support_class/pack.png and /dev/null differ diff --git a/gm4_enderman_support_class/pack.svg b/gm4_enderman_support_class/pack.svg deleted file mode 100644 index 13d32f5e95..0000000000 --- a/gm4_enderman_support_class/pack.svg +++ /dev/null @@ -1,403 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gm4_everstone/data/gm4/advancement/everstone.json b/gm4_everstone/data/gm4/advancement/everstone.json index 1caf34c191..3cf0795a20 100644 --- a/gm4_everstone/data/gm4/advancement/everstone.json +++ b/gm4_everstone/data/gm4/advancement/everstone.json @@ -3,7 +3,7 @@ "icon": { "id": "firework_star", "components": { - "minecraft:custom_model_data": "gui/advancement/everstones" + "minecraft:custom_model_data": {"strings":["gm4_everstone:gui/advancement/everstones"]} } }, "title": { diff --git a/gm4_everstone/data/gm4_everstone/guidebook/everstone.json b/gm4_everstone/data/gm4_everstone/guidebook/everstone.json index e17f7aa13d..bb47cb7798 100644 --- a/gm4_everstone/data/gm4_everstone/guidebook/everstone.json +++ b/gm4_everstone/data/gm4_everstone/guidebook/everstone.json @@ -19,6 +19,7 @@ "player": [ { "condition": "minecraft:time_check", + "clock": "minecraft:overworld", "value": { "min": 13000, "max": 24000 diff --git a/gm4_everstone/data/gm4_everstone/loot_table/everstone.json b/gm4_everstone/data/gm4_everstone/loot_table/everstone.json index f6bfb457d8..07aa6b193b 100644 --- a/gm4_everstone/data/gm4_everstone/loot_table/everstone.json +++ b/gm4_everstone/data/gm4_everstone/loot_table/everstone.json @@ -15,7 +15,7 @@ "function": "set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "item/everstone" + "minecraft:custom_model_data": {"strings":["gm4_everstone:item/everstone"]} } }, { @@ -24,10 +24,10 @@ }, { "function": "set_name", + "target": "item_name", "name": { "translate": "item.gm4.everstone", - "fallback": "Everstone", - "italic": false + "fallback": "Everstone" } } ] diff --git a/gm4_everstone/data/gm4_everstone/predicate/is_full_moon.json b/gm4_everstone/data/gm4_everstone/predicate/is_full_moon.json index 9b37ce3002..28cd068397 100644 --- a/gm4_everstone/data/gm4_everstone/predicate/is_full_moon.json +++ b/gm4_everstone/data/gm4_everstone/predicate/is_full_moon.json @@ -1,5 +1,6 @@ { "condition": "minecraft:time_check", + "clock": "minecraft:overworld", "value": { "min": 13000, "max": 24000 diff --git a/gm4_everstone/data/gm4_everstone/tags/entity_type/affected.json b/gm4_everstone/data/gm4_everstone/tags/entity_type/affected.json index 9011cdb62a..e13963c66a 100644 --- a/gm4_everstone/data/gm4_everstone/tags/entity_type/affected.json +++ b/gm4_everstone/data/gm4_everstone/tags/entity_type/affected.json @@ -9,13 +9,13 @@ "minecraft:donkey", "minecraft:fox", "minecraft:goat", - { "id": "minecraft:happy_ghast", "required": false }, + "minecraft:happy_ghast", "minecraft:hoglin", "minecraft:horse", "minecraft:llama", "minecraft:mooshroom", "minecraft:mule", - {"id": "minecraft:nautilus", "required": false}, + "minecraft:nautilus", "minecraft:ocelot", "minecraft:panda", "minecraft:pig", diff --git a/gm4_forming_press/README.md b/gm4_forming_press/README.md deleted file mode 100644 index 9c7851b5b1..0000000000 --- a/gm4_forming_press/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Forming Press - -Adds recipes for more efficient conversion - -### Features -- Adds a new crafter block to access more efficient recipes -- Adds Clay + Netherrack to Nether Brick recipe -- Allows Netherrack + Bucket to Lava Bucket recipe - -More info on what recipes are added can be read on the [Wiki](https://wiki.gm4.co/Forming_Press). diff --git a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_bottom.png b/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_bottom.png deleted file mode 100644 index 08cdd66a96..0000000000 Binary files a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_bottom.png and /dev/null differ diff --git a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_bottom_out.png b/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_bottom_out.png deleted file mode 100644 index e8ee5ab325..0000000000 Binary files a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_bottom_out.png and /dev/null differ diff --git a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_front.png b/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_front.png deleted file mode 100644 index e225e14747..0000000000 Binary files a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_front.png and /dev/null differ diff --git a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_side.png b/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_side.png deleted file mode 100644 index c26f507614..0000000000 Binary files a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_side.png and /dev/null differ diff --git a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_top.png b/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_top.png deleted file mode 100644 index e1dff00027..0000000000 Binary files a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_top.png and /dev/null differ diff --git a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_top_out.png b/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_top_out.png deleted file mode 100644 index 134252376b..0000000000 Binary files a/gm4_forming_press/assets/gm4_forming_press/textures/block/forming_press_top_out.png and /dev/null differ diff --git a/gm4_forming_press/assets/gm4_forming_press/textures/gui/container/forming_press.png b/gm4_forming_press/assets/gm4_forming_press/textures/gui/container/forming_press.png deleted file mode 100644 index 11c417779d..0000000000 Binary files a/gm4_forming_press/assets/gm4_forming_press/textures/gui/container/forming_press.png and /dev/null differ diff --git a/gm4_forming_press/assets/translations.csv b/gm4_forming_press/assets/translations.csv deleted file mode 100644 index 17410a2a2a..0000000000 --- a/gm4_forming_press/assets/translations.csv +++ /dev/null @@ -1,9 +0,0 @@ -key,en_us -container.gm4.forming_press,Forming Press -block.gm4.forming_press,Forming Press -block.gm4.charcoal_block,Block of Charcoal -text.gm4.guidebook.module_desc.forming_press,Create a Forming Press to unlock more efficient recipes for all types of brick and Charcoal. -text.gm4.guidebook.forming_press.description,"Forming Presses can process smelting and crafting operations, such as brick crafting, charcoal creation, and lava generation.\n\nThey can be crafted in a Custom Crafter." -text.gm4.guidebook.forming_press.doubling,The overall output of the Forming Press is approximately doubled compared to normal crafting operations. -text.gm4.guidebook.forming_press.crafting,A Forming Press can be crafted in a Custom Crafter: -text.gm4.guidebook.forming_press.recipes,The following recipes can be used in a Forming Press: diff --git a/gm4_forming_press/beet.yaml b/gm4_forming_press/beet.yaml deleted file mode 100644 index a7a2a8b38b..0000000000 --- a/gm4_forming_press/beet.yaml +++ /dev/null @@ -1,91 +0,0 @@ -id: gm4_forming_press -name: Forming Press -version: 1.6.X - -data_pack: - load: . - -resource_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters - -meta: - gm4: - versioning: - required: - lib_custom_crafters: 3.4.0 - lib_machines: 1.4.0 - schedule_loops: [main] - model_data: - - item: player_head - reference: item/forming_press - model: block/forming_press - - item: piston - template: block - transforms: - - name: item_display - origin: [0.5, 0.5, 0.5] - scale: [0.624, 0.624, 0.624] - rotation: [180, 0, 0] - translation: [0, -0.79, 0] - broadcast: - - reference: block/forming_press - textures: - front: block/forming_press_side - side: block/forming_press_side - top: block/forming_press_top_out - bottom: block/forming_press_bottom - - reference: block/forming_press_side - textures: - front: block/forming_press_front - side: block/forming_press_side - top: block/forming_press_top - bottom: block/forming_press_bottom - - reference: block/forming_press_down - textures: - front: block/forming_press_side - side: block/forming_press_side - top: block/forming_press_top - bottom: block/forming_press_bottom_out - - item: coal_block - reference: item/charcoal_block - template: vanilla - gui_fonts: - - translation: gui.gm4.forming_press - container: dropper - texture: gui/container/forming_press - website: - description: Create a Forming Press to unlock more efficient recipes for all types of brick and Charcoal. - recommended: - - gm4_resource_pack - - gm4_relocators - - gm4_standard_crafting - - gm4_ender_hoppers - - gm4_enchantment_extractors - - gm4_block_compressors - - gm4_disassemblers - - gm4_tunnel_bores - - gm4_boots_of_ostara - - gm4_heart_canisters - - gm4_smelteries - - gm4_liquid_tanks - notes: [] - modrinth: - project_id: LGXxY3vu - video: https://www.youtube.com/watch?v=ibtS4zAvglQ - wiki: https://wiki.gm4.co/wiki/Forming_Press - credits: - Creator: - - Bloo - Updated by: - - Misode - - BPR - - TheEpyonProject - Textures by: - - Kyrius - Icon Design: - - BPR diff --git a/gm4_forming_press/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_forming_press/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index a9b69e96da..0000000000 --- a/gm4_forming_press/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_forming_press:check_recipes" - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/advancement/recipes/forming_press.json b/gm4_forming_press/data/gm4_forming_press/advancement/recipes/forming_press.json deleted file mode 100644 index fb28c4a3b4..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/advancement/recipes/forming_press.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "gm4_forming_press:forming_press" - } - }, - "has_materials": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:cobblestone", - "minecraft:repeater", - "minecraft:piston", - "minecraft:furnace" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_materials" - ] - ], - "rewards": { - "recipes": [ - "gm4_forming_press:forming_press" - ] - } - } diff --git a/gm4_forming_press/data/gm4_forming_press/function/apply_multiplier.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/apply_multiplier.mcfunction deleted file mode 100644 index 95d4f11258..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/apply_multiplier.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# multiplies items by their specific multiplier -# @s = crafters containing a recipe result -# located at @s -# run from gm4_forming_press:finish_crafting - -# multiply items by their multiplier data -execute store result score $stack_multiplier gm4_crafting run data get storage gm4_forming_press:temp/output Items[-1].count -scoreboard players operation $new_stack_size gm4_crafting = $stack_size gm4_crafting -scoreboard players operation $new_stack_size gm4_crafting *= $stack_multiplier gm4_crafting -execute store result storage gm4_forming_press:temp/output Items[-1].count byte 1 run scoreboard players get $new_stack_size gm4_crafting - -# move modified item into new storage -data modify storage gm4_forming_press:temp/output NewItems append from storage gm4_forming_press:temp/output Items[-1] - -# loop for all items in the storage -data remove storage gm4_forming_press:temp/output Items[-1] -execute if data storage gm4_forming_press:temp/output Items[-1] run function gm4_forming_press:apply_multiplier diff --git a/gm4_forming_press/data/gm4_forming_press/function/attempt_craft.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/attempt_craft.mcfunction deleted file mode 100644 index 82e2e6d85a..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/attempt_craft.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# attempts to craft items -# @s = crafters containing a potential recipe -# located at @s -# run from gm4_forming_press:recipe_validity_check - -# check if any items in the crafter fall under any item tags -scoreboard players operation $loop gm4_crafting = $slot_count gm4_crafting -execute positioned ~ ~-0.4 ~ run function gm4_forming_press:check_item -data modify storage gm4_forming_press:temp/crafter Items set from storage gm4_forming_press:temp/crafter new_items -data remove storage gm4_forming_press:temp/crafter new_items - -# allow crafters with valid contents to run recipe checks -scoreboard players set $crafted gm4_crafting 0 -function #gm4_forming_press:check_recipes - -# check if one of the recipes succeeded -execute unless score $crafted gm4_crafting matches 0 run function gm4_forming_press:finish_crafting diff --git a/gm4_forming_press/data/gm4_forming_press/function/check_item.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/check_item.mcfunction deleted file mode 100644 index a7be304714..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/check_item.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# checks each slot for special item tags -# @s = crafters containing a potential recipe -# located at @s positioned ~ ~-0.4 ~ -# run from gm4_forming_press:attempt_craft - -# update item -data modify storage gm4_forming_press:temp/crafter item set from storage gm4_forming_press:temp/crafter Items[-1] - -data modify entity @e[type=armor_stand,tag=gm4_forming_press_stand,distance=..0.5,limit=1] equipment.mainhand set from storage gm4_forming_press:temp/crafter item -execute as @e[type=armor_stand,tag=gm4_forming_press_stand,distance=..0.5,limit=1] run function #gm4_forming_press:custom_item_checks -data remove entity @e[type=armor_stand,tag=gm4_forming_press_stand,distance=..0.5,limit=1] equipment.mainhand -data modify storage gm4_forming_press:temp/crafter new_items append from storage gm4_forming_press:temp/crafter item - -# clean up storage -data remove storage gm4_forming_press:temp/crafter item -data remove storage gm4_forming_press:temp/crafter Items[-1] - -# loop for all items -scoreboard players remove $loop gm4_crafting 1 -execute if score $loop gm4_crafting matches 1.. run function gm4_forming_press:check_item diff --git a/gm4_forming_press/data/gm4_forming_press/function/check_item_tags.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/check_item_tags.mcfunction deleted file mode 100644 index 250d21a1de..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/check_item_tags.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks each slot for item tags -# @s = crafter armor stand -# located at @s -# run from gm4_forming_press:check_item_tags_verify - -execute if predicate gm4_forming_press:vanilla_item_tags/logs_that_burn run data modify storage gm4_forming_press:temp/crafter item.item_tags.minecraft.logs_that_burn set value 1b diff --git a/gm4_forming_press/data/gm4_forming_press/function/check_item_tags_verify.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/check_item_tags_verify.mcfunction deleted file mode 100644 index b11564efba..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/check_item_tags_verify.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks each slot for item tags -# @s = crafter armor stand -# located at the center of the block -# run from gm4_forming_press:check_item via #gm4_forming_press:custom_item_checks - -execute if score gm4_forming_press load.status matches 1 if score gm4_forming_press_minor load.status matches 1.. run function gm4_forming_press:check_item_tags diff --git a/gm4_forming_press/data/gm4_forming_press/function/check_recipes.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/check_recipes.mcfunction deleted file mode 100644 index 2956c265e0..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/check_recipes.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# @s = custom crafter running recipes -# run from #gm4_custom_crafters:check_recipes - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 7 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:piston"},{Slot:3b,id:"minecraft:cobblestone"},{Slot:4b,id:"minecraft:comparator"},{Slot:5b,id:"minecraft:cobblestone"},{Slot:6b,id:"minecraft:cobblestone"},{Slot:7b,id:"minecraft:furnace"},{Slot:8b,id:"minecraft:cobblestone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/forming_press diff --git a/gm4_forming_press/data/gm4_forming_press/function/finish_crafting.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/finish_crafting.mcfunction deleted file mode 100644 index e7eaa0ccc8..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/finish_crafting.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# multiplies items by their specific multiplier -# @s = crafters containing a recipe result -# located at @s -# run from gm4_forming_press:recipe_validity_check - -# apply multiplier for all items -data modify storage gm4_forming_press:temp/output Items set from block ~ ~ ~ Items -function gm4_forming_press:apply_multiplier -# insert multiplied items into block -data modify block ~ ~ ~ Items set from storage gm4_forming_press:temp/output NewItems - -# clean up -data remove storage gm4_forming_press:temp/output NewItems diff --git a/gm4_forming_press/data/gm4_forming_press/function/init.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/init.mcfunction deleted file mode 100644 index 80f583e9c2..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/init.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -scoreboard objectives add gm4_crafting dummy - -execute unless score forming_press gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Forming Press"} -execute unless score forming_press gm4_earliest_version < forming_press gm4_modules run scoreboard players operation forming_press gm4_earliest_version = forming_press gm4_modules -scoreboard players set forming_press gm4_modules 1 - -schedule function gm4_forming_press:main 1t - - - -#$moduleUpdateList diff --git a/gm4_forming_press/data/gm4_forming_press/function/machine/create.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/machine/create.mcfunction deleted file mode 100644 index 01bd84894a..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/machine/create.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -# places the forming_press down -# @s = player who placed the forming_press -# located at the center of the placed block -# run from gm4_forming_press:machine/verify_place_down - -# place block depending on rotation -execute if score $rotation gm4_machine_data matches 1 run function gm4_forming_press:machine/rotate/down -execute if score $rotation gm4_machine_data matches 2 run function gm4_forming_press:machine/rotate/up -execute if score $rotation gm4_machine_data matches 3 run function gm4_forming_press:machine/rotate/south -execute if score $rotation gm4_machine_data matches 4 run function gm4_forming_press:machine/rotate/west -execute if score $rotation gm4_machine_data matches 5 run function gm4_forming_press:machine/rotate/north -execute if score $rotation gm4_machine_data matches 6 run function gm4_forming_press:machine/rotate/east - -# mark block as placed -playsound entity.blaze.hurt block @a[distance=..4] ~ ~ ~ 1 0.8 1 -scoreboard players set $placed_block gm4_machine_data 1 -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 1 -tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_forming_press/data/gm4_forming_press/function/machine/destroy.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/machine/destroy.mcfunction deleted file mode 100644 index b267b579e3..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/machine/destroy.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# destroys the forming_press -# @s = forming_press marker -# located at @s -# run from gm4_forming_press:machine/verify_destroy - -# kill entities related to machine block -execute positioned ~ ~-0.4 ~ run kill @e[type=armor_stand,tag=gm4_forming_press_stand,limit=1,distance=..0.01] -execute store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Age:0s,Item:{id:"minecraft:dropper",count:1,components:{}}},limit=1,sort=nearest] -kill @s - -# drop item (unless broken in creative mode) -particle minecraft:block{block_state:"minecraft:piston"} ~ ~ ~ .1 .25 .1 .05 30 normal @a -execute if score $dropped_item gm4_machine_data matches 1 run loot spawn ~ ~ ~ loot gm4_forming_press:items/forming_press diff --git a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/down.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/down.mcfunction deleted file mode 100644 index 21a3eb89b8..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/down.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the forming_press down based on rotation -# @s = player who placed the forming_press -# located at the center of the placed block -# run from gm4_forming_press:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=down]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.forming_press","fallback":"Forming Press"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:offscreen"},{"translate":"gui.gm4.forming_press","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_forming_press_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_forming_press_stand",equipment:{head:{id:"minecraft:piston",count:1,components:{"minecraft:custom_model_data":"block/forming_press_down"}}},Pose:{Head:[180f,0f,0f]},Rotation:[180.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_forming_press","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_forming_press",Rotation:[180.0f,0.0f]} diff --git a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/east.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/east.mcfunction deleted file mode 100644 index 55f3fc6d4d..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/east.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the forming_press down based on rotation -# @s = player who placed the forming_press -# located at the center of the placed block -# run from gm4_forming_press:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=east]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.forming_press","fallback":"Forming Press"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:offscreen"},{"translate":"gui.gm4.forming_press","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_forming_press_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_forming_press_stand",equipment:{head:{id:"minecraft:piston",count:1,components:{"minecraft:custom_model_data":"block/forming_press_side"}}},Pose:{Head:[180f,0f,0f]},Rotation:[-90.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_forming_press","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_forming_press",Rotation:[-90.0f,0.0f]} diff --git a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/north.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/north.mcfunction deleted file mode 100644 index 09dee58d4f..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/north.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the forming_press down based on rotation -# @s = player who placed the forming_press -# located at the center of the placed block -# run from gm4_forming_press:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=north]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.forming_press","fallback":"Forming Press"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:offscreen"},{"translate":"gui.gm4.forming_press","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_forming_press_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_forming_press_stand",equipment:{head:{id:"minecraft:piston",count:1,components:{"minecraft:custom_model_data":"block/forming_press_side"}}},Pose:{Head:[180f,0f,0f]},Rotation:[180.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_forming_press","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_forming_press",Rotation:[180.0f,0.0f]} diff --git a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/south.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/south.mcfunction deleted file mode 100644 index ca97d22eb7..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/south.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the forming_press down based on rotation -# @s = player who placed the forming_press -# located at the center of the placed block -# run from gm4_forming_press:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=south]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.forming_press","fallback":"Forming Press"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:offscreen"},{"translate":"gui.gm4.forming_press","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_forming_press_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_forming_press_stand",equipment:{head:{id:"minecraft:piston",count:1,components:{"minecraft:custom_model_data":"block/forming_press_side"}}},Pose:{Head:[180f,0f,0f]},Rotation:[0.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_forming_press","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_forming_press",Rotation:[0.0f,0.0f]} diff --git a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/up.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/up.mcfunction deleted file mode 100644 index de47528d36..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/up.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the forming_press down based on rotation -# @s = player who placed the forming_press -# located at the center of the placed block -# run from gm4_forming_press:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=up]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.forming_press","fallback":"Forming Press"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:offscreen"},{"translate":"gui.gm4.forming_press","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_forming_press_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_forming_press_stand",equipment:{head:{id:"minecraft:piston",count:1,components:{"minecraft:custom_model_data":"block/forming_press"}}},Pose:{Head:[180f,0f,0f]},Rotation:[0.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_forming_press","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_forming_press",Rotation:[0.0f,0.0f]} diff --git a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/west.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/west.mcfunction deleted file mode 100644 index c034f3901d..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/machine/rotate/west.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the forming_press down based on rotation -# @s = player who placed the forming_press -# located at the center of the placed block -# run from gm4_forming_press:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=west]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.forming_press","fallback":"Forming Press"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:offscreen"},{"translate":"gui.gm4.forming_press","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:half_invert"},{"translate":"container.gm4.forming_press","fallback":"Forming Press","font":"gm4:default","color":"#404040"}]]}} - -# summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_forming_press_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_forming_press_stand",equipment:{head:{id:"minecraft:piston",count:1,components:{"minecraft:custom_model_data":"block/forming_press_side"}}},Pose:{Head:[180f,0f,0f]},Rotation:[90.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_forming_press","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_forming_press",Rotation:[90.0f,0.0f]} diff --git a/gm4_forming_press/data/gm4_forming_press/function/machine/verify_destroy.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/machine/verify_destroy.mcfunction deleted file mode 100644 index 80bc209bde..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/machine/verify_destroy.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# verifies that the destroyed machine was from this module -# @s = machine block marker -# located at @s -# run from #gm4_machines:destroy - -execute if entity @s[tag=gm4_forming_press] run function gm4_forming_press:machine/destroy diff --git a/gm4_forming_press/data/gm4_forming_press/function/machine/verify_place_down.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/machine/verify_place_down.mcfunction deleted file mode 100644 index d128222b17..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/machine/verify_place_down.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# verifies that the placed down machine was from this module -# @s = player who placed down the machine -# located at the machine block marker (at the center of the placed down block) -# run from #gm4_machines:place_down - -execute if score $placed_block gm4_machine_data matches 0 if data storage gm4_machines:temp {id:"forming_press"} run function gm4_forming_press:machine/create diff --git a/gm4_forming_press/data/gm4_forming_press/function/main.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/main.mcfunction deleted file mode 100644 index 4e3c9bd99f..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/main.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# process machine -execute as @e[type=marker,tag=gm4_forming_press] at @s if block ~ ~ ~ dropper[triggered=false]{Items:[{}]} run function gm4_forming_press:recipe_validity_check - -schedule function gm4_forming_press:main 16t diff --git a/gm4_forming_press/data/gm4_forming_press/function/recipe_validity_check.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/recipe_validity_check.mcfunction deleted file mode 100644 index 6e185fedd9..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/recipe_validity_check.mcfunction +++ /dev/null @@ -1,47 +0,0 @@ -# checks for recipes in a forming press -# @s = gm4_forming press unless block ~ ~ ~ dropper{Items:[]} -# located at @s -# run from gm4_forming_press:main - -# store all block data into storage -data modify storage gm4_forming_press:temp/crafter Items set from block ~ ~ ~ Items - -# get number of full slots -execute store result score $slot_count gm4_crafting run data get storage gm4_forming_press:temp/crafter Items - -# get number of items from first array element -execute store result score $first_stack_size gm4_crafting run data get block ~ ~ ~ Items[0].count - -# check if each slot with an item in it has the same stack size -execute if score $slot_count gm4_crafting matches 2.. store result score $stack_size gm4_crafting run data get storage gm4_forming_press:temp/crafter Items[1].count -execute if score $slot_count gm4_crafting matches 2.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 3.. store result score $stack_size gm4_crafting run data get storage gm4_forming_press:temp/crafter Items[2].count -execute if score $slot_count gm4_crafting matches 3.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 4.. store result score $stack_size gm4_crafting run data get storage gm4_forming_press:temp/crafter Items[3].count -execute if score $slot_count gm4_crafting matches 4.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 5.. store result score $stack_size gm4_crafting run data get storage gm4_forming_press:temp/crafter Items[4].count -execute if score $slot_count gm4_crafting matches 5.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 6.. store result score $stack_size gm4_crafting run data get storage gm4_forming_press:temp/crafter Items[5].count -execute if score $slot_count gm4_crafting matches 6.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 7.. store result score $stack_size gm4_crafting run data get storage gm4_forming_press:temp/crafter Items[6].count -execute if score $slot_count gm4_crafting matches 7.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 8.. store result score $stack_size gm4_crafting run data get storage gm4_forming_press:temp/crafter Items[7].count -execute if score $slot_count gm4_crafting matches 8.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 9.. store result score $stack_size gm4_crafting run data get storage gm4_forming_press:temp/crafter Items[8].count -execute if score $slot_count gm4_crafting matches 9.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -scoreboard players operation $stack_size gm4_crafting = $first_stack_size gm4_crafting - -# attempt to craft items in crafters with valid contents -execute if score $stack_size gm4_crafting matches 1.. run function gm4_forming_press:attempt_craft - -# storage cleanup -data remove storage gm4_forming_press:temp/crafter Items -data remove storage gm4_forming_press:temp/output Items diff --git a/gm4_forming_press/data/gm4_forming_press/function/recipes/block_recipes.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/recipes/block_recipes.mcfunction deleted file mode 100644 index daa2fda231..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/recipes/block_recipes.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# run from gm4_forming_press:recipes/forming_check_recipes - -# logs to coal block -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..32 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,item_tags:{minecraft:{logs_that_burn:1b}}},{Slot:1b,item_tags:{minecraft:{logs_that_burn:1b}}},{Slot:2b,item_tags:{minecraft:{logs_that_burn:1b}}},{Slot:3b,item_tags:{minecraft:{logs_that_burn:1b}}},{Slot:4b,id:"minecraft:wheat"},{Slot:5b,item_tags:{minecraft:{logs_that_burn:1b}}},{Slot:6b,item_tags:{minecraft:{logs_that_burn:1b}}},{Slot:7b,item_tags:{minecraft:{logs_that_burn:1b}}},{Slot:8b,item_tags:{minecraft:{logs_that_burn:1b}}}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/charcoal_block - -# mud to packed mud -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..8 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:mud"},{Slot:1b,id:"minecraft:wheat"},{Slot:2b,id:"minecraft:mud"},{Slot:3b,id:"minecraft:wheat"},{Slot:4b,id:"minecraft:wheat"},{Slot:5b,id:"minecraft:wheat"},{Slot:6b,id:"minecraft:mud"},{Slot:7b,id:"minecraft:wheat"},{Slot:8b,id:"minecraft:mud"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/packed_mud -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..8 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:wheat"},{Slot:1b,id:"minecraft:mud"},{Slot:2b,id:"minecraft:wheat"},{Slot:3b,id:"minecraft:mud"},{Slot:4b,id:"minecraft:wheat"},{Slot:5b,id:"minecraft:mud"},{Slot:6b,id:"minecraft:wheat"},{Slot:7b,id:"minecraft:mud"},{Slot:8b,id:"minecraft:wheat"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/packed_mud diff --git a/gm4_forming_press/data/gm4_forming_press/function/recipes/brick_recipes.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/recipes/brick_recipes.mcfunction deleted file mode 100644 index 2803d55d4c..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/recipes/brick_recipes.mcfunction +++ /dev/null @@ -1,41 +0,0 @@ -# run from gm4_forming_press:recipes/forming_check_recipes - -# bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..16 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:clay_ball"},{Slot:1b,id:"minecraft:clay_ball"},{Slot:2b,id:"minecraft:clay_ball"},{Slot:3b,id:"minecraft:clay_ball"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:clay_ball"},{Slot:6b,id:"minecraft:clay_ball"},{Slot:7b,id:"minecraft:clay_ball"},{Slot:8b,id:"minecraft:clay_ball"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/bricks - -# stone bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..4 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:cobblestone"},{Slot:1b,id:"minecraft:cobblestone"},{Slot:2b,id:"minecraft:cobblestone"},{Slot:3b,id:"minecraft:cobblestone"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:cobblestone"},{Slot:6b,id:"minecraft:cobblestone"},{Slot:7b,id:"minecraft:cobblestone"},{Slot:8b,id:"minecraft:cobblestone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/stone_bricks - -# mud bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..4 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:mud"},{Slot:1b,id:"minecraft:mud"},{Slot:2b,id:"minecraft:mud"},{Slot:3b,id:"minecraft:mud"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:mud"},{Slot:6b,id:"minecraft:mud"},{Slot:7b,id:"minecraft:mud"},{Slot:8b,id:"minecraft:mud"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/mud_bricks - -# deepslate bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..4 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:cobbled_deepslate"},{Slot:1b,id:"minecraft:cobbled_deepslate"},{Slot:2b,id:"minecraft:cobbled_deepslate"},{Slot:3b,id:"minecraft:cobbled_deepslate"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:cobbled_deepslate"},{Slot:6b,id:"minecraft:cobbled_deepslate"},{Slot:7b,id:"minecraft:cobbled_deepslate"},{Slot:8b,id:"minecraft:cobbled_deepslate"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/deepslate_bricks - -# nether bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..16 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:netherrack"},{Slot:1b,id:"minecraft:netherrack"},{Slot:2b,id:"minecraft:netherrack"},{Slot:3b,id:"minecraft:netherrack"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:netherrack"},{Slot:6b,id:"minecraft:netherrack"},{Slot:7b,id:"minecraft:netherrack"},{Slot:8b,id:"minecraft:netherrack"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/nether_bricks - -# end stone bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..4 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:end_stone"},{Slot:1b,id:"minecraft:end_stone"},{Slot:2b,id:"minecraft:end_stone"},{Slot:3b,id:"minecraft:end_stone"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:end_stone"},{Slot:6b,id:"minecraft:end_stone"},{Slot:7b,id:"minecraft:end_stone"},{Slot:8b,id:"minecraft:end_stone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/end_stone_bricks - -# quartz bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..4 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:quartz_block"},{Slot:1b,id:"minecraft:quartz_block"},{Slot:2b,id:"minecraft:quartz_block"},{Slot:3b,id:"minecraft:quartz_block"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:quartz_block"},{Slot:6b,id:"minecraft:quartz_block"},{Slot:7b,id:"minecraft:quartz_block"},{Slot:8b,id:"minecraft:quartz_block"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/quartz_bricks - -# prismarine bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..16 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:prismarine_shard"},{Slot:1b,id:"minecraft:prismarine_shard"},{Slot:2b,id:"minecraft:prismarine_shard"},{Slot:3b,id:"minecraft:prismarine_shard"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:prismarine_shard"},{Slot:6b,id:"minecraft:prismarine_shard"},{Slot:7b,id:"minecraft:prismarine_shard"},{Slot:8b,id:"minecraft:prismarine_shard"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/prismarine_bricks - -# red nether bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..16 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:nether_wart"},{Slot:1b,id:"minecraft:netherrack"},{Slot:2b,id:"minecraft:nether_wart"},{Slot:3b,id:"minecraft:netherrack"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:netherrack"},{Slot:6b,id:"minecraft:nether_wart"},{Slot:7b,id:"minecraft:netherrack"},{Slot:8b,id:"minecraft:nether_wart"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/red_nether_bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..16 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:1b,id:"minecraft:nether_wart"},{Slot:0b,id:"minecraft:netherrack"},{Slot:3b,id:"minecraft:nether_wart"},{Slot:2b,id:"minecraft:netherrack"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:6b,id:"minecraft:netherrack"},{Slot:5b,id:"minecraft:nether_wart"},{Slot:8b,id:"minecraft:netherrack"},{Slot:7b,id:"minecraft:nether_wart"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/red_nether_bricks - -# polished blackstone bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..16 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:blackstone"},{Slot:1b,id:"minecraft:blackstone"},{Slot:2b,id:"minecraft:blackstone"},{Slot:3b,id:"minecraft:blackstone"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:blackstone"},{Slot:6b,id:"minecraft:blackstone"},{Slot:7b,id:"minecraft:blackstone"},{Slot:8b,id:"minecraft:blackstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/polished_blackstone_bricks - -# purpur block -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..4 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:chorus_fruit"},{Slot:1b,id:"minecraft:chorus_fruit"},{Slot:2b,id:"minecraft:chorus_fruit"},{Slot:3b,id:"minecraft:chorus_fruit"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:chorus_fruit"},{Slot:6b,id:"minecraft:chorus_fruit"},{Slot:7b,id:"minecraft:chorus_fruit"},{Slot:8b,id:"minecraft:chorus_fruit"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/purpur_block - -# tuff bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..4 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:tuff"},{Slot:1b,id:"minecraft:tuff"},{Slot:2b,id:"minecraft:tuff"},{Slot:3b,id:"minecraft:tuff"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:tuff"},{Slot:6b,id:"minecraft:tuff"},{Slot:7b,id:"minecraft:tuff"},{Slot:8b,id:"minecraft:tuff"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/tuff_bricks - -# resin bricks -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches ..4 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:resin_clump"},{Slot:1b,id:"minecraft:resin_clump"},{Slot:2b,id:"minecraft:resin_clump"},{Slot:3b,id:"minecraft:resin_clump"},{Slot:4b,id:"minecraft:clay_ball"},{Slot:5b,id:"minecraft:resin_clump"},{Slot:6b,id:"minecraft:resin_clump"},{Slot:7b,id:"minecraft:resin_clump"},{Slot:8b,id:"minecraft:resin_clump"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/resin_bricks diff --git a/gm4_forming_press/data/gm4_forming_press/function/recipes/check_recipes.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/recipes/check_recipes.mcfunction deleted file mode 100644 index 60e3de5184..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/recipes/check_recipes.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ - -# run forming press recipes, all forming press recipes fill all nine slots -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 9 run function gm4_forming_press:recipes/forming_check_recipes diff --git a/gm4_forming_press/data/gm4_forming_press/function/recipes/forming_check_recipes.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/recipes/forming_check_recipes.mcfunction deleted file mode 100644 index e3a7dd037f..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/recipes/forming_check_recipes.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# run from #gm4_forming_press:check_recipes - -# check for liquid recipes -execute if score $crafted gm4_crafting matches 0 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:4b,id:"minecraft:bucket"}]} run function gm4_forming_press:recipes/liquid_recipes - -# check for brick recipes -execute if score $crafted gm4_crafting matches 0 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:4b,id:"minecraft:clay_ball"}]} run function gm4_forming_press:recipes/brick_recipes - -# check for block -execute if score $crafted gm4_crafting matches 0 run function gm4_forming_press:recipes/block_recipes diff --git a/gm4_forming_press/data/gm4_forming_press/function/recipes/liquid_recipes.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/recipes/liquid_recipes.mcfunction deleted file mode 100644 index 1a7d81bfbb..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/recipes/liquid_recipes.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# run from gm4_forming_press:recipes/forming_check_recipes - -# netherrack to lava -execute store success score $crafted gm4_crafting if score $stack_size gm4_crafting matches 1 if data storage gm4_forming_press:temp/crafter {Items:[{Slot:0b,id:"minecraft:netherrack"},{Slot:1b,id:"minecraft:netherrack"},{Slot:2b,id:"minecraft:netherrack"},{Slot:3b,id:"minecraft:netherrack"},{Slot:4b,id:"minecraft:bucket"},{Slot:5b,id:"minecraft:netherrack"},{Slot:6b,id:"minecraft:netherrack"},{Slot:7b,id:"minecraft:netherrack"},{Slot:8b,id:"minecraft:netherrack"}]} run loot replace block ~ ~ ~ container.0 loot gm4_forming_press:crafting/lava_bucket diff --git a/gm4_forming_press/data/gm4_forming_press/function/relocate/pick_up_check.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/relocate/pick_up_check.mcfunction deleted file mode 100644 index 22a1b2ec91..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/relocate/pick_up_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from #gm4_relocators:pick_up_check - -execute if score gm4_forming_press load.status matches 1.. if entity @s[tag=gm4_forming_press] run function gm4_forming_press:relocate/set_pick_up_data diff --git a/gm4_forming_press/data/gm4_forming_press/function/relocate/place_down_check.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/relocate/place_down_check.mcfunction deleted file mode 100644 index d81f32132c..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/relocate/place_down_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = player who placed the block -# located at the center of the block to be placed -# run from #gm4_relocators:place_down_check - -execute if score $placed_block gm4_rl_data matches 0 if score gm4_forming_press load.status matches 1 if data storage gm4_relocators:temp gm4_relocation{custom_block:"gm4_forming_press"} run function gm4_forming_press:relocate/summon_block_markers diff --git a/gm4_forming_press/data/gm4_forming_press/function/relocate/set_pick_up_data.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/relocate/set_pick_up_data.mcfunction deleted file mode 100644 index d0285a0409..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/relocate/set_pick_up_data.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# sets the specific relocator data -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from gm4_forming_press:relocate/pick_up_check - -data modify storage gm4_relocators:temp merge_data set value {custom_block:"gm4_forming_press",lore:{"translate":"block.gm4.forming_press","fallback":"Forming Press","color":"gray","italic":true}} -data modify storage gm4_relocators:temp merge_data.entity_data.Rotation set from entity @s Rotation -data modify storage gm4_relocators:temp merge_data.entity_data.equipment set from entity @e[type=armor_stand,tag=gm4_forming_press_stand,distance=..0.5,limit=1] equipment - -execute positioned ~ ~-0.4 ~ run kill @e[type=armor_stand,tag=gm4_forming_press_stand,limit=1,distance=..0.01] -kill @s -scoreboard players set $found_marker gm4_rl_data 1 diff --git a/gm4_forming_press/data/gm4_forming_press/function/relocate/summon_block_markers.mcfunction b/gm4_forming_press/data/gm4_forming_press/function/relocate/summon_block_markers.mcfunction deleted file mode 100644 index 2a2ce57430..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/function/relocate/summon_block_markers.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -# summons the entities for this machine -# @s = player who placed the block -# located at the center of the block to be placed -# run from gm4_forming_press:relocate/place_down_check - -scoreboard players set $placed_block gm4_rl_data 1 - -summon armor_stand ~ ~-0.4 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_forming_press_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_forming_press_stand",equipment:{head:{id:"minecraft:piston",count:1,components:{"minecraft:custom_model_data":"block/forming_press"}}},Pose:{Head:[180f,0f,0f]},Rotation:[0.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_forming_press","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_forming_press",Rotation:[0.0f,0.0f]} - -execute as @e[tag=gm4_new_machine,distance=..2] run data modify entity @s Rotation set from storage gm4_relocators:temp gm4_relocation.entity_data.Rotation -execute as @e[tag=gm4_new_machine,distance=..2] at @s rotated as @e[type=marker,tag=gm4_new_machine,distance=..2,limit=1] run tp ~ ~ ~ -execute as @e[type=armor_stand,tag=gm4_new_machine,distance=..2] run data modify entity @s equipment set from storage gm4_relocators:temp gm4_relocation.entity_data.equipment -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 1 -tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/bricks.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/bricks.json deleted file mode 100644 index 8828bbd98a..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/bricks.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "CCC", - "CCC", - "CCC" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:bricks", - "count": 4 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/charcoal_block.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/charcoal_block.json deleted file mode 100644 index 8575d7e513..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/charcoal_block.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#C#", - "###" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "tag": "minecraft:logs" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_forming_press:items/charcoal_block", - "count": 2 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/deepslate_bricks.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/deepslate_bricks.json deleted file mode 100644 index ab70627de3..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/deepslate_bricks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#C#", - "###" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:cobbled_deepslate" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:deepslate_bricks", - "count": 16 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/end_stone_bricks.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/end_stone_bricks.json deleted file mode 100644 index e04242b533..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/end_stone_bricks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#C#", - "###" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:end_stone" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:end_stone_bricks", - "count": 16 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/forming_press.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/forming_press.json deleted file mode 100644 index b803ce4738..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/forming_press.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - " P ", - "CcC", - "CFC" - ], - "key": { - "P": { - "item": "minecraft:piston" - }, - "C": { - "item": "minecraft:cobblestone" - }, - "c": { - "item": "minecraft:comparator" - }, - "F": { - "item": "minecraft:furnace" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_forming_press:items/forming_press", - "count": 1 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/lava_bucket.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/lava_bucket.json deleted file mode 100644 index 5497d01944..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/lava_bucket.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#X#", - "###" - ], - "key": { - "X": { - "item": "minecraft:bucket" - }, - "#": { - "item": "minecraft:netherrack" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:lava_bucket", - "count": 1 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/mud_bricks.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/mud_bricks.json deleted file mode 100644 index 1a89c9c530..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/mud_bricks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#C#", - "###" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:mud" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:mud_bricks", - "count": 16 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/nether_bricks.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/nether_bricks.json deleted file mode 100644 index d94f0bf02f..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/nether_bricks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#C#", - "###" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:netherrack" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:nether_bricks", - "count": 4 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/packed_mud.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/packed_mud.json deleted file mode 100644 index c493aaedf8..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/packed_mud.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "X#X", - "#C#", - "X#X" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:mud" - }, - "X": { - "item": "minecraft:wheat" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:packed_mud", - "count": 8 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/packed_mud_alt.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/packed_mud_alt.json deleted file mode 100644 index 172d4cc953..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/packed_mud_alt.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "X#X", - "#C#", - "X#X" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "X": { - "item": "minecraft:mud" - }, - "#": { - "item": "minecraft:wheat" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:packed_mud", - "count": 8 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/polished_blackstone_bricks.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/polished_blackstone_bricks.json deleted file mode 100644 index b84564ca71..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/polished_blackstone_bricks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#C#", - "###" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:blackstone" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:polished_blackstone_bricks", - "count": 16 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/prismarine_bricks.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/prismarine_bricks.json deleted file mode 100644 index 20e37414b6..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/prismarine_bricks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#C#", - "###" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:prismarine_shard" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:prismarine_bricks", - "count": 2 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/purpur_block.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/purpur_block.json deleted file mode 100644 index 43af79d324..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/purpur_block.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#C#", - "###" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:chorus_fruit" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:purpur_block", - "count": 16 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/quartz_bricks.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/quartz_bricks.json deleted file mode 100644 index 50ebf38d2b..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/quartz_bricks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#C#", - "###" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:quartz" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:quartz_bricks", - "count": 16 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/red_nether_bricks.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/red_nether_bricks.json deleted file mode 100644 index d350d50729..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/red_nether_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "#X#", - "XCX", - "#X#" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:netherrack" - }, - "X": { - "item": "minecraft:nether_wart" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:red_nether_bricks", - "count": 4 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/red_nether_bricks_alt.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/red_nether_bricks_alt.json deleted file mode 100644 index 073454f66d..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/red_nether_bricks_alt.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "#X#", - "XCX", - "#X#" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "X": { - "item": "minecraft:netherrack" - }, - "#": { - "item": "minecraft:nether_wart" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:red_nether_bricks", - "count": 4 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/stone_bricks.json b/gm4_forming_press/data/gm4_forming_press/gm4_recipes/stone_bricks.json deleted file mode 100644 index 122949b9d9..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/gm4_recipes/stone_bricks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "forming_press", - "input": { - "type": "shaped", - "recipe": [ - "###", - "#C#", - "###" - ], - "key": { - "C": { - "item": "minecraft:clay_ball" - }, - "#": { - "item": "minecraft:cobblestone" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:stone_bricks", - "count": 16 - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/guidebook/forming_press.json b/gm4_forming_press/data/gm4_forming_press/guidebook/forming_press.json deleted file mode 100644 index a33ffd6e12..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/guidebook/forming_press.json +++ /dev/null @@ -1,376 +0,0 @@ -{ - "id": "forming_press", - "name": "Forming Press", - "module_type": "module", - "icon": { - "id": "minecraft:furnace" - }, - "criteria": { - "create_custom_crafter": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type_specific": { - "type": "player", - "advancements": { - "gm4:custom_crafters": true - } - } - } - } - ] - } - }, - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, - "obtain_furnace": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:furnace" - ] - } - ] - } - }, - "obtain_piston": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:piston" - ] - } - ] - } - }, - "open_forming_press": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.forming_press\",\"fallback\":\"Forming Press\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.forming_press\",\"fallback\":\"Forming Press\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.forming_press\",\"fallback\":\"Forming Press\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.forming_press\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.forming_press\",\"fallback\":\"Forming Press\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.forming_press\",\"fallback\":\"Forming Press\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, - "obtain_clay_ball": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:clay_ball" - ] - } - ] - } - }, - "obtain_wheat": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:wheat" - ] - } - ] - } - }, - "enter_nether": { - "trigger": "minecraft:location", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "location": { - "dimension": "minecraft:the_nether" - } - } - } - ] - } - }, - "enter_end": { - "trigger": "minecraft:location", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "location": { - "dimension": "minecraft:the_end" - } - } - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [ - [ - "create_custom_crafter" - ], - [ - "open_custom_crafter" - ] - ], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.forming_press.description", - "fallback": "Forming Presses can process smelting and crafting operations, such as brick crafting, charcoal creation, and lava generation.\n\nThey can be crafted in a Custom Crafter." - } - ], - [ - { - "translate": "text.gm4.guidebook.forming_press.doubling", - "fallback": "The overall output of the Forming Press is approximately doubled compared to normal crafting operations." - } - ] - ] - }, - { - "name": "crafting", - "enable": [], - "requirements": [ - [ - "obtain_furnace" - ], - [ - "obtain_piston" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.forming_press.crafting", - "fallback": "A Forming Press can be crafted in a Custom Crafter:" - }, - "\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:forming_press" - } - ] - ], - "prerequisites": [ - "description" - ] - }, - { - "name": "first_recipe", - "enable": [], - "requirements": [ - [ - "open_forming_press" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.forming_press.recipes", - "fallback": "The following recipes can be used in a Forming Press:" - }, - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:stone_bricks" - } - ] - ], - "grants": [ - "description" - ] - }, - { - "name": "overworld_brick_recipes", - "enable": [], - "requirements": [ - [ - "obtain_clay_ball" - ] - ], - "pages": [ - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:bricks" - } - ], - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:deepslate_bricks" - } - ], - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:polished_blackstone_bricks" - } - ], - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:mud_bricks" - } - ], - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:prismarine_bricks" - } - ] - ], - "prerequisites": [ - "first_recipe" - ] - }, - { - "name": "wheat_recipes", - "enable": [], - "requirements": [ - [ - "obtain_wheat" - ] - ], - "pages": [ - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:charcoal_block" - } - ], - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:packed_mud" - } - ] - ], - "prerequisites": [ - "first_recipe" - ] - }, - { - "name": "nether_recipes", - "enable": [], - "requirements": [ - [ - "enter_nether" - ] - ], - "pages": [ - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:lava_bucket" - } - ], - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:nether_bricks" - } - ], - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:red_nether_bricks" - } - ], - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:quartz_bricks" - } - ] - ], - "prerequisites": [ - "first_recipe" - ] - }, - { - "name": "end_recipes", - "enable": [], - "requirements": [ - [ - "enter_end" - ] - ], - "pages": [ - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:end_stone_bricks" - } - ], - [ - "\n\n", - { - "insert": "recipe", - "recipe": "gm4_forming_press:purpur_block" - } - ] - ], - "prerequisites": [ - "first_recipe" - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/bricks.json deleted file mode 100644 index 48452593db..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/charcoal_block.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/charcoal_block.json deleted file mode 100644 index 9bd38c64f6..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/charcoal_block.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_forming_press:items/charcoal_block", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/deepslate_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/deepslate_bricks.json deleted file mode 100644 index fe3e6746c6..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/deepslate_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:deepslate_bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 16 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/end_stone_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/end_stone_bricks.json deleted file mode 100644 index 1c7f66c16e..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/end_stone_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:end_stone_bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 16 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/forming_press.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/forming_press.json deleted file mode 100644 index 04c9fa0abb..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/forming_press.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_forming_press:items/forming_press", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/lava_bucket.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/lava_bucket.json deleted file mode 100644 index 0f41716e6d..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/lava_bucket.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:lava_bucket", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/mud_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/mud_bricks.json deleted file mode 100644 index 26581ffed4..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/mud_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:mud_bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 16 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/nether_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/nether_bricks.json deleted file mode 100644 index 61f01396fb..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/nether_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:nether_bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/packed_mud.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/packed_mud.json deleted file mode 100644 index 8dc9d0ef18..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/packed_mud.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:packed_mud", - "functions": [ - { - "function": "minecraft:set_count", - "count": 8 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/polished_blackstone_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/polished_blackstone_bricks.json deleted file mode 100644 index 438221c635..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/polished_blackstone_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:polished_blackstone_bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 16 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/prismarine_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/prismarine_bricks.json deleted file mode 100644 index f0e27b2819..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/prismarine_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:prismarine_bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/purpur_block.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/purpur_block.json deleted file mode 100644 index c28b3a1d99..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/purpur_block.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:purpur_block", - "functions": [ - { - "function": "minecraft:set_count", - "count": 16 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/quartz_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/quartz_bricks.json deleted file mode 100644 index 7e505d9e3f..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/quartz_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:quartz_bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 16 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/red_nether_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/red_nether_bricks.json deleted file mode 100644 index e9cf501e59..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/red_nether_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:red_nether_bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/resin_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/resin_bricks.json deleted file mode 100644 index 8f4e52909d..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/resin_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:resin_brick", - "functions": [ - { - "function": "minecraft:set_count", - "count": 16 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/stone_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/stone_bricks.json deleted file mode 100644 index e9a958a123..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/stone_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:stone_bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 16 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/tuff_bricks.json b/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/tuff_bricks.json deleted file mode 100644 index ca7e4f8a95..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/crafting/tuff_bricks.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:tuff_bricks", - "functions": [ - { - "function": "minecraft:set_count", - "count": 16 - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/items/charcoal_block.json b/gm4_forming_press/data/gm4_forming_press/loot_table/items/charcoal_block.json deleted file mode 100644 index c41f97505a..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/items/charcoal_block.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "minecraft:coal_block", - "functions": [ - { - "function": "set_components", - "components": { - "minecraft:custom_model_data": "item/charcoal_block" - } - }, - { - "function": "set_name", - "name": [ - { - "translate": "block.gm4.charcoal_block", - "fallback": "Block of Charcoal", - "italic": false - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/loot_table/items/forming_press.json b/gm4_forming_press/data/gm4_forming_press/loot_table/items/forming_press.json deleted file mode 100644 index 96187f511b..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/loot_table/items/forming_press.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "minecraft:player_head", - "functions": [ - { - "function": "set_components", - "components": { - "minecraft:custom_model_data": "item/forming_press", - "minecraft:profile": "$forming_press" - } - }, - { - "function": "set_custom_data", - "tag": "{gm4_machines:{id:'forming_press'}}" - }, - { - "function": "set_name", - "name": [ - { - "translate": "block.gm4.forming_press", - "fallback": "Forming Press", - "color": "white", - "italic": false - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/predicate/vanilla_item_tags/logs_that_burn.json b/gm4_forming_press/data/gm4_forming_press/predicate/vanilla_item_tags/logs_that_burn.json deleted file mode 100644 index c8ef6e9c35..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/predicate/vanilla_item_tags/logs_that_burn.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "items": "#minecraft:logs_that_burn" - } - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/recipe/forming_press.json b/gm4_forming_press/data/gm4_forming_press/recipe/forming_press.json deleted file mode 100644 index a37912b417..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/recipe/forming_press.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "pattern": [ - " P ", - "CcC", - "CFC" - ], - "key": { - "P": "minecraft:piston", - "C": "minecraft:cobblestone", - "c": "minecraft:comparator", - "F": "minecraft:furnace" - }, - "result": { - "id": "minecraft:player_head", - "components": { - "minecraft:custom_model_data": "item/forming_press", - "minecraft:profile": "$forming_press", - "minecraft:custom_data": "{gm4_machines:{id:'forming_press'}}", - "minecraft:custom_name": {"translate":"block.gm4.forming_press","fallback":"Forming Press","color":"white","italic":false} - } - } -} diff --git a/gm4_forming_press/data/gm4_forming_press/skins/forming_press.png b/gm4_forming_press/data/gm4_forming_press/skins/forming_press.png deleted file mode 100644 index 85e0ee434c..0000000000 Binary files a/gm4_forming_press/data/gm4_forming_press/skins/forming_press.png and /dev/null differ diff --git a/gm4_forming_press/data/gm4_forming_press/structure/test_platform.nbt b/gm4_forming_press/data/gm4_forming_press/structure/test_platform.nbt deleted file mode 100644 index 50d45ec883..0000000000 Binary files a/gm4_forming_press/data/gm4_forming_press/structure/test_platform.nbt and /dev/null differ diff --git a/gm4_forming_press/data/gm4_forming_press/tags/function/check_recipes.json b/gm4_forming_press/data/gm4_forming_press/tags/function/check_recipes.json deleted file mode 100644 index cbbc057144..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_forming_press:recipes/check_recipes" - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/tags/function/custom_item_checks.json b/gm4_forming_press/data/gm4_forming_press/tags/function/custom_item_checks.json deleted file mode 100644 index 50aa95ba47..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/tags/function/custom_item_checks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_forming_press:check_item_tags_verify" - ] -} diff --git a/gm4_forming_press/data/gm4_forming_press/test/craft.mcfunction b/gm4_forming_press/data/gm4_forming_press/test/craft.mcfunction deleted file mode 100644 index baa127353d..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/test/craft.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.1 with minecraft:piston -item replace block ~1 ~1 ~1 container.3 with minecraft:cobblestone -item replace block ~1 ~1 ~1 container.4 with minecraft:comparator -item replace block ~1 ~1 ~1 container.5 with minecraft:cobblestone -item replace block ~1 ~1 ~1 container.6 with minecraft:cobblestone -item replace block ~1 ~1 ~1 container.7 with minecraft:furnace -item replace block ~1 ~1 ~1 container.8 with minecraft:cobblestone - -await items block ~1 ~1 ~1 container.* minecraft:player_head[count=1,custom_data~{gm4_machines:{id:"forming_press"}}] diff --git a/gm4_forming_press/data/gm4_forming_press/test/place.mcfunction b/gm4_forming_press/data/gm4_forming_press/test/place.mcfunction deleted file mode 100644 index aa87dff01f..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/test/place.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @template gm4:test_platform -# @dummy ~ ~1 ~ - -loot give @s loot gm4_forming_press:items/forming_press -execute at @s run tp @s ~ ~ ~ facing ~1 ~-1.5 ~1 -dummy @s use block ~1 ~ ~1 - -assert block ~1 ~1 ~1 dropper -assert entity @e[tag=gm4_forming_press,distance=..3] diff --git a/gm4_forming_press/data/gm4_forming_press/test/recipes.mcfunction b/gm4_forming_press/data/gm4_forming_press/test/recipes.mcfunction deleted file mode 100644 index e100671b93..0000000000 --- a/gm4_forming_press/data/gm4_forming_press/test/recipes.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# @template gm4_forming_press:test_platform - -item replace block ~1 ~1 ~1 container.0 with minecraft:chorus_fruit 2 -item replace block ~1 ~1 ~1 container.1 with minecraft:chorus_fruit 2 -item replace block ~1 ~1 ~1 container.2 with minecraft:chorus_fruit 2 -item replace block ~1 ~1 ~1 container.3 with minecraft:chorus_fruit 2 -item replace block ~1 ~1 ~1 container.4 with minecraft:clay_ball 2 -item replace block ~1 ~1 ~1 container.5 with minecraft:chorus_fruit 2 -item replace block ~1 ~1 ~1 container.6 with minecraft:chorus_fruit 2 -item replace block ~1 ~1 ~1 container.7 with minecraft:chorus_fruit 2 -item replace block ~1 ~1 ~1 container.8 with minecraft:chorus_fruit 2 - -await items block ~1 ~1 ~1 container.* minecraft:purpur_block[count=32] diff --git a/gm4_forming_press/data/gm4_machines/tags/function/destroy.json b/gm4_forming_press/data/gm4_machines/tags/function/destroy.json deleted file mode 100644 index 002434ed70..0000000000 --- a/gm4_forming_press/data/gm4_machines/tags/function/destroy.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_forming_press:machine/verify_destroy" - ] -} diff --git a/gm4_forming_press/data/gm4_machines/tags/function/place_down.json b/gm4_forming_press/data/gm4_machines/tags/function/place_down.json deleted file mode 100644 index 5083cd9613..0000000000 --- a/gm4_forming_press/data/gm4_machines/tags/function/place_down.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_forming_press:machine/verify_place_down" - ] -} diff --git a/gm4_forming_press/data/gm4_relocators/tags/function/pick_up_check.json b/gm4_forming_press/data/gm4_relocators/tags/function/pick_up_check.json deleted file mode 100644 index 972cdbd412..0000000000 --- a/gm4_forming_press/data/gm4_relocators/tags/function/pick_up_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_forming_press:relocate/pick_up_check" - ] -} diff --git a/gm4_forming_press/data/gm4_relocators/tags/function/place_down_check.json b/gm4_forming_press/data/gm4_relocators/tags/function/place_down_check.json deleted file mode 100644 index a7cc9ab5ab..0000000000 --- a/gm4_forming_press/data/gm4_relocators/tags/function/place_down_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_forming_press:relocate/place_down_check" - ] -} diff --git a/gm4_forming_press/pack.png b/gm4_forming_press/pack.png deleted file mode 100644 index cf120ca98b..0000000000 Binary files a/gm4_forming_press/pack.png and /dev/null differ diff --git a/gm4_forming_press/pack.svg b/gm4_forming_press/pack.svg deleted file mode 100644 index 125a1e7bf8..0000000000 --- a/gm4_forming_press/pack.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gm4_fulcio_shamir/data/gm4_fulcio_shamir/loot_table/band.json b/gm4_fulcio_shamir/data/gm4_fulcio_shamir/loot_table/band.json index 0a3a2f98ab..3f5c249d6d 100644 --- a/gm4_fulcio_shamir/data/gm4_fulcio_shamir/loot_table/band.json +++ b/gm4_fulcio_shamir/data/gm4_fulcio_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/fulcio" + "minecraft:custom_model_data": {"strings":["gm4_fulcio_shamir:shamir/fulcio"]} } }, { diff --git a/gm4_guidebook/assets/translations.csv b/gm4_guidebook/assets/translations.csv index e436d241c4..4f8934d561 100644 --- a/gm4_guidebook/assets/translations.csv +++ b/gm4_guidebook/assets/translations.csv @@ -7,7 +7,6 @@ text.gm4.guidebook.open_wiki,Open the wiki page for this module text.gm4.guidebook.prev,Go to the previous module text.gm4.guidebook.refresh,Refresh section text.gm4.guidebook.return_to_toc,Return to the table of contents -text.gm4.guidebook.table_of_contents,Table of Contents text.gm4.guidebook.title,Gamemode 4 Guidebook text.gm4.guidebook.undiscovered,Undiscovered text.gm4.guidebook.introduction,Introduction diff --git a/gm4_guidebook/backport_64/assets/gm4/font/vanilla_items.json b/gm4_guidebook/backport_64/assets/gm4/font/vanilla_items.json deleted file mode 100644 index 6af758e542..0000000000 --- a/gm4_guidebook/backport_64/assets/gm4/font/vanilla_items.json +++ /dev/null @@ -1,7942 +0,0 @@ -{ - "providers": [ - { - "type": "bitmap", - "file": "minecraft:item/acacia_boat.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0903" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/acacia_door.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0904" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/acacia_sapling.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0905" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/acacia_sign.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0906" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/activator_rail.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0907" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/allium.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0908" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/amethyst_cluster.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0909" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/amethyst_shard.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u090a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/apple.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u090b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/armor_stand.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u090c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/arrow.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u090d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/axolotl_bucket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u090e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/azure_bluet.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u090f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/baked_potato.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0910" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bamboo.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0911" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/barrier.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0912" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/beef.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0913" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/beetroot.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0914" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/beetroot_seeds.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0915" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/beetroot_soup.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0916" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bell.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0917" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/birch_boat.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0916" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/birch_door.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0919" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/birch_sapling.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u091a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/birch_sign.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u091b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/black_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u091c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/black_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u091d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/black_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u091e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/blaze_powder.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u091f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/blaze_rod.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0920" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/blue_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0921" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/blue_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0922" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/blue_orchid.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0923" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/blue_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0924" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bone.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0925" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bone_meal.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0926" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/book.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0927" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bow.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0928" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bowl.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0929" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/brain_coral.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u092a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/brain_coral_fan.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u092b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bread.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u092c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/brewing_stand.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u092d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/brick.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u092e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/elytra_broken.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u092f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/brown_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0930" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/brown_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0931" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/brown_mushroom.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0932" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/brown_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0933" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/bubble_coral.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0934" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/bubble_coral_fan.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0935" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bucket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0936" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bundle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0937" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cake.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0939" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/campfire.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u093a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u093b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/carrot.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u093c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/carrot_on_a_stick.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u093d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cauldron.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u093e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chain.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u093f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chainmail_boots.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0940" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chainmail_chestplate.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0941" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chainmail_helmet.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0942" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chainmail_leggings.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0943" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/charcoal.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0944" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chest_minecart.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0945" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chicken.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0946" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chorus_fruit.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0947" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/clay_ball.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0948" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/clock_00.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0949" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/coal.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u094a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/cobweb.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u094b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cocoa_beans.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u094c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cod.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u094d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cod_bucket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u094e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/command_block_minecart.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u094f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/comparator.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0950" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/compass_16.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0951" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_beef.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0952" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_chicken.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0953" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_cod.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0954" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_mutton.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0955" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_porkchop.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0956" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_rabbit.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0957" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_salmon.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0958" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cookie.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0959" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/copper_ingot.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u095a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/cornflower.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u095b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/creeper_banner_pattern.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u095c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/crimson_door.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u095d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/crimson_fungus.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u095e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/crimson_roots.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u095f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/crimson_sign.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0960" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/crossbow_standby.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0961" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/crossbow_arrow.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0962" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/crossbow_firework.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0963" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cyan_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0964" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cyan_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0965" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/cyan_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0966" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dandelion.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0967" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/dark_oak_boat.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0968" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/dark_oak_door.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0969" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dark_oak_sapling.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u096a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/dark_oak_sign.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u096b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_brain_coral.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u096c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_brain_coral_fan.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u096d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_bubble_coral.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u096e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_bubble_coral_fan.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u096f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_bush.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0970" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_fire_coral.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0971" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_fire_coral_fan.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0972" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_horn_coral.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0973" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_horn_coral_fan.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0974" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_tube_coral.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0975" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_tube_coral_fan.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0976" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/detector_rail.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0977" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0978" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_axe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0979" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_boots.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u097a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_chestplate.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u097b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_helmet.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u097c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_hoe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u097d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_horse_armor.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u097e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_leggings.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u097f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_pickaxe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0980" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_shovel.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0981" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_sword.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0982" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/dragon_breath.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0983" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/dried_kelp.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0984" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/egg.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0985" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/elytra.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0986" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/emerald.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0987" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/enchanted_book.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0988" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/end_crystal.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0989" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/ender_eye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u098a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/ender_pearl.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u098b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/experience_bottle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u098c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/feather.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u098d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/fermented_spider_eye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u098e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/fern.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u098f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/filled_map.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0990" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/filled_map_markings.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0991" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/fire_charge.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0992" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/fire_coral.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0993" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/fire_coral_fan.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0994" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/firework_rocket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0995" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/firework_star.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0996" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/firework_star_overlay.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0997" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/fishing_rod.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0998" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/flint.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0999" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/flint_and_steel.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u099a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/flower_banner_pattern.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u099b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/flower_pot.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u099c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/furnace_minecart.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u099d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/ghast_tear.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u099e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glass_bottle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u099f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09a0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glistering_melon_slice.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09a1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/globe_banner_pattern.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09a2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glow_berries.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09a3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glow_ink_sac.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09a4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glow_item_frame.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09a5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/glow_lichen.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09a6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glowstone_dust.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09a7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/gold_ingot.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09a8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/gold_nugget.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09a9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_apple.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09aa" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_axe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ab" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_boots.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ac" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_carrot.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ad" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_chestplate.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ae" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_helmet.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09af" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_hoe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09b0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_horse_armor.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09b1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_leggings.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09b2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_pickaxe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09b3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_shovel.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09b4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_sword.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09b5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/gray_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09b7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/gray_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09b8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/gray_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09b9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/green_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ba" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/green_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09bb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/green_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09bc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/gunpowder.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09bd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/hanging_roots.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09be" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/heart_of_the_sea.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09bf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/honey_bottle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09c0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/honeycomb.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09c1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/hopper.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09c2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/hopper_minecart.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09c3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/horn_coral.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09c4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/horn_coral_fan.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09c5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/ink_sac.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09c6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_axe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09c7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/iron_bars.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09c8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_boots.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09c9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_chestplate.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ca" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_door.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09cb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_helmet.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09cc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_hoe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09cd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_horse_armor.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ce" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_ingot.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09cf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_leggings.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09d0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_nugget.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09d1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_pickaxe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09d2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_shovel.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09d3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_sword.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09d4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/item_frame.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09d5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/jungle_boat.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09d6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/jungle_door.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09d7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/jungle_sapling.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09d8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/jungle_sign.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09d9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/kelp.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09da" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/knowledge_book.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09db" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/ladder.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09dc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lantern.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09dd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lapis_lazuli.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09de" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/large_amethyst_bud.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09df" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/large_fern_top.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09e0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lava_bucket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09e1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lead.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09e2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09e3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_boots.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09e4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_boots_overlay.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09e5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_chestplate.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09e6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_chestplate_overlay.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09e7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_helmet.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09e8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_helmet_overlay.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09e9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_horse_armor.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ea" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_leggings.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09eb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_leggings_overlay.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ec" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/lever.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ed" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ee" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_00.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ef" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_01.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09f0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_02.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09f1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_03.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09f2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_04.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09f3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_05.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09f4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_06.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09f5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_07.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09f6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_08.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09f7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_09.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09f8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_10.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09f9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_11.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09fa" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_12.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09fb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_13.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09fc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_14.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09fd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_15.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09fe" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_blue_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u09ff" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_blue_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a00" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/light_blue_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a01" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_gray_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a02" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_gray_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a03" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/light_gray_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a04" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/lilac_top.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a05" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/lily_of_the_valley.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a06" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/lily_pad.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a07" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lime_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a08" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lime_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a09" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/lime_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a0a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lingering_potion.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a0b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/magenta_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a0c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/magenta_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a0d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/magenta_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a0e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/magma_cream.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a0f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/map.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a10" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/medium_amethyst_bud.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a11" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/melon_seeds.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a12" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/melon_slice.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a13" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/milk_bucket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a14" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/minecart.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a15" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/mojang_banner_pattern.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a16" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/mushroom_stew.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a17" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_11.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a16" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_13.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a19" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_blocks.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a1a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_cat.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a1b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_chirp.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a1c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_far.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a1d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_mall.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a1e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_mellohi.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a1f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_pigstep.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a20" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_stal.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a21" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_strad.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a22" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_wait.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a23" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_ward.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a24" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/mutton.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a25" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/name_tag.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a26" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/nautilus_shell.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a27" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/nether_brick.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a28" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/nether_sprouts.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a29" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/nether_star.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a2a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/nether_wart.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a2b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_axe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a2c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_boots.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a2d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_chestplate.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a2e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_helmet.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a2f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_hoe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a30" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_ingot.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a31" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_leggings.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a32" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_pickaxe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a33" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_scrap.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a34" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_shovel.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a35" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_sword.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a36" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/oak_boat.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a37" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/oak_door.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a38" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/oak_sapling.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a39" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/oak_sign.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a3a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/orange_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a3b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/orange_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a3c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/orange_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a3d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/orange_tulip.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a3e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/oxeye_daisy.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a3f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/painting.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a40" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/paper.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a41" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/peony_top.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a42" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/phantom_membrane.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a43" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/piglin_banner_pattern.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a44" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pink_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a45" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pink_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a46" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/pink_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a47" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/pink_tulip.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a48" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pointed_dripstone.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a49" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/poisonous_potato.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a4a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/popped_chorus_fruit.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a4b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/poppy.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a4c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/porkchop.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a4d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/potato.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a4e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/potion.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a4f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/potion_overlay.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a50" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/powder_snow_bucket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a51" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/powered_rail.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a52" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/prismarine_crystals.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a53" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/prismarine_shard.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a54" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pufferfish.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a55" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pufferfish_bucket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a56" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pumpkin_pie.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a57" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pumpkin_seeds.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a58" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/purple_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a59" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/purple_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a5a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/purple_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a5b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/quartz.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a5c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/rabbit.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a5d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/rabbit_foot.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a5e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/rabbit_hide.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a5f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/rabbit_stew.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a60" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/rail.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a61" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/raw_copper.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a62" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/raw_gold.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a63" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/raw_iron.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a64" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/red_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a65" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/red_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a66" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/red_mushroom.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a67" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/red_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a68" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/red_tulip.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a69" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/redstone.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a6a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/redstone_torch.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a6b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/repeater.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a6c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/rose_bush_top.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a6d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/rotten_flesh.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a6e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/saddle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a6f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/salmon.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a70" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/salmon_bucket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a71" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/turtle_scute.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a72" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/sea_pickle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a73" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/seagrass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a74" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/shears.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a75" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/shulker_shell.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a76" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/skull_banner_pattern.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a77" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/slime_ball.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a78" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/small_amethyst_bud.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a79" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/snowball.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a7a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/soul_campfire.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a7b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/soul_lantern.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a7c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/soul_torch.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a7d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spectral_arrow.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a80" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spider_eye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a81" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/splash_potion.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a82" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spruce_boat.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a83" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spruce_door.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a84" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/spruce_sapling.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a85" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spruce_sign.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a86" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spyglass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a87" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stick.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a88" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stone_axe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a89" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stone_hoe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a8a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stone_pickaxe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a8b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stone_shovel.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a8c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stone_sword.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a8d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/string.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a8e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/structure_void.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a8f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/sugar.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a90" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/sugar_cane.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a91" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/sunflower_front.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a92" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/suspicious_stew.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a93" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/sweet_berries.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a94" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/tall_grass_top.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a95" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tipped_arrow_base.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a96" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tipped_arrow_base.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a97" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tipped_arrow_head.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a98" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tnt_minecart.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a99" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/torch.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a9a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/totem_of_undying.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a9b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/trident.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a9c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/tripwire_hook.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a9d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tropical_fish.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a9e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tropical_fish_bucket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0a9f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/tube_coral.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aa0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/tube_coral_fan.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aa1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/turtle_egg.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aa2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/turtle_helmet.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aa3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/twisting_vines_plant.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aa4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/vine.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aa5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/warped_door.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aa6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/warped_fungus.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aa7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/warped_fungus_on_a_stick.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aa8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/warped_roots.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aa9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/warped_sign.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aaa" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/water_bucket.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aab" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/weeping_vines_plant.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aac" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wheat.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aad" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wheat_seeds.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aae" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/white_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aaf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/white_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0ab0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/white_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0ab1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/white_tulip.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0ab2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/wither_rose.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0ab3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wooden_axe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0ab4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wooden_hoe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0ab5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wooden_pickaxe.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0ab6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wooden_shovel.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0ab7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wooden_sword.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0ab8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/writable_book.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0ab9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/written_book.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0aba" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/yellow_candle.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0abb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/yellow_dye.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0abc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/yellow_stained_glass.png", - "ascent": -32768, - "height": -16, - "chars": [ - "\u0abd" - ] - }, - { - "type": "bitmap", - "file": "gm4_guidebook:font_magic/block_sheet.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ad7\u0ad8\u0ad9\u0ada\u0adb\u0adc\u0add\u0ade\u0adf\u0ae0\u0ae1\u0ae2\u0ae3\u0ae4\u0ae5\u0ae6\u0ae7\u0ae8\u0ae9\u0aea\u0aeb\u0aec\u0aed\u0aee\u0aef\u0af0\u0af1", - "\u0af2\u0af3\u0af4\u0af5\u0af6\u0af7\u0af8\u0af9\u0afa\u0afb\u0afc\u0afd\u0afe\u0aff\u0b00\u0b01\u0b02\u0b03\u0b04\u0b05\u0b06\u0b07\u0b08\u0b09\u0b0a\u0b0b\u0b0c", - "\u0b0d\u0b0e\u0b0f\u0b10\u0b11\u0b12\u0b13\u0b14\u0b15\u0b16\u0b17\u0b18\u0b19\u0b1a\u0b1b\u0b1c\u0b1d\u0b1e\u0b1f\u0b20\u0b21\u0b22\u0b23\u0b24\u0b25\u0b26\u0b27", - "\u0b28\u0b29\u0b2a\u0b2b\u0b2c\u0b2d\u0b2e\u0b2f\u0b30\u0b31\u0b32\u0b33\u0b34\u0b35\u0b36\u0b37\u0b38\u0b39\u0b3a\u0b3b\u0b3c\u0b3d\u0b3e\u0b3f\u0b40\u0b41\u0b42", - "\u0b43\u0b44\u0b45\u0b46\u0b47\u0b48\u0b49\u0b4a\u0b4b\u0b4c\u0b4d\u0b4e\u0b4f\u0b50\u0b51\u0b52\u0b53\u0b54\u0b55\u0b56\u0b57\u0b58\u0b59\u0b5a\u0b5b\u0b5c\u0b5d", - "\u0b5e\u0b5f\u0b60\u0b61\u0b62\u0b63\u0b64\u0b65\u0b66\u0b67\u0b68\u0b69\u0b6a\u0b6b\u0b6c\u0b6d\u0b6e\u0b6f\u0b70\u0b71\u0b72\u0b73\u0b74\u0b75\u0b76\u0b77\u0b78", - "\u0b79\u0b7a\u0b7b\u0b7c\u0b7d\u0b7e\u0b7f\u0b80\u0b81\u0b82\u0b83\u0b84\u0b85\u0b86\u0b87\u0b88\u0b89\u0b8a\u0b8b\u0b8c\u0b8d\u0b8e\u0b8f\u0b90\u0b91\u0b92\u0b93", - "\u0b94\u0b95\u0b96\u0b97\u0b98\u0b99\u0b9a\u0b9b\u0b9c\u0b9d\u0b9e\u0b9f\u0ba0\u0ba1\u0ba2\u0ba3\u0ba4\u0ba5\u0ba6\u0ba7\u0ba8\u0ba9\u0baa\u0bab\u0bac\u0bad\u0bae", - "\u0baf\u0bb0\u0bb1\u0bb2\u0bb3\u0bb4\u0bb5\u0bb6\u0bb7\u0bb8\u0bb9\u0bba\u0bbb\u0bbc\u0bbd\u0bbe\u0bbf\u0bc0\u0bc1\u0bc2\u0bc3\u0bc4\u0bc5\u0bc6\u0bc7\u0bc8\u0bc9", - "\u0bca\u0bcb\u0bcc\u0bcd\u0bce\u0bcf\u0bd0\u0bd1\u0bd2\u0bd3\u0bd4\u0bd5\u0bd6\u0bd7\u0bd8\u0bd9\u0bda\u0bdb\u0bdc\u0bdd\u0bde\u0bdf\u0be0\u0be1\u0be2\u0be3\u0be4", - "\u0be5\u0be6\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef\u0bf0\u0bf1\u0bf2\u0bf3\u0bf4\u0bf5\u0bf6\u0bf7\u0bf8\u0bf9\u0bfa\u0bfb\u0bfc\u0bfd\u0bfe\u0bff", - "\u0c00\u0c01\u0c02\u0c03\u0c04\u0c05\u0c06\u0c07\u0c08\u0c09\u0c0a\u0c0b\u0c0c\u0c0d\u0c0e\u0c0f\u0c10\u0c11\u0c12\u0c13\u0c14\u0c15\u0c16\u0c17\u0c18\u0c19\u0c1a", - "\u0c1b\u0c1c\u0c1d\u0c1e\u0c1f\u0c20\u0c21\u0c22\u0c23\u0c24\u0c25\u0c26\u0c27\u0c28\u0c29\u0c2a\u0c2b\u0c2c\u0c2d\u0c2e\u0c2f\u0c30\u0c31\u0c32\u0c33\u0c34\u0c35", - "\u0c36\u0c37\u0c38\u0c39\u0c3a\u0c3b\u0c3c\u0c3d\u0c3e\u0c3f\u0c40\u0c41\u0c42\u0c43\u0c44\u0c45\u0c46\u0c47\u0c48\u0c49\u0c4a\u0c4b\u0c4c\u0c4d\u0c4e\u0c4f\u0c50", - "\u0c51\u0c52\u0c53\u0c54\u0c55\u0c56\u0c57\u0c58\u0c59\u0c5a\u0c5b\u0c5c\u0c5d\u0c5e\u0c5f\u0c60\u0c61\u0c62\u0c63\u0c64\u0c65\u0c66\u0c67\u0c68\u0c69\u0c6a\u0c6b", - "\u0c6c\u0c6d\u0c6e\u0c6f\u0c70\u0c71\u0c72\u0c73\u0c74\u0c75\u0c76\u0c77\u0c78\u0c79\u0c7a\u0c7b\u0c7c\u0c7d\u0c7e\u0c7f\u0c80\u0c81\u0c82\u0c83\u0c84\u0c85\u0c86", - "\u0c87\u0c88\u0c89\u0c8a\u0c8b\u0c8c\u0c8d\u0c8e\u0c8f\u0c90\u0c91\u0c92\u0c93\u0c94\u0c95\u0c96\u0c97\u0c98\u0c99\u0c9a\u0c9b\u0c9c\u0c9d\u0c9e\u0c9f\u0ca0\u0ca1", - "\u0ca2\u0ca3\u0ca4\u0ca5\u0ca6\u0ca7\u0ca8\u0ca9\u0caa\u0cab\u0cac\u0cad\u0cae\u0caf\u0cb0\u0cb1\u0cb2\u0cb3\u0cb4\u0cb5\u0cb6\u0cb7\u0cb8\u0cb9\u0cba\u0cbb\u0cbc", - "\u0cbd\u0cbe\u0cbf\u0cc0\u0cc1\u0cc2\u0cc3\u0cc4\u0cc5\u0cc6\u0cc7\u0cc8\u0cc9\u0cca\u0ccb\u0ccc\u0ccd\u0cce\u0ccf\u0cd0\u0cd1\u0cd2\u0cd3\u0cd4\u0cd5\u0cd6\u0cd7", - "\u0cd8\u0cd9\u0cda\u0cdb\u0cdc\u0cdd\u0cde\u0cdf\u0ce0\u0ce1\u0ce2\u0ce3\u0ce4\u0ce5\u0ce6\u0ce7\u0ce8\u0ce9\u0cea\u0ceb\u0cec\u0ced\u0cee\u0cef\u0cf0\u0cf1\u0cf2", - "\u0cf3\u0cf4\u0cf5\u0cf6\u0cf7\u0cf8\u0cf9\u0cfa\u0cfb\u0cfc\u0cfd\u0cfe\u0cff\u0d00\u0d01\u0d02\u0d03\u0d04\u0d05\u0d06\u0d07\u0d08\u0d09\u0d0a\u0d0b\u0d0c\u0d0d", - "\u0d0e\u0d0f\u0d10\u0d11\u0d12\u0d13\u0d14\u0d15\u0d16\u0d17\u0d18\u0d19\u0d1a\u0d1b\u0d1c\u0d1d\u0d1e\u0d1f\u0d20\u0d21\u0d22\u0d23\u0d24\u0d25\u0d26\u0d27\u0d28", - "\u0d29\u0d2a\u0d2b\u0d2c\u0d2d\u0d2e\u0d2f\u0d30\u0d31\u0d32\u0d33\u0d34\u0d35\u0d36\u0d37\u0d38\u0d39\u0d3a\u0d3b\u0d3c\u0d3d\u0d3e\u0d3f\u0d40\u0d41\u0d42\u0d43", - "\u0d44\u0d45\u0d46\u0d47\u0d48\u0d49\u0d4a\u0d4b\u0d4c\u0d4d\u0d4e\u0d4f\u0d50\u0d51\u0d52\u0d53\u0d54\u0d55\u0d56\u0d57\u0d58\u0d59\u0d5a\u0d5b\u0d5c\u0d5d\u0d5e", - "\u0d5f\u0d60\u0d61\u0d62\u0d63\u0d64\u0d65\u0d66\u0d67\u0d68\u0d69\u0d6a\u0d6b\u0d6c\u0d6d\u0d6e\u0d6f\u0d70\u0d71\u0d72\u0d73\u0d74\u0d75\u0d76\u0d77\u0d78\u0d79", - "\u0d7a\u0d7b\u0d7c\u0d7d\u0d7e\u0d7f\u0d80\u0d81\u0d82\u0d83\u0d84\u0d85\u0d86\u0d87\u0d88\u0d89\u0d8a\u0d8b\u0d8c\u0d8d\u0d8e\u0d8f\u0d90\u0d91\u0000\u0000\u0000", - "\u4001\u4002\u4003\u4004\u4005\u4006\u4007\u4008\u4009\u4010\u4011\u4012\u4013\u4014\u4015\u4016\u4017\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/acacia_boat.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d92" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/acacia_door.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d93" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/acacia_sapling.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d94" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/acacia_sign.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d95" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/activator_rail.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d96" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/allium.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d97" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/amethyst_cluster.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d98" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/amethyst_shard.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d99" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/apple.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d9a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/armor_stand.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d9b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/arrow.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d9c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/axolotl_bucket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d9d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/azure_bluet.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d9e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/baked_potato.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0d9f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bamboo.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0da0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/barrier.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0da1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/beef.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0da2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/beetroot.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0da3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/beetroot_seeds.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0da4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/beetroot_soup.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0da5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bell.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0da6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/birch_boat.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0da7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/birch_door.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0da8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/birch_sapling.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0da9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/birch_sign.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0daa" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/black_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dab" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/black_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dac" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/black_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dad" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/blaze_powder.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dae" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/blaze_rod.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0daf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/blue_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0db0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/blue_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0db1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/blue_orchid.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0db2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/blue_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0db3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bone.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0db4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bone_meal.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0db5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/book.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0db6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bow.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0db7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bowl.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0db8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/brain_coral.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0db9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/brain_coral_fan.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dba" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bread.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dbb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/brewing_stand.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dbc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/brick.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dbd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/elytra_broken.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dbe" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/brown_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dbf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/brown_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dc0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/brown_mushroom.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dc1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/brown_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dc2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/bubble_coral.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dc3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/bubble_coral_fan.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dc4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bucket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dc5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/bundle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dc6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cake.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dc8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/campfire.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dc9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dca" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/carrot.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dcb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/carrot_on_a_stick.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dcc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cauldron.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dcd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chain.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dce" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chainmail_boots.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dcf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chainmail_chestplate.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dd0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chainmail_helmet.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dd1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chainmail_leggings.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dd2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/charcoal.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dd3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chest_minecart.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dd4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chicken.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dd5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/chorus_fruit.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dd6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/clay_ball.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dd7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/clock_00.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dd8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/coal.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dd9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/cobweb.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dda" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cocoa_beans.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ddb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cod.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ddc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cod_bucket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ddd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/command_block_minecart.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dde" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/comparator.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ddf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/compass_16.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0de0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_beef.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0de1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_chicken.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0de2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_cod.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0de3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_mutton.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0de4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_porkchop.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0de5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_rabbit.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0de6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cooked_salmon.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0de7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cookie.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0de8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/copper_ingot.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0de9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/cornflower.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dea" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/creeper_banner_pattern.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0deb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/crimson_door.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dec" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/crimson_fungus.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ded" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/crimson_roots.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dee" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/crimson_sign.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0def" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/crossbow_standby.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0df0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/crossbow_arrow.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0df1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/crossbow_firework.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0df2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cyan_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0df3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/cyan_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0df4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/cyan_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0df5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dandelion.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0df6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/dark_oak_boat.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0df7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/dark_oak_door.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0df8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dark_oak_sapling.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0df9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/dark_oak_sign.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dfa" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_brain_coral.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dfb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_brain_coral_fan.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dfc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_bubble_coral.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dfd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_bubble_coral_fan.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dfe" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_bush.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0dff" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_fire_coral.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e00" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_fire_coral_fan.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e01" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_horn_coral.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e02" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_horn_coral_fan.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e03" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_tube_coral.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e04" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/dead_tube_coral_fan.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e05" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/detector_rail.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e06" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e07" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_axe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e08" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_boots.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e09" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_chestplate.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e0a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_helmet.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e0b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_hoe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e0c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_horse_armor.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e0d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_leggings.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e0e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_pickaxe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e0f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_shovel.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e10" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/diamond_sword.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e11" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/dragon_breath.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e12" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/dried_kelp.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e13" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/egg.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e14" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/elytra.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e15" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/emerald.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e16" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/enchanted_book.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e17" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/end_crystal.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e16" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/ender_eye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e19" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/ender_pearl.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e1a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/experience_bottle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e1b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/feather.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e1c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/fermented_spider_eye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e1d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/fern.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e1e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/filled_map.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e1f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/filled_map_markings.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e20" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/fire_charge.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e21" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/fire_coral.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e22" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/fire_coral_fan.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e23" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/firework_rocket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e24" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/firework_star.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e25" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/firework_star_overlay.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e26" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/fishing_rod.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e27" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/flint.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e28" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/flint_and_steel.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e29" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/flower_banner_pattern.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e2a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/flower_pot.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e2b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/furnace_minecart.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e2c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/ghast_tear.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e2d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glass_bottle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e2e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e2f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glistering_melon_slice.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e30" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/globe_banner_pattern.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e31" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glow_berries.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e32" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glow_ink_sac.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e33" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glow_item_frame.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e34" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/glow_lichen.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e35" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/glowstone_dust.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e36" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/gold_ingot.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e37" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/gold_nugget.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e38" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_apple.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e39" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_axe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e3a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_boots.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e3b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_carrot.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e3c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_chestplate.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e3d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_helmet.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e3e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_hoe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e3f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_horse_armor.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e40" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_leggings.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e41" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_pickaxe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e42" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_shovel.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e43" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/golden_sword.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e44" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/gray_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e46" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/gray_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e47" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/gray_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e48" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/green_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e49" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/green_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e4a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/green_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e4b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/gunpowder.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e4c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/hanging_roots.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e4d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/heart_of_the_sea.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e4e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/honey_bottle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e4f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/honeycomb.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e50" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/hopper.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e51" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/hopper_minecart.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e52" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/horn_coral.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e53" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/horn_coral_fan.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e54" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/ink_sac.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e55" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_axe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e56" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/iron_bars.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e57" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_boots.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e58" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_chestplate.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e59" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_door.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e5a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_helmet.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e5b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_hoe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e5c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_horse_armor.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e5d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_ingot.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e5e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_leggings.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e5f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_nugget.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e60" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_pickaxe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e61" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_shovel.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e62" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/iron_sword.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e63" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/item_frame.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e64" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/jungle_boat.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e65" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/jungle_door.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e66" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/jungle_sapling.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e67" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/jungle_sign.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e68" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/kelp.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e69" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/knowledge_book.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e6a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/ladder.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e6b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lantern.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e6c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lapis_lazuli.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e6d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/large_amethyst_bud.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e6e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/large_fern_top.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e6f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lava_bucket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e70" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lead.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e71" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e72" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_boots.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e73" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_boots_overlay.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e74" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_chestplate.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e75" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_chestplate_overlay.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e76" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_helmet.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e77" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_helmet_overlay.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e78" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_horse_armor.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e79" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_leggings.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e7a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/leather_leggings_overlay.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e7b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/lever.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e7c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e7d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_00.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e7e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_01.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e7f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_02.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e80" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_03.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e81" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_04.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e82" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_05.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e83" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_06.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e84" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_07.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e85" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_08.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e86" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_09.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e87" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_10.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e88" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_11.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e89" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_12.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e8a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_13.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e8b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_14.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e8c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_15.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e8d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_blue_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e8e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_blue_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e8f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/light_blue_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e90" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_gray_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e91" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/light_gray_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e92" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/light_gray_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e93" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/lilac_top.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e94" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/lily_of_the_valley.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e95" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/lily_pad.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e96" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lime_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e97" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lime_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e98" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/lime_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e99" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/lingering_potion.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e9a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/magenta_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e9b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/magenta_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e9c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/magenta_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e9d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/magma_cream.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e9e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/map.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0e9f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/medium_amethyst_bud.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ea0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/melon_seeds.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ea1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/melon_slice.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ea2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/milk_bucket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ea3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/minecart.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ea4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/mojang_banner_pattern.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ea5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/mushroom_stew.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ea6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_11.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ea7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_13.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ea8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_blocks.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ea9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_cat.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eaa" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_chirp.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eab" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_far.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eac" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_mall.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ead" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_mellohi.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eae" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_pigstep.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eaf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_stal.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eb0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_strad.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eb1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_wait.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eb2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/music_disc_ward.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eb3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/mutton.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eb4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/name_tag.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eb5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/nautilus_shell.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eb6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/nether_brick.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eb7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/nether_sprouts.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eb8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/nether_star.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eb9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/nether_wart.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eba" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_axe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ebb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_boots.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ebc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_chestplate.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ebd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_helmet.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ebe" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_hoe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ebf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_ingot.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ec0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_leggings.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ec1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_pickaxe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ec2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_scrap.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ec3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_shovel.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ec4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/netherite_sword.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ec5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/oak_boat.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ec6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/oak_door.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ec7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/oak_sapling.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ec8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/oak_sign.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ec9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/orange_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eca" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/orange_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ecb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/orange_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ecc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/orange_tulip.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ecd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/oxeye_daisy.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ece" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/painting.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ecf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/paper.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ed0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/peony_top.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ed1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/phantom_membrane.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ed2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/piglin_banner_pattern.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ed3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pink_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ed4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pink_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ed5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/pink_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ed6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/pink_tulip.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ed7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pointed_dripstone.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ed8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/poisonous_potato.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ed9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/popped_chorus_fruit.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eda" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/poppy.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0edb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/porkchop.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0edc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/potato.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0edd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/potion.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ede" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/potion_overlay.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0edf" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/powder_snow_bucket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ee0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/powered_rail.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ee1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/prismarine_crystals.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ee2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/prismarine_shard.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ee3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pufferfish.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ee4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pufferfish_bucket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ee5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pumpkin_pie.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ee6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/pumpkin_seeds.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ee7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/purple_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ee8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/purple_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ee9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/purple_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eea" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/quartz.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eeb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/rabbit.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eec" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/rabbit_foot.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eed" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/rabbit_hide.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eee" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/rabbit_stew.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eef" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/rail.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ef0" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/raw_copper.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ef1" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/raw_gold.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ef2" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/raw_iron.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ef3" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/red_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ef4" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/red_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ef5" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/red_mushroom.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ef6" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/red_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ef7" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/red_tulip.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ef8" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/redstone.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0ef9" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/redstone_torch.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0efa" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/repeater.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0efb" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/rose_bush_top.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0efc" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/rotten_flesh.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0efd" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/saddle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0efe" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/salmon.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0eff" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/salmon_bucket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f00" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/turtle_scute.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f01" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/sea_pickle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f02" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/seagrass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f03" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/shears.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f04" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/shulker_shell.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f05" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/skull_banner_pattern.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f06" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/slime_ball.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f07" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/small_amethyst_bud.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f08" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/snowball.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f09" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/soul_campfire.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f0a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/soul_lantern.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f0b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/soul_torch.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f0c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spectral_arrow.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f0f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spider_eye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f10" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/splash_potion.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f11" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spruce_boat.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f12" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spruce_door.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f13" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/spruce_sapling.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f14" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spruce_sign.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f15" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/spyglass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f16" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stick.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f17" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stone_axe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f16" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stone_hoe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f19" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stone_pickaxe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f1a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stone_shovel.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f1b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/stone_sword.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f1c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/string.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f1d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/structure_void.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f1e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/sugar.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f1f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/sugar_cane.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f20" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/sunflower_front.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f21" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/suspicious_stew.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f22" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/sweet_berries.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f23" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/tall_grass_top.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f24" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tipped_arrow_base.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f25" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tipped_arrow_base.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f26" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tipped_arrow_head.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f27" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tnt_minecart.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f28" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/torch.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f29" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/totem_of_undying.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f2a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/trident.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f2b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/tripwire_hook.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f2c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tropical_fish.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f2d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/tropical_fish_bucket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f2e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/tube_coral.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f2f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/tube_coral_fan.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f30" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/turtle_egg.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f31" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/turtle_helmet.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f32" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/twisting_vines_plant.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f33" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/vine.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f34" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/warped_door.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f35" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/warped_fungus.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f36" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/warped_fungus_on_a_stick.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f37" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/warped_roots.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f38" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/warped_sign.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f39" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/water_bucket.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f3a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/weeping_vines_plant.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f3b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wheat.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f3c" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wheat_seeds.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f3d" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/white_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f3e" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/white_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f3f" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/white_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f40" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/white_tulip.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f41" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/wither_rose.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f42" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wooden_axe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f43" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wooden_hoe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f44" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wooden_pickaxe.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f45" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wooden_shovel.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f46" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/wooden_sword.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f47" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/writable_book.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f48" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/written_book.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f49" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/yellow_candle.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f4a" - ] - }, - { - "type": "bitmap", - "file": "minecraft:item/yellow_dye.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f4b" - ] - }, - { - "type": "bitmap", - "file": "minecraft:block/yellow_stained_glass.png", - "ascent": 8, - "height": 16, - "chars": [ - "\u0f4c" - ] - } - - ] -} diff --git a/gm4_guidebook/backport_64/assets/gm4_guidebook/lang/en_us.json b/gm4_guidebook/backport_64/assets/gm4_guidebook/lang/en_us.json deleted file mode 100644 index 21e217cbfe..0000000000 --- a/gm4_guidebook/backport_64/assets/gm4_guidebook/lang/en_us.json +++ /dev/null @@ -1,1259 +0,0 @@ -{ - "gui.gm4.guidebook.page": "\u9004\u9005\ue005\u9006\u9007\ue001", - "gui.gm4.guidebook.page.toc": "\u9008\u9009\ue005\u900a\u900b\ue001", - "gui.gm4.guidebook.page.intro": "\u9008\u9009\ue005\u900a\u900b\ue001", - "gui.gm4.guidebook.header.toc": "\uf016", - "gui.gm4.guidebook.header.toc.under": "\uf016", - "gui.gm4.guidebook.header.wiki": "\uf016", - "gui.gm4.guidebook.header.wiki.under": "\uf016", - "gui.gm4.guidebook.header.refresh": "\uf016", - "gui.gm4.guidebook.header.refresh.under": "\uf016", - "gui.gm4.guidebook.header.prev": "\uf016", - "gui.gm4.guidebook.header.prev.under": "\uf016", - "gui.gm4.guidebook.header.next": "\uf016", - "gui.gm4.guidebook.header.next.under": "\uf016", - "gui.gm4.guidebook.locked_page": "\n\n\n\n\uf110\n\uf110\uf037?\uf048\n\uf110\n\uf110", - "gui.gm4.guidebook.toast": "\u9000\ue148\u9001\uf003", - "gui.gm4.guidebook.crafting.display.grid": "\uf004\u9002\u9003\ue007", - "gui.gm4.guidebook.crafting.display.empty_slot": "\uf018", - "gui.gm4.guidebook.crafting.display.filled_slot.under": "\uf018", - "gui.gm4.guidebook.crafting.display.empty_slot.under": "\uf018", - "gui.gm4.guidebook.crafting.display.arrow": "\uf019", - "gui.gm4.guidebook.crafting.display.arrow.under": "\uf019", - "gui.gm4.guidebook.crafting.display.shapeless": "🔀", - "gui.gm4.guidebook.crafting.display.count.0": "\ue007\u0abf", - "gui.gm4.guidebook.crafting.display.count.1": "\ue007\u0ac0", - "gui.gm4.guidebook.crafting.display.count.2": "\ue007\u0ac1", - "gui.gm4.guidebook.crafting.display.count.3": "\ue007\u0ac2", - "gui.gm4.guidebook.crafting.display.count.4": "\ue007\u0ac3", - "gui.gm4.guidebook.crafting.display.count.5": "\ue007\u0ac4", - "gui.gm4.guidebook.crafting.display.count.6": "\ue007\u0ac5", - "gui.gm4.guidebook.crafting.display.count.7": "\ue007\u0ac6", - "gui.gm4.guidebook.crafting.display.count.8": "\ue007\u0ac7", - "gui.gm4.guidebook.crafting.display.count.9": "\ue007\u0ac8", - "gui.gm4.guidebook.crafting.display.count.10": "\ue012\u0ac0\ue002\u0abf", - "gui.gm4.guidebook.crafting.display.count.11": "\ue012\u0ac0\ue002\u0ac0", - "gui.gm4.guidebook.crafting.display.count.12": "\ue012\u0ac0\ue002\u0ac1", - "gui.gm4.guidebook.crafting.display.count.13": "\ue012\u0ac0\ue002\u0ac2", - "gui.gm4.guidebook.crafting.display.count.14": "\ue012\u0ac0\ue002\u0ac3", - "gui.gm4.guidebook.crafting.display.count.15": "\ue012\u0ac0\ue002\u0ac4", - "gui.gm4.guidebook.crafting.display.count.16": "\ue012\u0ac0\ue002\u0ac5", - "gui.gm4.guidebook.crafting.display.count.17": "\ue012\u0ac0\ue002\u0ac6", - "gui.gm4.guidebook.crafting.display.count.18": "\ue012\u0ac0\ue002\u0ac7", - "gui.gm4.guidebook.crafting.display.count.19": "\ue012\u0ac0\ue002\u0ac8", - "gui.gm4.guidebook.crafting.display.count.20": "\ue012\u0ac1\ue002\u0abf", - "gui.gm4.guidebook.crafting.display.count.21": "\ue012\u0ac1\ue002\u0ac0", - "gui.gm4.guidebook.crafting.display.count.22": "\ue012\u0ac1\ue002\u0ac1", - "gui.gm4.guidebook.crafting.display.count.23": "\ue012\u0ac1\ue002\u0ac2", - "gui.gm4.guidebook.crafting.display.count.24": "\ue012\u0ac1\ue002\u0ac3", - "gui.gm4.guidebook.crafting.display.count.25": "\ue012\u0ac1\ue002\u0ac4", - "gui.gm4.guidebook.crafting.display.count.26": "\ue012\u0ac1\ue002\u0ac5", - "gui.gm4.guidebook.crafting.display.count.27": "\ue012\u0ac1\ue002\u0ac6", - "gui.gm4.guidebook.crafting.display.count.28": "\ue012\u0ac1\ue002\u0ac7", - "gui.gm4.guidebook.crafting.display.count.29": "\ue012\u0ac1\ue002\u0ac8", - "gui.gm4.guidebook.crafting.display.count.30": "\ue012\u0ac2\ue002\u0abf", - "gui.gm4.guidebook.crafting.display.count.31": "\ue012\u0ac2\ue002\u0ac0", - "gui.gm4.guidebook.crafting.display.count.32": "\ue012\u0ac2\ue002\u0ac1", - "gui.gm4.guidebook.crafting.display.count.33": "\ue012\u0ac2\ue002\u0ac2", - "gui.gm4.guidebook.crafting.display.count.34": "\ue012\u0ac2\ue002\u0ac3", - "gui.gm4.guidebook.crafting.display.count.35": "\ue012\u0ac2\ue002\u0ac4", - "gui.gm4.guidebook.crafting.display.count.36": "\ue012\u0ac2\ue002\u0ac5", - "gui.gm4.guidebook.crafting.display.count.37": "\ue012\u0ac2\ue002\u0ac6", - "gui.gm4.guidebook.crafting.display.count.38": "\ue012\u0ac2\ue002\u0ac7", - "gui.gm4.guidebook.crafting.display.count.39": "\ue012\u0ac2\ue002\u0ac8", - "gui.gm4.guidebook.crafting.display.count.40": "\ue012\u0ac3\ue002\u0abf", - "gui.gm4.guidebook.crafting.display.count.41": "\ue012\u0ac3\ue002\u0ac0", - "gui.gm4.guidebook.crafting.display.count.42": "\ue012\u0ac3\ue002\u0ac1", - "gui.gm4.guidebook.crafting.display.count.43": "\ue012\u0ac3\ue002\u0ac2", - "gui.gm4.guidebook.crafting.display.count.44": "\ue012\u0ac3\ue002\u0ac3", - "gui.gm4.guidebook.crafting.display.count.45": "\ue012\u0ac3\ue002\u0ac4", - "gui.gm4.guidebook.crafting.display.count.46": "\ue012\u0ac3\ue002\u0ac5", - "gui.gm4.guidebook.crafting.display.count.47": "\ue012\u0ac3\ue002\u0ac6", - "gui.gm4.guidebook.crafting.display.count.48": "\ue012\u0ac3\ue002\u0ac7", - "gui.gm4.guidebook.crafting.display.count.49": "\ue012\u0ac3\ue002\u0ac8", - "gui.gm4.guidebook.crafting.display.count.50": "\ue012\u0ac4\ue002\u0abf", - "gui.gm4.guidebook.crafting.display.count.51": "\ue012\u0ac4\ue002\u0ac0", - "gui.gm4.guidebook.crafting.display.count.52": "\ue012\u0ac4\ue002\u0ac1", - "gui.gm4.guidebook.crafting.display.count.53": "\ue012\u0ac4\ue002\u0ac2", - "gui.gm4.guidebook.crafting.display.count.54": "\ue012\u0ac4\ue002\u0ac3", - "gui.gm4.guidebook.crafting.display.count.55": "\ue012\u0ac4\ue002\u0ac4", - "gui.gm4.guidebook.crafting.display.count.56": "\ue012\u0ac4\ue002\u0ac5", - "gui.gm4.guidebook.crafting.display.count.57": "\ue012\u0ac4\ue002\u0ac6", - "gui.gm4.guidebook.crafting.display.count.58": "\ue012\u0ac4\ue002\u0ac7", - "gui.gm4.guidebook.crafting.display.count.59": "\ue012\u0ac4\ue002\u0ac8", - "gui.gm4.guidebook.crafting.display.count.60": "\ue012\u0ac5\ue002\u0abf", - "gui.gm4.guidebook.crafting.display.count.61": "\ue012\u0ac5\ue002\u0ac0", - "gui.gm4.guidebook.crafting.display.count.62": "\ue012\u0ac5\ue002\u0ac1", - "gui.gm4.guidebook.crafting.display.count.63": "\ue012\u0ac5\ue002\u0ac2", - "gui.gm4.guidebook.crafting.display.count.64": "\ue012\u0ac5\ue002\u0ac3", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_button": "\u0ad7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_fence": "\u0ad8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_fence_gate": "\u0ad9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_leaves": "\u0ada\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_log": "\u0adb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_planks": "\u0adc\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_pressure_plate": "\u0add\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_slab": "\u0ade\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_stairs": "\u0adf\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_trapdoor": "\u0ae0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_wood": "\u0ae1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.amethyst_block": "\u0ae2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.ancient_debris": "\u0ae3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.andesite": "\u0ae4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.andesite_slab": "\u0ae5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.andesite_stairs": "\u0ae6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.andesite_wall": "\u0ae7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.anvil": "\u0ae8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.azalea": "\u0ae9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.azalea_leaves": "\u0aea\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.barrel": "\u0aeb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.basalt": "\u0aec\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.beacon": "\u0aed\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.bedrock": "\u0aee\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.bee_nest": "\u0aef\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.beehive": "\u0af0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.big_dripleaf": "\u0af1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_button": "\u0af2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_fence": "\u0af3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_fence_gate": "\u0af4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_leaves": "\u0af5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_log": "\u0af6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_planks": "\u0af7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_pressure_plate": "\u0af8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_slab": "\u0af9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_stairs": "\u0afa\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_trapdoor": "\u0afb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.birch_wood": "\u0afc\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.black_banner": "\u0afd\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.black_bed": "\u0afe\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.black_carpet": "\u0aff\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.black_concrete": "\u0b00\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.black_concrete_powder": "\u0b01\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.black_glazed_terracotta": "\u0b02\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.black_shulker_box": "\u0b03\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.black_stained_glass": "\u0b04\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.black_terracotta": "\u0b05\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.black_wool": "\u0b06\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blackstone": "\u0b07\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blackstone_slab": "\u0b08\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blackstone_stairs": "\u0b09\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blackstone_wall": "\u0b0a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blast_furnace": "\u0b0b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_banner": "\u0b0c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_bed": "\u0b0d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_carpet": "\u0b0e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_concrete": "\u0b0f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_concrete_powder": "\u0b10\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_glazed_terracotta": "\u0b11\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_ice": "\u0b12\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_shulker_box": "\u0b13\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_stained_glass": "\u0b14\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_terracotta": "\u0b15\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.blue_wool": "\u0b16\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.bone_block": "\u0b17\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.bookshelf": "\u0b18\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brain_coral_block": "\u0b19\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brick_slab": "\u0b1a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brick_stairs": "\u0b1b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brick_wall": "\u0b1c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.bricks": "\u0b1d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_banner": "\u0b1e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_bed": "\u0b1f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_carpet": "\u0b20\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_concrete": "\u0b21\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_concrete_powder": "\u0b22\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_glazed_terracotta": "\u0b23\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_mushroom_block": "\u0b24\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_shulker_box": "\u0b25\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_stained_glass": "\u0b26\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_terracotta": "\u0b27\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.brown_wool": "\u0b28\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.bubble_coral_block": "\u0b29\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.budding_amethyst": "\u0b2a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cactus": "\u0b2b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.calcite": "\u0b2c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cartography_table": "\u0b2d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.carved_pumpkin": "\u0b2e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chain_command_block": "\u0b2f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chest": "\u0b30\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chipped_anvil": "\u0b31\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chiseled_deepslate": "\u0b32\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chiseled_nether_bricks": "\u0b33\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chiseled_polished_blackstone": "\u0b34\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chiseled_quartz_block": "\u0b35\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chiseled_red_sandstone": "\u0b36\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chiseled_sandstone": "\u0b37\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chiseled_stone_bricks": "\u0b38\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chorus_flower": "\u0b39\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.chorus_plant": "\u0b3a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.clay": "\u0b3b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.coal_block": "\u0b3c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.coal_ore": "\u0b3d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.coarse_dirt": "\u0b3e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cobbled_deepslate": "\u0b3f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cobbled_deepslate_slab": "\u0b40\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cobbled_deepslate_stairs": "\u0b41\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cobbled_deepslate_wall": "\u0b42\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cobblestone": "\u0b43\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cobblestone_slab": "\u0b44\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cobblestone_stairs": "\u0b45\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cobblestone_wall": "\u0b46\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.command_block": "\u0b47\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.composter": "\u0b48\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.conduit": "\u0b49\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.copper_block": "\u0b4a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.copper_ore": "\u0b4b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cracked_deepslate_bricks": "\u0b4c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cracked_deepslate_tiles": "\u0b4d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cracked_nether_bricks": "\u0b4e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cracked_polished_blackstone_bricks": "\u0b4f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cracked_stone_bricks": "\u0b50\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crafting_table": "\u0b51\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.creeper_head": "\u0b52\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_button": "\u0b53\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_fence": "\u0b54\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_fence_gate": "\u0b55\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_hyphae": "\u0b56\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_nylium": "\u0b57\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_planks": "\u0b58\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_pressure_plate": "\u0b59\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_slab": "\u0b5a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_stairs": "\u0b5b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_stem": "\u0b5c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_trapdoor": "\u0b5d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.crying_obsidian": "\u0b5e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cut_copper": "\u0b5f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cut_copper_slab": "\u0b60\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cut_copper_stairs": "\u0b61\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cut_red_sandstone": "\u0b62\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cut_red_sandstone_slab": "\u0b63\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cut_sandstone": "\u0b64\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cut_sandstone_slab": "\u0b65\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_banner": "\u0b66\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_bed": "\u0b67\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_carpet": "\u0b68\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_concrete": "\u0b69\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_concrete_powder": "\u0b6a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_glazed_terracotta": "\u0b6b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_shulker_box": "\u0b6c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_stained_glass": "\u0b6d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_terracotta": "\u0b6e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_wool": "\u0b6f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.damaged_anvil": "\u0b70\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_button": "\u0b71\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_fence": "\u0b72\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_fence_gate": "\u0b73\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_leaves": "\u0b74\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_log": "\u0b75\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_planks": "\u0b76\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_pressure_plate": "\u0b77\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_slab": "\u0b78\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_stairs": "\u0b79\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_trapdoor": "\u0b7a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_wood": "\u0b7b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_prismarine": "\u0b7c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_prismarine_slab": "\u0b7d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dark_prismarine_stairs": "\u0b7e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.daylight_detector": "\u0b7f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dead_brain_coral_block": "\u0b80\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dead_bubble_coral_block": "\u0b81\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dead_fire_coral_block": "\u0b82\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dead_horn_coral_block": "\u0b83\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dead_tube_coral_block": "\u0b84\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate": "\u0b85\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_brick_slab": "\u0b86\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_brick_stairs": "\u0b87\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_brick_wall": "\u0b88\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_bricks": "\u0b89\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_coal_ore": "\u0b8a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_copper_ore": "\u0b8b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_diamond_ore": "\u0b8c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_emerald_ore": "\u0b8d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_gold_ore": "\u0b8e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_iron_ore": "\u0b8f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_lapis_ore": "\u0b90\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_redstone_ore": "\u0b91\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_tile_slab": "\u0b92\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_tile_stairs": "\u0b93\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_tile_wall": "\u0b94\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.deepslate_tiles": "\u0b95\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_block": "\u0b96\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_ore": "\u0b97\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.diorite": "\u0b98\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.diorite_slab": "\u0b99\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.diorite_stairs": "\u0b9a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.diorite_wall": "\u0b9b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dirt": "\u0b9c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dirt_path": "\u0b9d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dispenser": "\u0b9e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dragon_egg": "\u0b9f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dragon_head": "\u0ba0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dried_kelp_block": "\u0ba1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dripstone_block": "\u0ba2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.dropper": "\u0ba3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.emerald_block": "\u0ba4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.emerald_ore": "\u0ba5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.enchanting_table": "\u0ba6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.end_portal_frame": "\u0ba7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.end_rod": "\u0ba8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.end_stone": "\u0ba9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.end_stone_brick_slab": "\u0baa\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.end_stone_brick_stairs": "\u0bab\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.end_stone_brick_wall": "\u0bac\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.end_stone_bricks": "\u0bad\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.ender_chest": "\u0bae\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.exposed_copper": "\u0baf\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.exposed_cut_copper": "\u0bb0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.exposed_cut_copper_slab": "\u0bb1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.exposed_cut_copper_stairs": "\u0bb2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.farmland": "\u0bb3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.fire_coral_block": "\u0bb4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.fletching_table": "\u0bb5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.flowering_azalea": "\u0bb6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.flowering_azalea_leaves": "\u0bb7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.furnace": "\u0bb8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gilded_blackstone": "\u0bb9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.glass": "\u0bba\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.glowstone": "\u0bbb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gold_block": "\u0bbc\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gold_ore": "\u0bbd\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.granite": "\u0bbe\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.granite_slab": "\u0bbf\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.granite_stairs": "\u0bc0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.granite_wall": "\u0bc1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.grass_block": "\u0bc2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gravel": "\u0bc3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gray_banner": "\u0bc4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gray_bed": "\u0bc5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gray_carpet": "\u0bc6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gray_concrete": "\u0bc7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gray_concrete_powder": "\u0bc8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gray_glazed_terracotta": "\u0bc9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gray_shulker_box": "\u0bca\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gray_stained_glass": "\u0bcb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gray_terracotta": "\u0bcc\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.gray_wool": "\u0bcd\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.green_banner": "\u0bce\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.green_bed": "\u0bcf\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.green_carpet": "\u0bd0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.green_concrete": "\u0bd1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.green_concrete_powder": "\u0bd2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.green_glazed_terracotta": "\u0bd3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.green_shulker_box": "\u0bd4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.green_stained_glass": "\u0bd5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.green_terracotta": "\u0bd6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.green_wool": "\u0bd7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.grindstone": "\u0bd8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.hay_block": "\u0bd9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.heavy_weighted_pressure_plate": "\u0bda\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.honey_block": "\u0bdb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.honeycomb_block": "\u0bdc\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.horn_coral_block": "\u0bdd\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.ice": "\u0bde\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.infested_chiseled_stone_bricks": "\u0bdf\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.infested_cobblestone": "\u0be0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.infested_cracked_stone_bricks": "\u0be1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.infested_deepslate": "\u0be2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.infested_mossy_stone_bricks": "\u0be3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.infested_stone": "\u0be4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.infested_stone_bricks": "\u0be5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.iron_block": "\u0be6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.iron_ore": "\u0be7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.iron_trapdoor": "\u0be8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jack_o_lantern": "\u0be9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jigsaw": "\u0bea\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jukebox": "\u0beb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_button": "\u0bec\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_fence": "\u0bed\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_fence_gate": "\u0bee\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_leaves": "\u0bef\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_log": "\u0bf0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_planks": "\u0bf1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_pressure_plate": "\u0bf2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_slab": "\u0bf3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_stairs": "\u0bf4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_trapdoor": "\u0bf5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_wood": "\u0bf6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lapis_block": "\u0bf7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lapis_ore": "\u0bf8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lectern": "\u0bf9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_banner": "\u0bfa\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_bed": "\u0bfb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_carpet": "\u0bfc\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_concrete": "\u0bfd\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_concrete_powder": "\u0bfe\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_glazed_terracotta": "\u0bff\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_shulker_box": "\u0c00\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_stained_glass": "\u0c01\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_terracotta": "\u0c02\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_wool": "\u0c03\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_banner": "\u0c04\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_bed": "\u0c05\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_carpet": "\u0c06\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_concrete": "\u0c07\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_concrete_powder": "\u0c08\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_glazed_terracotta": "\u0c09\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_shulker_box": "\u0c0a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_stained_glass": "\u0c0b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_terracotta": "\u0c0c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_wool": "\u0c0d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.light_weighted_pressure_plate": "\u0c0e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lightning_rod": "\u0c0f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lime_banner": "\u0c10\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lime_bed": "\u0c11\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lime_carpet": "\u0c12\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lime_concrete": "\u0c13\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lime_concrete_powder": "\u0c14\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lime_glazed_terracotta": "\u0c15\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lime_shulker_box": "\u0c16\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lime_stained_glass": "\u0c17\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lime_terracotta": "\u0c18\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lime_wool": "\u0c19\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.lodestone": "\u0c1a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.loom": "\u0c1b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_banner": "\u0c1c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_bed": "\u0c1d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_carpet": "\u0c1e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_concrete": "\u0c1f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_concrete_powder": "\u0c20\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_glazed_terracotta": "\u0c21\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_shulker_box": "\u0c22\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_stained_glass": "\u0c23\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_terracotta": "\u0c24\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_wool": "\u0c25\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.magma_block": "\u0c26\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.melon": "\u0c27\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.moss_block": "\u0c28\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.moss_carpet": "\u0c29\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.mossy_cobblestone": "\u0c2a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.mossy_cobblestone_slab": "\u0c2b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.mossy_cobblestone_stairs": "\u0c2c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.mossy_cobblestone_wall": "\u0c2d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.mossy_stone_brick_slab": "\u0c2e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.mossy_stone_brick_stairs": "\u0c2f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.mossy_stone_brick_wall": "\u0c30\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.mossy_stone_bricks": "\u0c31\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.mushroom_stem": "\u0c32\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.mycelium": "\u0c33\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.nether_brick_fence": "\u0c34\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.nether_brick_slab": "\u0c35\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.nether_brick_stairs": "\u0c36\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.nether_brick_wall": "\u0c37\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.nether_bricks": "\u0c38\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.nether_gold_ore": "\u0c39\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.nether_quartz_ore": "\u0c3a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.nether_wart_block": "\u0c3b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_block": "\u0c3c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.netherrack": "\u0c3d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.note_block": "\u0c3e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_button": "\u0c3f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_fence": "\u0c40\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_fence_gate": "\u0c41\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_leaves": "\u0c42\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_log": "\u0c43\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_planks": "\u0c44\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_pressure_plate": "\u0c45\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_slab": "\u0c46\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_stairs": "\u0c47\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_trapdoor": "\u0c48\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oak_wood": "\u0c49\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.observer": "\u0c4a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.obsidian": "\u0c4b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.orange_banner": "\u0c4c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.orange_bed": "\u0c4d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.orange_carpet": "\u0c4e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.orange_concrete": "\u0c4f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.orange_concrete_powder": "\u0c50\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.orange_glazed_terracotta": "\u0c51\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.orange_shulker_box": "\u0c52\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.orange_stained_glass": "\u0c53\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.orange_terracotta": "\u0c54\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.orange_wool": "\u0c55\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oxidized_copper": "\u0c56\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oxidized_cut_copper": "\u0c57\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oxidized_cut_copper_slab": "\u0c58\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.oxidized_cut_copper_stairs": "\u0c59\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.packed_ice": "\u0c5a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.petrified_oak_slab": "\u0c5b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pink_banner": "\u0c5c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pink_bed": "\u0c5d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pink_carpet": "\u0c5e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pink_concrete": "\u0c5f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pink_concrete_powder": "\u0c60\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pink_glazed_terracotta": "\u0c61\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pink_shulker_box": "\u0c62\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pink_stained_glass": "\u0c63\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pink_terracotta": "\u0c64\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pink_wool": "\u0c65\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.piston": "\u0c66\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.player_head": "\u0c67\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.podzol": "\u0c68\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_andesite": "\u0c69\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_andesite_slab": "\u0c6a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_andesite_stairs": "\u0c6b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_basalt": "\u0c6c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_blackstone": "\u0c6d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_blackstone_brick_slab": "\u0c6e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_blackstone_brick_stairs": "\u0c6f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_blackstone_brick_wall": "\u0c70\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_blackstone_bricks": "\u0c71\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_blackstone_button": "\u0c72\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_blackstone_pressure_plate": "\u0c73\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_blackstone_slab": "\u0c74\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_blackstone_stairs": "\u0c75\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_blackstone_wall": "\u0c76\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_deepslate": "\u0c77\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_deepslate_slab": "\u0c78\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_deepslate_stairs": "\u0c79\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_deepslate_wall": "\u0c7a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_diorite": "\u0c7b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_diorite_slab": "\u0c7c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_diorite_stairs": "\u0c7d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_granite": "\u0c7e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_granite_slab": "\u0c7f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.polished_granite_stairs": "\u0c80\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.prismarine": "\u0c81\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.prismarine_brick_slab": "\u0c82\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.prismarine_brick_stairs": "\u0c83\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.prismarine_bricks": "\u0c84\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.prismarine_slab": "\u0c85\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.prismarine_stairs": "\u0c86\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.prismarine_wall": "\u0c87\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.pumpkin": "\u0c88\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purple_banner": "\u0c89\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purple_bed": "\u0c8a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purple_carpet": "\u0c8b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purple_concrete": "\u0c8c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purple_concrete_powder": "\u0c8d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purple_glazed_terracotta": "\u0c8e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purple_shulker_box": "\u0c8f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purple_stained_glass": "\u0c90\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purple_terracotta": "\u0c91\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purple_wool": "\u0c92\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purpur_block": "\u0c93\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purpur_pillar": "\u0c94\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purpur_slab": "\u0c95\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.purpur_stairs": "\u0c96\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.quartz_block": "\u0c97\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.quartz_bricks": "\u0c98\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.quartz_pillar": "\u0c99\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.quartz_slab": "\u0c9a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.quartz_stairs": "\u0c9b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.raw_copper_block": "\u0c9c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.raw_gold_block": "\u0c9d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.raw_iron_block": "\u0c9e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_banner": "\u0c9f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_bed": "\u0ca0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_carpet": "\u0ca1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_concrete": "\u0ca2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_concrete_powder": "\u0ca3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_glazed_terracotta": "\u0ca4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_mushroom_block": "\u0ca5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_nether_brick_slab": "\u0ca6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_nether_brick_stairs": "\u0ca7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_nether_brick_wall": "\u0ca8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_nether_bricks": "\u0ca9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_sand": "\u0caa\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_sandstone": "\u0cab\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_sandstone_slab": "\u0cac\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_sandstone_stairs": "\u0cad\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_sandstone_wall": "\u0cae\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_shulker_box": "\u0caf\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_stained_glass": "\u0cb0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_terracotta": "\u0cb1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.red_wool": "\u0cb2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.redstone_block": "\u0cb3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.redstone_lamp": "\u0cb4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.redstone_ore": "\u0cb5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.repeating_command_block": "\u0cb6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.respawn_anchor": "\u0cb7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.rooted_dirt": "\u0cb8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.sand": "\u0cb9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.sandstone": "\u0cba\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.sandstone_slab": "\u0cbb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.sandstone_stairs": "\u0cbc\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.sandstone_wall": "\u0cbd\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.scaffolding": "\u0cbe\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.sculk_sensor": "\u0cbf\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.sea_lantern": "\u0cc0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.shield": "\u0cc1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.shroomlight": "\u0cc2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.shulker_box": "\u0cc3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.skeleton_skull": "\u0cc4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.slime_block": "\u0cc5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.small_dripleaf": "\u0cc6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smithing_table": "\u0cc7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smoker": "\u0cc8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_basalt": "\u0cc9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_quartz": "\u0cca\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_quartz_slab": "\u0ccb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_quartz_stairs": "\u0ccc\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_red_sandstone": "\u0ccd\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_red_sandstone_slab": "\u0cce\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_red_sandstone_stairs": "\u0ccf\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_sandstone": "\u0cd0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_sandstone_slab": "\u0cd1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_sandstone_stairs": "\u0cd2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_stone": "\u0cd3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.smooth_stone_slab": "\u0cd4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.snow": "\u0cd5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.snow_block": "\u0cd6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.soul_sand": "\u0cd7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.soul_soil": "\u0cd8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spawner": "\u0cd9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.sponge": "\u0cda\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spore_blossom": "\u0cdb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_button": "\u0cdc\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_fence": "\u0cdd\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_fence_gate": "\u0cde\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_leaves": "\u0cdf\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_log": "\u0ce0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_planks": "\u0ce1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_pressure_plate": "\u0ce2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_slab": "\u0ce3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_stairs": "\u0ce4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_trapdoor": "\u0ce5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_wood": "\u0ce6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.sticky_piston": "\u0ce7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stone": "\u0ce8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stone_brick_slab": "\u0ce9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stone_brick_stairs": "\u0cea\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stone_brick_wall": "\u0ceb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stone_bricks": "\u0cec\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stone_button": "\u0ced\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stone_pressure_plate": "\u0cee\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stone_slab": "\u0cef\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stone_stairs": "\u0cf0\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stonecutter": "\u0cf1\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_acacia_log": "\u0cf2\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_acacia_wood": "\u0cf3\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_birch_log": "\u0cf4\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_birch_wood": "\u0cf5\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_crimson_hyphae": "\u0cf6\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_crimson_stem": "\u0cf7\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_dark_oak_log": "\u0cf8\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_dark_oak_wood": "\u0cf9\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_jungle_log": "\u0cfa\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_jungle_wood": "\u0cfb\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_oak_log": "\u0cfc\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_oak_wood": "\u0cfd\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_spruce_log": "\u0cfe\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_spruce_wood": "\u0cff\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_warped_hyphae": "\u0d00\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.stripped_warped_stem": "\u0d01\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.structure_block": "\u0d02\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.target": "\u0d03\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.terracotta": "\u0d04\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.tinted_glass": "\u0d05\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.tnt": "\u0d06\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.trapped_chest": "\u0d07\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.tube_coral_block": "\u0d08\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.tuff": "\u0d09\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_button": "\u0d0a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_fence": "\u0d0b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_fence_gate": "\u0d0c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_hyphae": "\u0d0d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_nylium": "\u0d0e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_planks": "\u0d0f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_pressure_plate": "\u0d10\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_slab": "\u0d11\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_stairs": "\u0d12\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_stem": "\u0d13\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_trapdoor": "\u0d14\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.warped_wart_block": "\u0d15\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_copper_block": "\u0d16\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_cut_copper": "\u0d17\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_cut_copper_slab": "\u0d18\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_cut_copper_stairs": "\u0d19\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_exposed_copper": "\u0d1a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_exposed_cut_copper": "\u0d1b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_exposed_cut_copper_slab": "\u0d1c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_exposed_cut_copper_stairs": "\u0d1d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_oxidized_copper": "\u0d1e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_oxidized_cut_copper": "\u0d1f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_oxidized_cut_copper_slab": "\u0d20\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_oxidized_cut_copper_stairs": "\u0d21\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_weathered_copper": "\u0d22\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_weathered_cut_copper": "\u0d23\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_weathered_cut_copper_slab": "\u0d24\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.waxed_weathered_cut_copper_stairs": "\u0d25\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.weathered_copper": "\u0d26\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.weathered_cut_copper": "\u0d27\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.weathered_cut_copper_slab": "\u0d28\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.weathered_cut_copper_stairs": "\u0d29\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.wet_sponge": "\u0d2a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.white_banner": "\u0d2b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.white_bed": "\u0d2c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.white_carpet": "\u0d2d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.white_concrete": "\u0d2e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.white_concrete_powder": "\u0d2f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.white_glazed_terracotta": "\u0d30\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.white_shulker_box": "\u0d31\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.white_stained_glass": "\u0d32\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.white_terracotta": "\u0d33\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.white_wool": "\u0d34\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.wither_skeleton_skull": "\u0d35\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_banner": "\u0d36\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_bed": "\u0d37\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_carpet": "\u0d38\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_concrete": "\u0d39\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_concrete_powder": "\u0d3a\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_glazed_terracotta": "\u0d3b\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_shulker_box": "\u0d3c\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_stained_glass": "\u0d3d\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_terracotta": "\u0d3e\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_wool": "\u0d3f\uf001", - "gui.gm4.guidebook.crafting.display.minecraft.zombie_head": "\u0d40\uf001", - "gui.gm4.guidebook.crafting.display.gm4.block_compressor": "\u4001\uf001", - "gui.gm4.guidebook.crafting.display.gm4.charcoal_block": "\u0b3c\uf001", - "gui.gm4.guidebook.crafting.display.gm4.custom_crafter": "\u4002\uf001", - "gui.gm4.guidebook.crafting.display.gm4.disassembler": "\u4003\uf001", - "gui.gm4.guidebook.crafting.display.gm4.enchantment_extractor": "\u4004\uf001", - "gui.gm4.guidebook.crafting.display.gm4.ender_hopper": "\u4005\uf001", - "gui.gm4.guidebook.crafting.display.gm4.liquid_tank": "\u4006\uf001", - "gui.gm4.guidebook.crafting.display.gm4.forming_press": "\u4007\uf001", - "gui.gm4.guidebook.crafting.display.gm4.smeltery": "\u4008\uf001", - "gui.gm4.guidebook.crafting.display.gm4.tinkering_compressor": "\u4009\uf001", - "gui.gm4.guidebook.crafting.display.gm4.teleportation_anchor": "\u4010\uf001", - "gui.gm4.guidebook.crafting.display.gm4.teleportation_jammer": "\u4011\uf001", - "gui.gm4.guidebook.crafting.display.banner_pattern.border": "\ue018\u0d41", - "gui.gm4.guidebook.crafting.display.banner_pattern.bricks": "\ue018\u0d42", - "gui.gm4.guidebook.crafting.display.banner_pattern.circle": "\ue018\u0d43", - "gui.gm4.guidebook.crafting.display.banner_pattern.creeper": "\ue018\u0d44", - "gui.gm4.guidebook.crafting.display.banner_pattern.cross": "\ue018\u0d45", - "gui.gm4.guidebook.crafting.display.banner_pattern.curly_border": "\ue018\u0d46", - "gui.gm4.guidebook.crafting.display.banner_pattern.diagonal_left": "\ue018\u0d47", - "gui.gm4.guidebook.crafting.display.banner_pattern.diagonal_right": "\ue018\u0d48", - "gui.gm4.guidebook.crafting.display.banner_pattern.diagonal_up_left": "\ue018\u0d49", - "gui.gm4.guidebook.crafting.display.banner_pattern.diagonal_up_right": "\ue018\u0d4a", - "gui.gm4.guidebook.crafting.display.banner_pattern.flower": "\ue018\u0d4b", - "gui.gm4.guidebook.crafting.display.banner_pattern.globe": "\ue018\u0d4c", - "gui.gm4.guidebook.crafting.display.banner_pattern.gradient": "\ue018\u0d4d", - "gui.gm4.guidebook.crafting.display.banner_pattern.gradient_up": "\ue018\u0d4e", - "gui.gm4.guidebook.crafting.display.banner_pattern.half_horizontal": "\ue018\u0d4f", - "gui.gm4.guidebook.crafting.display.banner_pattern.half_horizontal_bottom": "\ue018\u0d50", - "gui.gm4.guidebook.crafting.display.banner_pattern.half_vertical": "\ue018\u0d51", - "gui.gm4.guidebook.crafting.display.banner_pattern.half_vertical_right": "\ue018\u0d52", - "gui.gm4.guidebook.crafting.display.banner_pattern.mojang": "\ue018\u0d53", - "gui.gm4.guidebook.crafting.display.banner_pattern.piglin": "\ue018\u0d54", - "gui.gm4.guidebook.crafting.display.banner_pattern.rhombus": "\ue018\u0d55", - "gui.gm4.guidebook.crafting.display.banner_pattern.skull": "\ue018\u0d56", - "gui.gm4.guidebook.crafting.display.banner_pattern.small_stripes": "\ue018\u0d57", - "gui.gm4.guidebook.crafting.display.banner_pattern.square_bottom_left": "\ue018\u0d58", - "gui.gm4.guidebook.crafting.display.banner_pattern.square_bottom_right": "\ue018\u0d59", - "gui.gm4.guidebook.crafting.display.banner_pattern.square_top_left": "\ue018\u0d5a", - "gui.gm4.guidebook.crafting.display.banner_pattern.square_top_right": "\ue018\u0d5b", - "gui.gm4.guidebook.crafting.display.banner_pattern.straight_cross": "\ue018\u0d5c", - "gui.gm4.guidebook.crafting.display.banner_pattern.stripe_bottom": "\ue018\u0d5d", - "gui.gm4.guidebook.crafting.display.banner_pattern.stripe_center": "\ue018\u0d5e", - "gui.gm4.guidebook.crafting.display.banner_pattern.stripe_downleft": "\ue018\u0d5f", - "gui.gm4.guidebook.crafting.display.banner_pattern.stripe_downright": "\ue018\u0d60", - "gui.gm4.guidebook.crafting.display.banner_pattern.stripe_left": "\ue018\u0d61", - "gui.gm4.guidebook.crafting.display.banner_pattern.stripe_middle": "\ue018\u0d62", - "gui.gm4.guidebook.crafting.display.banner_pattern.stripe_right": "\ue018\u0d63", - "gui.gm4.guidebook.crafting.display.banner_pattern.stripe_top": "\ue018\u0d64", - "gui.gm4.guidebook.crafting.display.banner_pattern.triangle_bottom": "\ue018\u0d65", - "gui.gm4.guidebook.crafting.display.banner_pattern.triangle_top": "\ue018\u0d66", - "gui.gm4.guidebook.crafting.display.banner_pattern.triangles_bottom": "\ue018\u0d67", - "gui.gm4.guidebook.crafting.display.banner_pattern.triangles_top": "\ue018\u0d68", - "gui.gm4.guidebook.crafting.display.shield_pattern.base": "\ue018\u0d69", - "gui.gm4.guidebook.crafting.display.shield_pattern.border": "\ue018\u0d6a", - "gui.gm4.guidebook.crafting.display.shield_pattern.bricks": "\ue018\u0d6b", - "gui.gm4.guidebook.crafting.display.shield_pattern.circle": "\ue018\u0d6c", - "gui.gm4.guidebook.crafting.display.shield_pattern.creeper": "\ue018\u0d6d", - "gui.gm4.guidebook.crafting.display.shield_pattern.cross": "\ue018\u0d6e", - "gui.gm4.guidebook.crafting.display.shield_pattern.curly_border": "\ue018\u0d6f", - "gui.gm4.guidebook.crafting.display.shield_pattern.diagonal_left": "\ue018\u0d70", - "gui.gm4.guidebook.crafting.display.shield_pattern.diagonal_right": "\ue018\u0d71", - "gui.gm4.guidebook.crafting.display.shield_pattern.diagonal_up_left": "\ue018\u0d72", - "gui.gm4.guidebook.crafting.display.shield_pattern.diagonal_up_right": "\ue018\u0d73", - "gui.gm4.guidebook.crafting.display.shield_pattern.flower": "\ue018\u0d74", - "gui.gm4.guidebook.crafting.display.shield_pattern.globe": "\ue018\u0d75", - "gui.gm4.guidebook.crafting.display.shield_pattern.gradient": "\ue018\u0d76", - "gui.gm4.guidebook.crafting.display.shield_pattern.gradient_up": "\ue018\u0d77", - "gui.gm4.guidebook.crafting.display.shield_pattern.half_horizontal": "\ue018\u0d78", - "gui.gm4.guidebook.crafting.display.shield_pattern.half_horizontal_bottom": "\ue018\u0d79", - "gui.gm4.guidebook.crafting.display.shield_pattern.half_vertical": "\ue018\u0d7a", - "gui.gm4.guidebook.crafting.display.shield_pattern.half_vertical_right": "\ue018\u0d7b", - "gui.gm4.guidebook.crafting.display.shield_pattern.mojang": "\ue018\u0d7c", - "gui.gm4.guidebook.crafting.display.shield_pattern.piglin": "\ue018\u0d7d", - "gui.gm4.guidebook.crafting.display.shield_pattern.rhombus": "\ue018\u0d7e", - "gui.gm4.guidebook.crafting.display.shield_pattern.skull": "\ue018\u0d7f", - "gui.gm4.guidebook.crafting.display.shield_pattern.small_stripes": "\ue018\u0d80", - "gui.gm4.guidebook.crafting.display.shield_pattern.square_bottom_left": "\ue018\u0d81", - "gui.gm4.guidebook.crafting.display.shield_pattern.square_bottom_right": "\ue018\u0d82", - "gui.gm4.guidebook.crafting.display.shield_pattern.square_top_left": "\ue018\u0d83", - "gui.gm4.guidebook.crafting.display.shield_pattern.square_top_right": "\ue018\u0d84", - "gui.gm4.guidebook.crafting.display.shield_pattern.straight_cross": "\ue018\u0d85", - "gui.gm4.guidebook.crafting.display.shield_pattern.stripe_bottom": "\ue018\u0d86", - "gui.gm4.guidebook.crafting.display.shield_pattern.stripe_center": "\ue018\u0d87", - "gui.gm4.guidebook.crafting.display.shield_pattern.stripe_downleft": "\ue018\u0d88", - "gui.gm4.guidebook.crafting.display.shield_pattern.stripe_downright": "\ue018\u0d89", - "gui.gm4.guidebook.crafting.display.shield_pattern.stripe_left": "\ue018\u0d8a", - "gui.gm4.guidebook.crafting.display.shield_pattern.stripe_middle": "\ue018\u0d8b", - "gui.gm4.guidebook.crafting.display.shield_pattern.stripe_right": "\ue018\u0d8c", - "gui.gm4.guidebook.crafting.display.shield_pattern.stripe_top": "\ue018\u0d8d", - "gui.gm4.guidebook.crafting.display.shield_pattern.triangle_bottom": "\ue018\u0d8e", - "gui.gm4.guidebook.crafting.display.shield_pattern.triangle_top": "\ue018\u0d8f", - "gui.gm4.guidebook.crafting.display.shield_pattern.triangles_bottom": "\ue018\u0d90", - "gui.gm4.guidebook.crafting.display.shield_pattern.triangles_top": "\ue018\u0d91", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_boat": "\u0d92\u0903\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_door": "\u0d93\u0904\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_sapling": "\u0d94\u0905\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.acacia_sign": "\u0d95\u0906\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.activator_rail": "\u0d96\u0907\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.allium": "\u0d97\u0908\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.amethyst_cluster": "\u0d98\u0909\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.amethyst_shard": "\u0d99\u090a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.apple": "\u0d9a\u090b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.armor_stand": "\u0d9b\u090c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.arrow": "\u0d9c\u090d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.axolotl_bucket": "\u0d9d\u090e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.azure_bluet": "\u0d9e\u090f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.baked_potato": "\u0d9f\u0910\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bamboo": "\u0da0\u0911\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.barrier": "\u0da1\u0912\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.beef": "\u0da2\u0913\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.beetroot": "\u0da3\u0914\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.beetroot_seeds": "\u0da4\u0915\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.beetroot_soup": "\u0da5\u0916\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bell": "\u0da6\u0917\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.birch_boat": "\u0da7\u0918\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.birch_door": "\u0da8\u0919\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.birch_sapling": "\u0da9\u091a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.birch_sign": "\u0daa\u091b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.black_candle": "\u0dab\u091c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.black_dye": "\u0dac\u091d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.black_stained_glass_pane": "\u0dad\u091e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.blaze_powder": "\u0dae\u091f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.blaze_rod": "\u0daf\u0920\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.blue_candle": "\u0db0\u0921\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.blue_dye": "\u0db1\u0922\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.blue_orchid": "\u0db2\u0923\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.blue_stained_glass_pane": "\u0db3\u0924\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bone": "\u0db4\u0925\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bone_meal": "\u0db5\u0926\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.book": "\u0db6\u0927\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bow": "\u0db7\u0928\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bowl": "\u0db8\u0929\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.brain_coral": "\u0db9\u092a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.brain_coral_fan": "\u0dba\u092b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bread": "\u0dbb\u092c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.brewing_stand": "\u0dbc\u092d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.brick": "\u0dbd\u092e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.broken_elytra": "\u0dbe\u092f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.brown_candle": "\u0dbf\u0930\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.brown_dye": "\u0dc0\u0931\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.brown_mushroom": "\u0dc1\u0932\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.brown_stained_glass_pane": "\u0dc2\u0933\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bubble_coral": "\u0dc3\u0934\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bubble_coral_fan": "\u0dc4\u0935\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bucket": "\u0dc5\u0936\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.bundle": "\u0dc6\u0937\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cake": "\u0dc8\u0939\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.campfire": "\u0dc9\u093a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.candle": "\u0dca\u093b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.carrot": "\u0dcb\u093c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.carrot_on_a_stick": "\u0dcc\u093d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cauldron": "\u0dcd\u093e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.chain": "\u0dce\u093f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.chainmail_boots": "\u0dcf\u0940\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.chainmail_chestplate": "\u0dd0\u0941\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.chainmail_helmet": "\u0dd1\u0942\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.chainmail_leggings": "\u0dd2\u0943\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.charcoal": "\u0dd3\u0944\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.chest_minecart": "\u0dd4\u0945\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.chicken": "\u0dd5\u0946\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.chorus_fruit": "\u0dd6\u0947\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.clay_ball": "\u0dd7\u0948\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.clock": "\u0dd8\u0949\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.coal": "\u0dd9\u094a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cobweb": "\u0dda\u094b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cocoa_beans": "\u0ddb\u094c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cod": "\u0ddc\u094d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cod_bucket": "\u0ddd\u094e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.command_block_minecart": "\u0dde\u094f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.comparator": "\u0ddf\u0950\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.compass": "\u0de0\u0951\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cooked_beef": "\u0de1\u0952\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cooked_chicken": "\u0de2\u0953\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cooked_cod": "\u0de3\u0954\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cooked_mutton": "\u0de4\u0955\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cooked_porkchop": "\u0de5\u0956\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cooked_rabbit": "\u0de6\u0957\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cooked_salmon": "\u0de7\u0958\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cookie": "\u0de8\u0959\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.copper_ingot": "\u0de9\u095a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cornflower": "\u0dea\u095b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.creeper_banner_pattern": "\u0deb\u095c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_door": "\u0dec\u095d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_fungus": "\u0ded\u095e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_roots": "\u0dee\u095f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.crimson_sign": "\u0def\u0960\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.crossbow": "\u0df0\u0961\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.crossbow_arrow": "\u0df1\u0962\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.crossbow_firework": "\u0df2\u0963\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_candle": "\u0df3\u0964\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_dye": "\u0df4\u0965\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.cyan_stained_glass_pane": "\u0df5\u0966\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dandelion": "\u0df6\u0967\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_boat": "\u0df7\u0968\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_door": "\u0df8\u0969\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_sapling": "\u0df9\u096a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dark_oak_sign": "\u0dfa\u096b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_brain_coral": "\u0dfb\u096c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_brain_coral_fan": "\u0dfc\u096d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_bubble_coral": "\u0dfd\u096e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_bubble_coral_fan": "\u0dfe\u096f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_bush": "\u0dff\u0970\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_fire_coral": "\u0e00\u0971\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_fire_coral_fan": "\u0e01\u0972\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_horn_coral": "\u0e02\u0973\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_horn_coral_fan": "\u0e03\u0974\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_tube_coral": "\u0e04\u0975\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dead_tube_coral_fan": "\u0e05\u0976\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.detector_rail": "\u0e06\u0977\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond": "\u0e07\u0978\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_axe": "\u0e08\u0979\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_boots": "\u0e09\u097a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_chestplate": "\u0e0a\u097b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_helmet": "\u0e0b\u097c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_hoe": "\u0e0c\u097d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_horse_armor": "\u0e0d\u097e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_leggings": "\u0e0e\u097f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_pickaxe": "\u0e0f\u0980\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_shovel": "\u0e10\u0981\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.diamond_sword": "\u0e11\u0982\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dragon_breath": "\u0e12\u0983\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.dried_kelp": "\u0e13\u0984\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.egg": "\u0e14\u0985\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.elytra": "\u0e15\u0986\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.emerald": "\u0e16\u0987\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.enchanted_book": "\u0e17\u0988\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.end_crystal": "\u0e18\u0989\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.ender_eye": "\u0e19\u098a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.ender_pearl": "\u0e1a\u098b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.experience_bottle": "\u0e1b\u098c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.feather": "\u0e1c\u098d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.fermented_spider_eye": "\u0e1d\u098e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.fern": "\u0e1e\u098f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.filled_map": "\u0e1f\u0990\uf015", - "gui.gm4.guidebook.crafting.display.overlay.minecraft.filled_map_markings": "\uffff\ue018\u0e20\u0991\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.fire_charge": "\u0e21\u0992\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.fire_coral": "\u0e22\u0993\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.fire_coral_fan": "\u0e23\u0994\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.firework_rocket": "\u0e24\u0995\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.firework_star": "\u0e25\u0996\uf015", - "gui.gm4.guidebook.crafting.display.overlay.minecraft.firework_star": "\uffff\ue018\u0e26\u0997\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.fishing_rod": "\u0e27\u0998\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.flint": "\u0e28\u0999\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.flint_and_steel": "\u0e29\u099a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.flower_banner_pattern": "\u0e2a\u099b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.flower_pot": "\u0e2b\u099c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.furnace_minecart": "\u0e2c\u099d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.ghast_tear": "\u0e2d\u099e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.glass_bottle": "\u0e2e\u099f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.glass_pane": "\u0e2f\u09a0\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.glistering_melon_slice": "\u0e30\u09a1\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.globe_banner_pattern": "\u0e31\u09a2\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.glow_berries": "\u0e32\u09a3\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.glow_ink_sac": "\u0e33\u09a4\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.glow_item_frame": "\u0e34\u09a5\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.glow_lichen": "\u0e35\u09a6\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.glowstone_dust": "\u0e36\u09a7\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.gold_ingot": "\u0e37\u09a8\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.gold_nugget": "\u0e38\u09a9\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_apple": "\u0e39\u09aa\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.enchanted_golden_apple": "\u0e39\u09aa\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_axe": "\u0e3a\u09ab\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_boots": "\u0e3b\u09ac\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_carrot": "\u0e3c\u09ad\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_chestplate": "\u0e3d\u09ae\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_helmet": "\u0e3e\u09af\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_hoe": "\u0e3f\u09b0\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_horse_armor": "\u0e40\u09b1\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_leggings": "\u0e41\u09b2\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_pickaxe": "\u0e42\u09b3\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_shovel": "\u0e43\u09b4\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.golden_sword": "\u0e44\u09b5\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.grass": "\u0e45\u09b6\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.gray_candle": "\u0e46\u09b7\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.gray_dye": "\u0e47\u09b8\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.gray_stained_glass_pane": "\u0e48\u09b9\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.green_candle": "\u0e49\u09ba\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.green_dye": "\u0e4a\u09bb\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.green_stained_glass_pane": "\u0e4b\u09bc\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.gunpowder": "\u0e4c\u09bd\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.hanging_roots": "\u0e4d\u09be\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.heart_of_the_sea": "\u0e4e\u09bf\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.honey_bottle": "\u0e4f\u09c0\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.honeycomb": "\u0e50\u09c1\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.hopper": "\u0e51\u09c2\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.hopper_minecart": "\u0e52\u09c3\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.horn_coral": "\u0e53\u09c4\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.horn_coral_fan": "\u0e54\u09c5\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.ink_sac": "\u0e55\u09c6\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_axe": "\u0e56\u09c7\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_bars": "\u0e57\u09c8\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_boots": "\u0e58\u09c9\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_chestplate": "\u0e59\u09ca\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_door": "\u0e5a\u09cb\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_helmet": "\u0e5b\u09cc\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_hoe": "\u0e5c\u09cd\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_horse_armor": "\u0e5d\u09ce\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_ingot": "\u0e5e\u09cf\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_leggings": "\u0e5f\u09d0\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_nugget": "\u0e60\u09d1\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_pickaxe": "\u0e61\u09d2\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_shovel": "\u0e62\u09d3\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.iron_sword": "\u0e63\u09d4\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.item_frame": "\u0e64\u09d5\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_boat": "\u0e65\u09d6\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_door": "\u0e66\u09d7\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_sapling": "\u0e67\u09d8\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.jungle_sign": "\u0e68\u09d9\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.kelp": "\u0e69\u09da\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.knowledge_book": "\u0e6a\u09db\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.ladder": "\u0e6b\u09dc\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lantern": "\u0e6c\u09dd\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lapis_lazuli": "\u0e6d\u09de\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.large_amethyst_bud": "\u0e6e\u09df\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.large_fern": "\u0e6f\u09e0\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lava_bucket": "\u0e70\u09e1\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lead": "\u0e71\u09e2\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.leather": "\u0e72\u09e3\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.leather_boots": "\u0e73\u09e4\uf015", - "gui.gm4.guidebook.crafting.display.overlay.minecraft.leather_boots": "\uffff\ue018\u0e74\u09e5\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.leather_chestplate": "\u0e75\u09e6\uf015", - "gui.gm4.guidebook.crafting.display.overlay.minecraft.leather_chestplate": "\uffff\ue018\u0e76\u09e7\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.leather_helmet": "\u0e77\u09e8\uf015", - "gui.gm4.guidebook.crafting.display.overlay.minecraft.leather_helmet": "\uffff\ue018\u0e78\u09e9\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.leather_horse_armor": "\u0e79\u09ea\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.leather_leggings": "\u0e7a\u09eb\uf015", - "gui.gm4.guidebook.crafting.display.overlay.minecraft.leather_leggings": "\uffff\ue018\u0e7b\u09ec\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lever": "\u0e7c\u09ed\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light": "\u0e7d\u09ee\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_00": "\u0e7e\u09ef\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_01": "\u0e7f\u09f0\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_02": "\u0e80\u09f1\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_03": "\u0e81\u09f2\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_04": "\u0e82\u09f3\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_05": "\u0e83\u09f4\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_06": "\u0e84\u09f5\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_07": "\u0e85\u09f6\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_08": "\u0e86\u09f7\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_09": "\u0e87\u09f8\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_10": "\u0e88\u09f9\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_11": "\u0e89\u09fa\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_12": "\u0e8a\u09fb\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_13": "\u0e8b\u09fc\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_14": "\u0e8c\u09fd\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_15": "\u0e8d\u09fe\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_candle": "\u0e8e\u09ff\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_dye": "\u0e8f\u0a00\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_blue_stained_glass_pane": "\u0e90\u0a01\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_candle": "\u0e91\u0a02\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_dye": "\u0e92\u0a03\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.light_gray_stained_glass_pane": "\u0e93\u0a04\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lilac": "\u0e94\u0a05\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lily_of_the_valley": "\u0e95\u0a06\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lily_pad": "\u0e96\u0a07\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lime_candle": "\u0e97\u0a08\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lime_dye": "\u0e98\u0a09\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lime_stained_glass_pane": "\u0e99\u0a0a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.lingering_potion": "\u0e9a\u0a0b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_candle": "\u0e9b\u0a0c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_dye": "\u0e9c\u0a0d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.magenta_stained_glass_pane": "\u0e9d\u0a0e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.magma_cream": "\u0e9e\u0a0f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.map": "\u0e9f\u0a10\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.medium_amethyst_bud": "\u0ea0\u0a11\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.melon_seeds": "\u0ea1\u0a12\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.melon_slice": "\u0ea2\u0a13\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.milk_bucket": "\u0ea3\u0a14\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.minecart": "\u0ea4\u0a15\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.mojang_banner_pattern": "\u0ea5\u0a16\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.mushroom_stew": "\u0ea6\u0a17\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_11": "\u0ea7\u0a18\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_13": "\u0ea8\u0a19\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_blocks": "\u0ea9\u0a1a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_cat": "\u0eaa\u0a1b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_chirp": "\u0eab\u0a1c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_far": "\u0eac\u0a1d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_mall": "\u0ead\u0a1e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_mellohi": "\u0eae\u0a1f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_pigstep": "\u0eaf\u0a20\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_stal": "\u0eb0\u0a21\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_strad": "\u0eb1\u0a22\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_wait": "\u0eb2\u0a23\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.music_disc_ward": "\u0eb3\u0a24\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.mutton": "\u0eb4\u0a25\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.name_tag": "\u0eb5\u0a26\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.nautilus_shell": "\u0eb6\u0a27\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.nether_brick": "\u0eb7\u0a28\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.nether_sprouts": "\u0eb8\u0a29\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.nether_star": "\u0eb9\u0a2a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.nether_wart": "\u0eba\u0a2b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_axe": "\u0ebb\u0a2c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_boots": "\u0ebc\u0a2d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_chestplate": "\u0ebd\u0a2e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_helmet": "\u0ebe\u0a2f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_hoe": "\u0ebf\u0a30\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_ingot": "\u0ec0\u0a31\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_leggings": "\u0ec1\u0a32\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_pickaxe": "\u0ec2\u0a33\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_scrap": "\u0ec3\u0a34\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_shovel": "\u0ec4\u0a35\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.netherite_sword": "\u0ec5\u0a36\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.oak_boat": "\u0ec6\u0a37\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.oak_door": "\u0ec7\u0a38\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.oak_sapling": "\u0ec8\u0a39\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.oak_sign": "\u0ec9\u0a3a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.orange_candle": "\u0eca\u0a3b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.orange_dye": "\u0ecb\u0a3c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.orange_stained_glass_pane": "\u0ecc\u0a3d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.orange_tulip": "\u0ecd\u0a3e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.oxeye_daisy": "\u0ece\u0a3f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.painting": "\u0ecf\u0a40\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.paper": "\u0ed0\u0a41\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.peony": "\u0ed1\u0a42\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.phantom_membrane": "\u0ed2\u0a43\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.piglin_banner_pattern": "\u0ed3\u0a44\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.pink_candle": "\u0ed4\u0a45\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.pink_dye": "\u0ed5\u0a46\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.pink_stained_glass_pane": "\u0ed6\u0a47\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.pink_tulip": "\u0ed7\u0a48\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.pointed_dripstone": "\u0ed8\u0a49\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.poisonous_potato": "\u0ed9\u0a4a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.popped_chorus_fruit": "\u0eda\u0a4b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.poppy": "\u0edb\u0a4c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.porkchop": "\u0edc\u0a4d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.potato": "\u0edd\u0a4e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.potion": "\u0ede\u0a4f\uf015", - "gui.gm4.guidebook.crafting.display.overlay.minecraft.potion": "\uffff\ue018\u0edf\u0a50\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.powder_snow_bucket": "\u0ee0\u0a51\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.powered_rail": "\u0ee1\u0a52\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.prismarine_crystals": "\u0ee2\u0a53\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.prismarine_shard": "\u0ee3\u0a54\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.pufferfish": "\u0ee4\u0a55\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.pufferfish_bucket": "\u0ee5\u0a56\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.pumpkin_pie": "\u0ee6\u0a57\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.pumpkin_seeds": "\u0ee7\u0a58\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.purple_candle": "\u0ee8\u0a59\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.purple_dye": "\u0ee9\u0a5a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.purple_stained_glass_pane": "\u0eea\u0a5b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.quartz": "\u0eeb\u0a5c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.rabbit": "\u0eec\u0a5d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.rabbit_foot": "\u0eed\u0a5e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.rabbit_hide": "\u0eee\u0a5f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.rabbit_stew": "\u0eef\u0a60\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.rail": "\u0ef0\u0a61\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.raw_copper": "\u0ef1\u0a62\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.raw_gold": "\u0ef2\u0a63\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.raw_iron": "\u0ef3\u0a64\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.red_candle": "\u0ef4\u0a65\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.red_dye": "\u0ef5\u0a66\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.red_mushroom": "\u0ef6\u0a67\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.red_stained_glass_pane": "\u0ef7\u0a68\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.red_tulip": "\u0ef8\u0a69\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.redstone": "\u0ef9\u0a6a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.redstone_torch": "\u0efa\u0a6b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.repeater": "\u0efb\u0a6c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.rose_bush": "\u0efc\u0a6d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.rotten_flesh": "\u0efd\u0a6e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.saddle": "\u0efe\u0a6f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.salmon": "\u0eff\u0a70\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.salmon_bucket": "\u0f00\u0a71\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.turtle_scute": "\u0f01\u0a72\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.sea_pickle": "\u0f02\u0a73\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.seagrass": "\u0f03\u0a74\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.shears": "\u0f04\u0a75\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.shulker_shell": "\u0f05\u0a76\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.skull_banner_pattern": "\u0f06\u0a77\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.slime_ball": "\u0f07\u0a78\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.small_amethyst_bud": "\u0f08\u0a79\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.snowball": "\u0f09\u0a7a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.soul_campfire": "\u0f0a\u0a7b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.soul_lantern": "\u0f0b\u0a7c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.soul_torch": "\u0f0c\u0a7d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.spectral_arrow": "\u0f0f\u0a80\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.spider_eye": "\u0f10\u0a81\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.splash_potion": "\u0f11\u0a82\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_boat": "\u0f12\u0a83\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_door": "\u0f13\u0a84\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_sapling": "\u0f14\u0a85\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.spruce_sign": "\u0f15\u0a86\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.spyglass": "\u0f16\u0a87\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.stick": "\u0f17\u0a88\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.stone_axe": "\u0f18\u0a89\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.stone_hoe": "\u0f19\u0a8a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.stone_pickaxe": "\u0f1a\u0a8b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.stone_shovel": "\u0f1b\u0a8c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.stone_sword": "\u0f1c\u0a8d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.string": "\u0f1d\u0a8e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.structure_void": "\u0f1e\u0a8f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.sugar": "\u0f1f\u0a90\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.sugar_cane": "\u0f20\u0a91\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.sunflower": "\u0f21\u0a92\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.suspicious_stew": "\u0f22\u0a93\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.sweet_berries": "\u0f23\u0a94\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.tall_grass": "\u0f24\u0a95\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.tipped_arrow": "\u0f25\u0a96\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.tipped_arrow_base": "\u0f26\u0a97\uf015", - "gui.gm4.guidebook.crafting.display.overlay.minecraft.tipped_arrow_head": "\uffff\ue018\u0f27\u0a98\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.tnt_minecart": "\u0f28\u0a99\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.torch": "\u0f29\u0a9a\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.totem_of_undying": "\u0f2a\u0a9b\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.trident": "\u0f2b\u0a9c\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.tripwire_hook": "\u0f2c\u0a9d\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.tropical_fish": "\u0f2d\u0a9e\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.tropical_fish_bucket": "\u0f2e\u0a9f\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.tube_coral": "\u0f2f\u0aa0\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.tube_coral_fan": "\u0f30\u0aa1\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.turtle_egg": "\u0f31\u0aa2\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.turtle_helmet": "\u0f32\u0aa3\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.twisting_vines": "\u0f33\u0aa4\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.vine": "\u0f34\u0aa5\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.warped_door": "\u0f35\u0aa6\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.warped_fungus": "\u0f36\u0aa7\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.warped_fungus_on_a_stick": "\u0f37\u0aa8\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.warped_roots": "\u0f38\u0aa9\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.warped_sign": "\u0f39\u0aaa\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.water_bucket": "\u0f3a\u0aab\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.weeping_vines": "\u0f3b\u0aac\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.wheat": "\u0f3c\u0aad\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.wheat_seeds": "\u0f3d\u0aae\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.white_candle": "\u0f3e\u0aaf\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.white_dye": "\u0f3f\u0ab0\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.white_stained_glass_pane": "\u0f40\u0ab1\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.white_tulip": "\u0f41\u0ab2\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.wither_rose": "\u0f42\u0ab3\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.wooden_axe": "\u0f43\u0ab4\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.wooden_hoe": "\u0f44\u0ab5\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.wooden_pickaxe": "\u0f45\u0ab6\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.wooden_shovel": "\u0f46\u0ab7\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.wooden_sword": "\u0f47\u0ab8\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.writable_book": "\u0f48\u0ab9\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.written_book": "\u0f49\u0aba\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_candle": "\u0f4a\u0abb\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_dye": "\u0f4b\u0abc\uf015", - "gui.gm4.guidebook.crafting.display.minecraft.yellow_stained_glass_pane": "\u0f4c\u0abd\uf015", - "gui.gm4.guidebook.crafting.display.overlay.gm4.boots_of_ostara": "\uffff\ue018\u4101\u4201\uf015", - "gui.gm4.guidebook.crafting.display.gm4.boots_of_ostara": "\u4102\u4202\uf015", - "gui.gm4.guidebook.crafting.display.overlay.gm4.flippers": "\uffff\ue018\u4103\u4203\uf015", - "gui.gm4.guidebook.crafting.display.gm4.flippers": "\u4104\u4204\uf015", - "gui.gm4.guidebook.crafting.display.gm4.scuba_helmet": "\u4105\u4205\uf015", - "gui.gm4.guidebook.crafting.display.gm4.scuba_tank": "\u4106\u4206\uf015", - "gui.gm4.guidebook.crafting.display.gm4.secret_trapped_oak_sign": "\u4107\u4207\uf015", - "gui.gm4.guidebook.crafting.display.gm4.trapped_oak_sign": "\u4108\u4208\uf015", - "gui.gm4.guidebook.crafting.display.gm4.relocator": "\u4012", - "gui.gm4.guidebook.crafting.display.gm4.tier_1_heart_canister": "\u4109\u4209\uf015", - "gui.gm4.guidebook.crafting.display.gm4.tier_2_heart_canister": "\u4013", - "gui.gm4.guidebook.crafting.display.gm4.piston_minecart": "\u4110\u4210\uf015", - "gui.gm4.guidebook.crafting.display.gm4.landmine": "\u4014", - "gui.gm4.guidebook.crafting.display.gm4.landmine.crafting_table": "\u4015", - "gui.gm4.guidebook.crafting.display.gm4.landmine.invisible": "\u4016", - "gui.gm4.guidebook.crafting.display.gm4.soft_defuser": "\u4017", - "gui.gm4.guidebook.crafting.display.overlay.gm4.orb_of_ankou": "\uffff\ue018\u4111\u4211\uf015", - "gui.gm4.guidebook.crafting.display.gm4.orb_of_ankou": "\u4112\u4212\uf015" -} diff --git a/gm4_guidebook/beet.yaml b/gm4_guidebook/beet.yaml index 508d7d9564..0f0d1c6591 100644 --- a/gm4_guidebook/beet.yaml +++ b/gm4_guidebook/beet.yaml @@ -7,13 +7,6 @@ data_pack: resource_pack: load: . - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 64 - min_format: 1 - max_format: 64 - directory: backport_64 require: - bolt @@ -22,7 +15,6 @@ pipeline: - legacy_item_sheet - gm4.plugins.extend.module - gm4.plugins.include.lib_forceload - - gm4_guidebook.fix_overlays meta: gm4: @@ -45,7 +37,6 @@ meta: - text.gm4.guidebook.prev - text.gm4.guidebook.refresh - text.gm4.guidebook.return_to_toc - - text.gm4.guidebook.table_of_contents - text.gm4.guidebook.undiscovered - text.gm4.guidebook.jump_to_section website: diff --git a/gm4_guidebook/data/gm4_guidebook/function/init.mcfunction b/gm4_guidebook/data/gm4_guidebook/function/init.mcfunction index 23a9ff08ca..6a99517bf9 100644 --- a/gm4_guidebook/data/gm4_guidebook/function/init.mcfunction +++ b/gm4_guidebook/data/gm4_guidebook/function/init.mcfunction @@ -14,9 +14,6 @@ scoreboard players set #100 gm4_guide 100 scoreboard players set #intro gm4_guide_pages 1 scoreboard players reset $module_count gm4_guide -#declare storage gm4_guidebook:temp -#declare storage gm4_guidebook:register -#declare storage gm4_guidebook:pages schedule function gm4_guidebook:update_storage/setup_markers 1t scoreboard players set $ready gm4_guide 0 diff --git a/gm4_guidebook/data/gm4_guidebook/function/lecterns/section/check_page/toc.mcfunction b/gm4_guidebook/data/gm4_guidebook/function/lecterns/section/check_page/toc.mcfunction index a5caa98dba..c0bb3263be 100644 --- a/gm4_guidebook/data/gm4_guidebook/function/lecterns/section/check_page/toc.mcfunction +++ b/gm4_guidebook/data/gm4_guidebook/function/lecterns/section/check_page/toc.mcfunction @@ -6,7 +6,7 @@ scoreboard players set $toc gm4_guide_pages 1 # if 0, jump to TOC (refresh) -execute if score $page gm4_guide_pages matches 0 run function gm4_guidebook:lecterns/section/update/toc/jump with storage gm4_guidebook:register +execute if score $page gm4_guide_pages matches 0 run function gm4_guidebook:lecterns/section/update/toc/jump # else, figure out what section to jump to # execute if score $page gm4_guide_pages matches 0..1 run return diff --git a/gm4_guidebook/data/gm4_guidebook/function/lecterns/section/toc/find_player.mcfunction b/gm4_guidebook/data/gm4_guidebook/function/lecterns/section/toc/find_player.mcfunction index 03cbdd5d55..236054e5c5 100644 --- a/gm4_guidebook/data/gm4_guidebook/function/lecterns/section/toc/find_player.mcfunction +++ b/gm4_guidebook/data/gm4_guidebook/function/lecterns/section/toc/find_player.mcfunction @@ -5,7 +5,7 @@ # execute as player, at block scoreboard players operation $current gm4_guide_id = @s gm4_guide_id -execute as @a[distance=..6] if score @s gm4_guide_id = $current gm4_guide_id run function gm4_guidebook:lecterns/section/toc/jump with storage gm4_guidebook:register +execute as @a[distance=..6] if score @s gm4_guide_id = $current gm4_guide_id run function gm4_guidebook:lecterns/section/toc/jump # mark toc tag @s remove gm4_guide_toc diff --git a/gm4_guidebook/data/gm4_guidebook/function/update_storage/build_toc.mcfunction b/gm4_guidebook/data/gm4_guidebook/function/update_storage/build_toc.mcfunction index 7bb8701eae..1886c24371 100644 --- a/gm4_guidebook/data/gm4_guidebook/function/update_storage/build_toc.mcfunction +++ b/gm4_guidebook/data/gm4_guidebook/function/update_storage/build_toc.mcfunction @@ -15,7 +15,7 @@ execute store result score $expansion_count gm4_guide run data get storage gm4_g # build pages scoreboard players operation $front_matter gm4_guide_pages = #intro gm4_guide_pages data modify storage gm4_guidebook:temp prev_trigger_order set from storage gm4_guidebook:register trigger_order -data merge storage gm4_guidebook:register {table_of_contents:[],trigger_order:[],lectern_toc:[["",{"translate":"gui.gm4.guidebook.page.toc","fallback":"","color":"white","font":"gm4:guidebook"}],["",{"translate":"gui.gm4.guidebook.page.intro","fallback": "","color": "white","font": "gm4:guidebook"},{"translate":"text.gm4.guidebook.introduction","fallback":"Introduction","underlined":true},{"text":"\n\n"},{"translate":"text.gm4.guidebook.letter","fallback":"This is a world unlike others. It appears that certain things work...differently to say the least.\n\nThis book will document discoveries regarding these new mechanics."},{"text":"\n\n> ","color":"#4AA0C7"},{"translate":"text.gm4.guidebook.refresh_findings","fallback":"Refresh Findings","color":"#4AA0C7","hover_event":{"action":"show_text","value":[{"translate":"text.gm4.guidebook.refresh_toc","fallback":"Refresh Table of Contents","color":"gold"}]},"click_event":{"action":"change_page","page":1}}]]} +data merge storage gm4_guidebook:register {trigger_order:[],lectern_toc:[["",{"translate":"gui.gm4.guidebook.page.toc","fallback":"","color":"white","font":"gm4:guidebook"}],["",{"translate":"gui.gm4.guidebook.page.intro","fallback": "","color": "white","font": "gm4:guidebook"},{"translate":"text.gm4.guidebook.introduction","fallback":"Introduction","underlined":true},{"text":"\n\n"},{"translate":"text.gm4.guidebook.letter","fallback":"This is a world unlike others. It appears that certain things work...differently to say the least.\n\nThis book will document discoveries regarding these new mechanics."},{"text":"\n\n> ","color":"#4AA0C7"},{"translate":"text.gm4.guidebook.refresh_findings","fallback":"Refresh Findings","color":"#4AA0C7","hover_event":{"action":"show_text","value":[{"translate":"text.gm4.guidebook.refresh_toc","fallback":"Refresh Table of Contents","color":"gold"}]},"click_event":{"action":"change_page","page":1}}]]} data merge storage gm4_guidebook:temp {lectern_pages:[],toc_back:[]} function gm4_guidebook:update_storage/build_page diff --git a/gm4_guidebook/data/gm4_guidebook/loot_table/items/guidebook.json b/gm4_guidebook/data/gm4_guidebook/loot_table/items/guidebook.json index 1eaee999f2..992a94b7e2 100644 --- a/gm4_guidebook/data/gm4_guidebook/loot_table/items/guidebook.json +++ b/gm4_guidebook/data/gm4_guidebook/loot_table/items/guidebook.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "gm4_guidebook:item/guidebook", + "minecraft:custom_model_data": {"strings":["gm4_guidebook:item/guidebook"]}, "minecraft:written_book_content": { "pages": [ ["",{"translate":"gui.gm4.guidebook.page.intro","fallback": "","color": "white","font": "gm4:guidebook"},{"translate":"text.gm4.guidebook.introduction","fallback":"Introduction","underlined":true},{"text":"\n\n"},{"translate":"text.gm4.guidebook.letter","fallback":"This is a world unlike others. It appears that certain things work...differently to say the least.\n\nThis book will document discoveries regarding these new mechanics."},{"text":"\n\n> ","color":"#4AA0C7"},{"translate":"text.gm4.guidebook.refresh_findings","fallback":"Refresh Findings","color":"#4AA0C7","hover_event":{"action":"show_text","value":[{"translate":"text.gm4.guidebook.refresh_toc","fallback":"Refresh Table of Contents","color":"gold"}]},"click_event":{"action":"run_command","command":"/trigger gm4_guide set 1"}}] @@ -27,10 +27,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "text.gm4.guidebook.title", - "fallback": "Gamemode 4 Guidebook", - "italic": false + "fallback": "Gamemode 4 Guidebook" } } ] diff --git a/gm4_guidebook/fix_overlays.py b/gm4_guidebook/fix_overlays.py deleted file mode 100644 index 26586c0032..0000000000 --- a/gm4_guidebook/fix_overlays.py +++ /dev/null @@ -1,5 +0,0 @@ -from beet import Context - -# Due to a bug in beet, we need to manually set the overlay formats -def beet_default(ctx: Context): - del ctx.data.overlays["backport_64"] diff --git a/gm4_guidebook/generate_guidebooks.py b/gm4_guidebook/generate_guidebooks.py index 3e96d3221f..6155f84be7 100644 --- a/gm4_guidebook/generate_guidebooks.py +++ b/gm4_guidebook/generate_guidebooks.py @@ -15,7 +15,6 @@ Function, JsonFile, JsonFileBase, - LootTable, Model, NamespaceContainer, NamespaceFileScope, @@ -27,8 +26,6 @@ from PIL import Image, ImageDraw from pydantic import BaseModel -from gm4.plugins.player_heads import Skin - logger = logging.getLogger(__name__) # TODO: @@ -96,13 +93,6 @@ class GuidebookPages(JsonFileBase[Book]): data: ClassVar[FileDeserialize[Book]] = FileDeserialize() model = Book # tell beet to parse this file using the Book data model -class CustomCrafterRecipe(JsonFile): - """defines a custom beet filetype for CC recipes""" - scope: ClassVar[NamespaceFileScope] = ("gm4_recipes",) - extension: ClassVar[str] = ".json" - - # NOTE in the future, this can be moved to wherever we auto-generate CC recipes from - def load_page_data(ctx: Context): """registers guidebook files with the beet file loader""" @@ -110,11 +100,6 @@ def load_page_data(ctx: Context): yield ctx.data[GuidebookPages].clear() -def load_custom_recipes(ctx: Context): - ctx.data.extend_namespace.append(CustomCrafterRecipe) - yield - ctx.data[CustomCrafterRecipe].clear() - def beet_default(ctx: Context): if not ctx.data[GuidebookPages]: @@ -799,61 +784,49 @@ def generate_lectern_header(book: Book) -> list[dict[Any, Any]|str]: return header - """ -Reads a loot table (custom item) and creates a JSON text component to display the item in the guidebook +Reads a vanilla item and creates a JSON text component to display the item in the guidebook """ -def loottable_to_display(loottable: str, data: dict[Any,Any], ctx: Context) -> tuple[TextComponent, TextComponent]: - item = loottable.split(":")[1].split("/")[-1] - if "gm4" in loottable: - item = f"gm4.{item}" - else: - item = f"minecraft.{item}" - - loot = ctx.data.loot_tables[loottable].data - - if len(loot["pools"]) > 1: - raise ValueError("Loot table has multiple pools") - if len(loot["pools"][0]["entries"]) > 1: - raise ValueError("Loot table has multiple entries") - if "item" not in loot["pools"][0]["entries"][0]["type"]: - raise ValueError("Loot table does not return an item") - - # get item id, name, lore, and color - entry: dict[Any, Any] = loot["pools"][0]["entries"][0] - item_id: str = entry["name"] - profile_name: str = "" - name: TextComponent = "" - display_color = data["guidebook"]["display_color"] if (item_id in IS_DYED and "guidebook" in data and "display_color" in data["guidebook"]) else DEFAULT_COLORS[item_id] if item_id in DEFAULT_COLORS else 16777215 # white - overlay_color = data["guidebook"]["overlay_color"] if (item_id in OVERLAY_DYED and "guidebook" in data and "overlay_color" in data["guidebook"]) else DEFAULT_OVERLAY_COLORS[item_id] if item_id in DEFAULT_OVERLAY_COLORS else 16777215 # white - lore: list[str] = [] - if "functions" in entry: - for function in entry["functions"]: - if "set_name" in function["function"]: - name = function["name"] - elif "set_lore" in function["function"]: - for line in function["lore"]: - lore.append(line) - elif "set_components" in function["function"]: - for key, value in function["components"].items(): - if "profile" in key: - profile_name = value if isinstance(value, str) else value.get("name", "") - - # color - # if "player_head" in item_id and "$" in profile_name: - # skull_owner = profile_name.replace("$","") - # if ":" not in skull_owner: - # skull_owner = f"{ctx.project_id}:{skull_owner}" # NOTE gm4.utils will have an add_namespace helper function after the RP PR - # skin = ctx.data[Skin][skull_owner] - - # color = get_texture_color(skin) - - # else: +def item_to_display(item: str, components: dict[str, Any] | None, ctx: Context) -> tuple[TextComponent, TextComponent]: vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '1.21.5' - color = get_texture_color(intuit_item_texture(item_id, vanilla)) + vanilla.minecraft_version = '1.21.11' + if item == "air": + # show empty slot + slot = { + "translate": "gm4.second", + "fallback": "%1$s", + "with": [ + { + "text": " ☐ " + }, + { + "translate": "gui.gm4.guidebook.crafting.display.empty_slot", + "fallback": " ☐ ", + "color": "white", + "font": "gm4:guidebook" + } + ] + } + slot_under = { + "translate": "gm4.second", + "fallback": "%1$s", + "with": [ + { + "text": " ☐", + "color": "#fcfcf0" + }, + { + "translate": "gui.gm4.guidebook.crafting.display.empty_slot.under", + "fallback": " ☐", + "color": "white", + "font": "gm4:guidebook" + } + ] + } + return slot, slot_under - # create slot + color = get_texture_color(intuit_item_texture(item, vanilla)) + # TODO 26.1 slot: dict[Any, Any] = { "translate": "gm4.second", "fallback": "%1$s", @@ -864,22 +837,23 @@ def loottable_to_display(loottable: str, data: dict[Any,Any], ctx: Context) -> t }, [ { - "translate": f"gui.gm4.guidebook.crafting.display.{item}", + "translate": f"gui.gm4.guidebook.crafting.display.{item.replace(':','.')}", "fallback": " ☒ ", - "color": f"#{format(display_color, 'x')}", + "color": f"#{format(16777215, 'x')}", "font": "gm4:guidebook" }, { - "translate": f"gui.gm4.guidebook.crafting.display.overlay.{item}", + "translate": f"gui.gm4.guidebook.crafting.display.overlay.{item.replace(':','.')}", "fallback": "", - "color": f"#{format(overlay_color, 'x')}", + "color": f"#{format(16777215, 'x')}", "font": "gm4:guidebook" } ] ], "hover_event": { "action": "show_item", - "id": item_id + "id": item, + **({"components": components} if components else {}), } } slot_under: dict[Any, Any] = { @@ -899,160 +873,47 @@ def loottable_to_display(loottable: str, data: dict[Any,Any], ctx: Context) -> t ], "hover_event": { "action": "show_item", - "id": item_id + "id": item, + **({"components": components} if components else {}), } } - - # custom display name and lore - if name != "": - if "components" not in slot["hover_event"]: - slot["hover_event"]["components"] = {} - if "components" not in slot_under["hover_event"]: - slot_under["hover_event"]["components"] = {} - slot["hover_event"]["components"]["minecraft:custom_name"] = name - slot_under["hover_event"]["components"]["minecraft:custom_name"] = name - if len(lore) > 0: - if "components" not in slot["hover_event"]: - slot["hover_event"]["components"] = {} - if "components" not in slot_under["hover_event"]: - slot_under["hover_event"]["components"] = {} - slot["hover_event"]["components"]["minecraft:lore"] = lore - slot_under["hover_event"]["components"]["minecraft:lore"] = lore - return slot, slot_under - - - -""" -Reads a vanilla item and creates a JSON text component to display the item in the guidebook -""" -def item_to_display(ingredient: dict[Any, Any], ctx: Context) -> tuple[TextComponent, TextComponent]: - vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '1.21.5' - if ingredient.get("id") == "empty": - # show empty slot () - slot = { - "translate": "gm4.second", - "fallback": "%1$s", - "with": [ - { - "text": " ☐ " - }, - { - "translate": "gui.gm4.guidebook.crafting.display.empty_slot", - "fallback": " ☐ ", - "color": "white", - "font": "gm4:guidebook" - } - ] - } - slot_under = { - "translate": "gm4.second", - "fallback": "%1$s", - "with": [ - { - "text": " ☐", - "color": "#fcfcf0" - }, - { - "translate": "gui.gm4.guidebook.crafting.display.empty_slot.under", - "fallback": " ☐", - "color": "white", - "font": "gm4:guidebook" - } - ] - } - else: - # show filled slot (colored with a hover event) - if "display" in ingredient and "loot_table" in ingredient["display"]["type"]: - return loottable_to_display(ingredient["display"]["name"], ingredient, ctx) - else: - if "display" in ingredient and "item" in ingredient["display"]["type"]: - item = ingredient["display"]["name"] - else: - item = ingredient["id"] - color = get_texture_color(intuit_item_texture(item, vanilla)) - display_color = ingredient["guidebook"]["display_color"] if (item in IS_DYED and "guidebook" in ingredient and "display_color" in ingredient["guidebook"]) else ingredient["components"]["minecraft:dyed_color"] if (item in IS_DYED and "components" in ingredient and "minecraft:dyed_color" in ingredient["components"]) else DEFAULT_COLORS[item] if item in DEFAULT_COLORS else 16777215 # white - overlay_color = ingredient["guidebook"]["overlay_color"] if (item in OVERLAY_DYED and "guidebook" in ingredient and "overlay_color" in ingredient["guidebook"]) else ingredient["components"]["minecraft:dyed_color"] if (item in OVERLAY_DYED and"components" in ingredient and "minecraft:dyed_color" in ingredient["components"]) else DEFAULT_OVERLAY_COLORS[item] if item in DEFAULT_OVERLAY_COLORS else 16777215 # white - if "image" in ingredient: - image = ingredient["image"] - else: - image = item - slot: dict[Any, Any] = { - "translate": "gm4.second", - "fallback": "%1$s", - "with": [ - { - "text": " ☒ ", - "color": color - }, - [ - { - "translate": f"gui.gm4.guidebook.crafting.display.{image.replace(':','.')}", - "fallback": " ☒ ", - "color": f"#{format(display_color, 'x')}", - "font": "gm4:guidebook" - }, - { - "translate": f"gui.gm4.guidebook.crafting.display.overlay.{image.replace(':','.')}", - "fallback": "", - "color": f"#{format(overlay_color, 'x')}", - "font": "gm4:guidebook" - } - ] - ], - "hover_event": { - "action": "show_item", - "id": item - } - } - slot_under: dict[Any, Any] = { - "translate": "gm4.second", - "fallback": "%1$s", - "with": [ - { - "text": " ☒", - "color": "#fcfcf0" - }, - { - "translate": "gui.gm4.guidebook.crafting.display.filled_slot.under", - "fallback": " ☒", - "color": "white", - "font": "gm4:guidebook" - } - ], - "hover_event": { - "action": "show_item", - "id": item - } - } - if "components" in ingredient: - slot["hover_event"]["components"] = ingredient['components'] - slot_under["hover_event"]["components"] = ingredient['components'] return slot, slot_under """ -Recursively reads vanilla item tags to find a single item to use +Recursively reads item tags to find a single item to use """ -def get_item_from_tag(item_tag: str, vanilla: Vanilla) -> str: +def get_item_from_tag(ctx: Context, item_tag: str, vanilla: Vanilla, searched: Optional[list[str]] = None) -> str: # prepare item tag for searching - if "minecraft" in item_tag: - if "#" in item_tag: - item_tag = item_tag[11:] - else: - item_tag = item_tag[10:] - elif item_tag.split(":")[0] != "minecraft": - raise ValueError("Only vanilla item tags are supported") + if ":" in item_tag: + prefix, tag_target = item_tag.split(":", maxsplit=1) + prefix = prefix.removeprefix("#") + else: + prefix = "" + tag_target = item_tag.removeprefix("#") # open item tag - item_tags = vanilla.mount("data/minecraft/tags").data["minecraft"].item_tags - items = item_tags[item_tag].data["values"] + if prefix == "minecraft" or prefix == "": + item_tags = vanilla.mount("data/minecraft/tags").data["minecraft"].item_tags + else: + item_tags = ctx.data[prefix].item_tags + items: list[str|dict[str, Any]] = item_tags[tag_target].data["values"] + + # get first item + if isinstance(items[0], str): + res: str = items[0] + else: + res: str = items[0]["id"] # if first value is another tag, recursively search until an item is found - if "#" not in items[0]: - return items[0] - return get_item_from_tag(items[0], vanilla) + if "#" not in res: + return res + if not searched: + searched = [] + if res in searched: + raise ValueError(f"Cycle found in item tag '{item_tag}' (searched: {', '.join(searched)})") + return get_item_from_tag(ctx, res, vanilla, [*searched, res]) @@ -1060,53 +921,37 @@ def get_item_from_tag(item_tag: str, vanilla: Vanilla) -> str: Generates a crafting grid to be displayed in the guidebook """ def generate_recipe_display(recipe: str, ctx: Context) -> list[TextComponent]: - r = ctx.data[CustomCrafterRecipe][recipe].data - - # get recipe ingredients - ingredients:list[dict[str, str]] = [] + r = ctx.data.recipes[recipe].data + ingredients: list[str] = [] shapeless = " " - # shaped - if r["input"]["type"] == "shaped": - input: list[str] = r["input"]["recipe"] + if r["type"].removeprefix("minecraft:") == "crafting_shaped": + pattern: list[str] = r["pattern"] # fix configured shape to be a full 3x3 grid - while len(input) < 3: - input.append(" ") + while len(pattern) < 3: + pattern.append(" ") for i in range(3): - while len(input[i]) < 3: - input[i] += " " + while len(pattern[i]) < 3: + pattern[i] += " " - # convert input into list of ingredients + # convert pattern into list of ingredients for i in range(3): for j in range(3): - ingredient = input[i][j] - item: dict[str,str] = {} - if ingredient == " ": - item["id"] = "empty" + key = pattern[i][j] + if key == " ": + ingredients.append("air") else: - if isinstance(r["input"]["key"][ingredient], list): - ingr = r["input"]["key"][ingredient][0] - else: - ingr = r["input"]["key"][ingredient] - - if "guidebook" in ingr: - item["guidebook"] = ingr["guidebook"] - if "guidebook" in ingr and "type" in ingr["guidebook"]: - item["display"] = ingr["guidebook"] - else: - if "tag" in ingr: - vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '1.21.5' - item["id"] = get_item_from_tag(ingr["tag"], vanilla) - else: - item["id"] = ingr["item"] - if "components" in ingr: - item["components"] = ingr["components"] - ingredients.append(item) - - # shapeless - elif r["input"]["type"] == "shapeless": + ingr: str | list[str] = r["key"][key] + if isinstance(ingr, list): + ingr = ingr[0] + elif ingr.startswith("#"): + vanilla = ctx.inject(Vanilla) + vanilla.minecraft_version = '1.21.11' + ingr = get_item_from_tag(ctx, ingr, vanilla) + ingredients.append(ingr) + + elif r["type"].removeprefix("minecraft:") == "crafting_shapeless": shapeless = { "translate": "gm4.second", "fallback": "%1$s", @@ -1130,76 +975,44 @@ def generate_recipe_display(recipe: str, ctx: Context) -> list[TextComponent]: } } } - for ingredient in r["input"]["ingredients"]: - item = {} - if ingredient == " ": - item["id"] = "empty" - else: - if isinstance(ingredient, list): - item["id"] = ingredient[0]["item"] # type: ignore - if "guidebook" in ingredient[0]: - if "type" in ingredient[0]["guidebook"]: - item["display"] = ingredient[0]["guidebook"] - item["guidebook"] = ingredient[0]["guidebook"] - else: - if "guidebook" in ingredient: - item["guidebook"] = ingredient["guidebook"] - if "guidebook" in ingredient and "type" in ingredient["guidebook"]: - item["display"] = ingredient["guidebook"] - else: - item["id"] = ingredient["item"] - if "components" in ingredient: - item["components"] = ingredient["components"] - ingredients.append(item) + for ingr in r["ingredients"]: + if isinstance(ingr, list): + ingr = ingr[0] + elif ingr.startswith("#"): + vanilla = ctx.inject(Vanilla) + vanilla.minecraft_version = '1.21.11' + ingr = get_item_from_tag(ctx, ingr, vanilla) + ingredients.append(ingr) while len(ingredients) < 9: - ingredients.append({"id": "empty"}) + ingredients.append("air") # unknown else: - raise ValueError(f'Unknown recipe type: {r["input"]["type"]}') + raise ValueError(f'Unsupported recipe type: {r["type"]}') # get JSON for each ingredient d_ingredients: list[TextComponent] = [] d_under: list[TextComponent] = [] - for ingredient in ingredients: - slot, slot_under = item_to_display(ingredient, ctx) + for item in ingredients: + slot, slot_under = item_to_display(item, None, ctx) d_ingredients.append(slot) d_under.append(slot_under) # get recipe results - if "type" in r["output"]: - output_type = r["output"]["type"] - else: - output_type = "normal" - - res: dict[str, Any] = {} - if output_type == "normal": - res = r["output"]["result"] - elif output_type == "special": - res = r["output"]["guidebook"] - elif output_type == "replace": - raise NotImplementedError('output type "replace" is not yet implemented') # TODO: support replace output type - else: - raise ValueError(f"Unknown output type: '{output_type}'") - - # get display - if "item" in res["type"]: - res["id"] = res["name"] - result, result_under = item_to_display(res, ctx) - else: - result, result_under = loottable_to_display(res["name"], res, ctx) + result, result_under = item_to_display(r["result"]["id"], r["result"].get("components"), ctx) # show count + result_count = r["result"].get("count", 1) res_count = "" - if "count" in res and res["count"] > 1: + if result_count > 1: res_count = { - "translate": f"gui.gm4.guidebook.crafting.display.count.{res['count']}", + "translate": f"gui.gm4.guidebook.crafting.display.count.{result_count}", "fallback": "", "color": "white", "font": "gm4:guidebook" } NUMBERS = ["☐","☒","②","③","④","⑤","⑥","⑦","⑧","⑨","⑩","⑪","⑫","⑬","⑭","⑮","⑯","⑰","⑱","⑲","⑳"] - result["with"][0]["text"] = NUMBERS[res["count"]] # type: ignore + result["with"][0]["text"] = NUMBERS[result_count] # type: ignore ARROW = { "translate": "gm4.second", @@ -1574,7 +1387,9 @@ def generate_display_advancement(book: Book, project_id: str) -> Advancement: icon = book.icon if icon.components is None: icon.components = dict() - icon.components["minecraft:custom_model_data"] = f"{project_id}:guidebook_icon/{book.id}" + icon.components["minecraft:custom_model_data"] = { + "strings": [f"{project_id}:guidebook_icon/{book.id}"] + } display = { "icon": { "id": icon.id, @@ -1726,7 +1541,7 @@ def generate_unlock_function(section: Section, book_id: str, page_index: int, lo """ Creates the page storage to store book info for a given module """ -def generate_page_storage(book: Book, ctx: Context) -> any: # type: ignore +def generate_page_storage(book: Book, ctx: Context) -> dict[str, Any]: hand_initial:list[Any] = [] hand_unlockable:dict[str,Any] = {} lectern_initial:list[Any] = [["\n\n",{"translate":"gui.gm4.guidebook.page","fallback":"","color":"white","font":"gm4:guidebook"}],["",{"translate":"gui.gm4.guidebook.page.toc","fallback":"","color":"white","font":"gm4:guidebook"}],["\n\n",{"translate":"gui.gm4.guidebook.page","fallback":"","color":"white","font":"gm4:guidebook"}],["\n\n",{"translate":"gui.gm4.guidebook.page","fallback":"","color":"white","font":"gm4:guidebook"}],["\n\n",{"translate":"gui.gm4.guidebook.page","fallback":"","color":"white","font":"gm4:guidebook"}]] @@ -1945,7 +1760,10 @@ def get_texture_color(texture: PngFile|None) -> str: return "#000000" # Find the colors that occur most often - palette: list[int] = texture.image.convert('P', palette=Image.ADAPTIVE, colors=4).getpalette() # type: ignore ; PIL typing is weird + try: + palette: list[int] = texture.image.convert('P', palette=Image.ADAPTIVE, colors=4).getpalette() # type: ignore ; PIL typing is weird + except ValueError: + return "#000000" if not palette: return "#000000" diff --git a/gm4_guidebook/mod.mcdoc b/gm4_guidebook/mod.mcdoc index b01c85db87..8d02bad220 100644 --- a/gm4_guidebook/mod.mcdoc +++ b/gm4_guidebook/mod.mcdoc @@ -1,6 +1,83 @@ use ::java::world::item::SingleItem use ::java::data::advancement::AdvancementCriterion -use ::java::server::util::text::Text +use ::java::util::text::Text +use ::java::util::Filterable +use ::java::util::slot::SlottedItem +use ::java::world::item::ItemStack + +dispatch minecraft:storage[gm4_guidebook:temp] to struct { + modules?: [GuidebookModule], + expansions?: [GuidebookModule], + check_expansions?: [GuidebookModule], + module?: GuidebookModule, + expansion?: GuidebookModule, + prev_trigger_order?: [int], + lectern_pages?: [[Text]], + toc_back?: Text, + click?: int, + book?: struct { + trigger: int, + uuid: #[uuid] int[] @ 4, + count: int, + name: string, + load: string, + }, + triggers?: [int], + Inventory?: [SlottedItem] @ 0..41, + Item?: SlottedItem, + unlocking?: struct { + uuid?: #[uuid] int[] @ 4, + name?: string, + target_page?: int, + lectern_target_page?: int, + source_page?: string, + }, + lectern_page?: [Text], + page?: [Text], + page_content?: Text, +} + +struct GuidebookModule { + type: string, + id: string, + base?: string, + trigger: int, + line_count: int, + toc_line: Text, +} + +dispatch minecraft:storage[gm4_guidebook:register] to struct { + front_matter?: [Filterable], + trigger_order?: [int], + lectern_toc?: [Text], + trigger_map?: struct { + [int]: struct { + name: string, + load: string, + }, + }, + pages?: struct { + [string]: struct { + hand: PageState, + lectern: PageState, + }, + }, + player_pages?: struct { + [#[uuid] string]: struct { + [string]: struct { + hand: PageState, + lectern: PageState, + }, + }, + }, +} + +struct PageState { + initial: [Text], + unlockable: struct { + [string]: [Text], + }, +} dispatch minecraft:resource[gm4_guidebook] to struct Book { id: string, diff --git a/gm4_heart_canisters/README.md b/gm4_heart_canisters/README.md deleted file mode 100644 index 24ad65e0e6..0000000000 --- a/gm4_heart_canisters/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Heart Canisters - -Increase you max health with craftable health canisters! - -### Features -- Allows for a maximum of 20 additional hearts -- Adds two tiers of canister allowing the player to reduce the number of slots taken up -- Canisters can be placed in the world as additional decoration diff --git a/gm4_heart_canisters/assets/gm4_heart_canisters/textures/item/heart_canister_tier_1.png b/gm4_heart_canisters/assets/gm4_heart_canisters/textures/item/heart_canister_tier_1.png deleted file mode 100644 index 7110e27c75..0000000000 Binary files a/gm4_heart_canisters/assets/gm4_heart_canisters/textures/item/heart_canister_tier_1.png and /dev/null differ diff --git a/gm4_heart_canisters/assets/gm4_heart_canisters/textures/item/heart_canister_tier_2.png b/gm4_heart_canisters/assets/gm4_heart_canisters/textures/item/heart_canister_tier_2.png deleted file mode 100644 index aeb8cc7338..0000000000 Binary files a/gm4_heart_canisters/assets/gm4_heart_canisters/textures/item/heart_canister_tier_2.png and /dev/null differ diff --git a/gm4_heart_canisters/assets/gm4_heart_canisters/textures/item/heart_canister_tier_2.png.mcmeta b/gm4_heart_canisters/assets/gm4_heart_canisters/textures/item/heart_canister_tier_2.png.mcmeta deleted file mode 100644 index 23c177dd65..0000000000 --- a/gm4_heart_canisters/assets/gm4_heart_canisters/textures/item/heart_canister_tier_2.png.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "animation": { - "frametime": 6, - "interpolate": true - - } -} diff --git a/gm4_heart_canisters/assets/translations.csv b/gm4_heart_canisters/assets/translations.csv deleted file mode 100644 index e5cc49d4ed..0000000000 --- a/gm4_heart_canisters/assets/translations.csv +++ /dev/null @@ -1,14 +0,0 @@ -key,en_us -item.gm4.heart_canister,Heart Canister -item.gm4.heart_canister.lore.tier,Tier %s -advancement.gm4.heart_canisters.max.title,All My Loving -advancement.gm4.heart_canisters.max.description,Max out your Heart Canister health -advancement.gm4.heart_canisters.tier_1.title,Can't Buy Me Love -advancement.gm4.heart_canisters.tier_1.description,Craft a tier 1 Heart Canister -advancement.gm4.heart_canisters.tier_2.title,Love Is All You Need -advancement.gm4.heart_canisters.tier_2.description,Craft a tier 2 Heart Canister -text.gm4.guidebook.module_desc.heart_canisters,Introduces two tiers of pricey canisters that increase your health when carried. -text.gm4.guidebook.heart_canisters.description,Heart Canisters can be used to increase health. Up to 20 additional hearts can be obtained.\n\nThey can be crafted in a Custom Crafter using golden apples and a powerful core. -text.gm4.guidebook.heart_canisters.crafting_tier_1,The recipes for a heart canister is as follows: -text.gm4.guidebook.heart_canisters.crafting_tier_2,Tier 2 heart canisters can be crafted with tier 1 canisters. -text.gm4.guidebook.heart_canisters.max_amount,Each heart canister will give 2 extra hearts.\n\nOnly up to five of each heart canister tier will give extra health. diff --git a/gm4_heart_canisters/beet.yaml b/gm4_heart_canisters/beet.yaml deleted file mode 100644 index 36a2c202d3..0000000000 --- a/gm4_heart_canisters/beet.yaml +++ /dev/null @@ -1,72 +0,0 @@ -id: gm4_heart_canisters -name: Heart Canisters -version: 1.8.X - -data_pack: - load: . - -resource_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - - gm4.plugins.include.lib_custom_crafters - -meta: - gm4: - versioning: - required: - lib_custom_crafters: 3.4.0 - schedule_loops: [main] - model_data: - - item: player_head - template: generated - broadcast: - - reference: item/heart_canister_tier_1 - - reference: item/heart_canister_tier_2 - - item: player_head - reference: gui/advancement/heart_canisters_tier_1 - template: - name: advancement - forward: item/heart_canister_tier_1 - - item: player_head - template: - name: advancement - forward: item/heart_canister_tier_2 - broadcast: - - reference: gui/advancement/heart_canisters_tier_2 - - reference: gui/advancement/heart_canisters_max - website: - description: Introduces two tiers of pricey canisters that increase your health when carried. - recommended: - - gm4_resource_pack - - gm4_relocators - - gm4_standard_crafting - - gm4_ender_hoppers - - gm4_enchantment_extractors - - gm4_forming_press - - gm4_block_compressors - - gm4_disassemblers - - gm4_tunnel_bores - - gm4_boots_of_ostara - - gm4_smelteries - - gm4_liquid_tanks - notes: [] - modrinth: - project_id: EjJQ5tiv - planetminecraft: - uid: 4331371 - video: https://www.youtube.com/watch?v=zjmL6rjoq0g - wiki: https://wiki.gm4.co/wiki/Heart_Canisters - credits: - Creators: - - Sparks - - SpiderRobotMan - Updated by: - - SpecialBuilder32 - - Misode - - TheEpyonProject - Textures by: - - Jonpot - Icon Design: - - Hozz diff --git a/gm4_heart_canisters/data/gm4/advancement/heart_canisters_max.json b/gm4_heart_canisters/data/gm4/advancement/heart_canisters_max.json deleted file mode 100644 index 897bcea4c4..0000000000 --- a/gm4_heart_canisters/data/gm4/advancement/heart_canisters_max.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "display": { - "icon": { - "id": "player_head", - "components": { - "minecraft:custom_model_data": "gui/advancement/heart_canisters_max", - "minecraft:profile": "$heart_canister_tier_2" - } - }, - "frame": "goal", - "title": { - "translate": "advancement.gm4.heart_canisters.max.title", - "fallback": "All My Loving" - }, - "description": { - "translate": "advancement.gm4.heart_canisters.max.description", - "fallback": "Max out your Heart Canister health", - "color": "gray" - } - }, - "parent": "gm4:heart_canisters_tier_2", - "criteria": { - "have_all_heart_cans": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:poisonous_potato" - ], - "count": 5, - "predicates": { - "minecraft:custom_data": "{gm4_heart_canister_tier:1b}" - } - }, - { - "items": [ - "minecraft:poisonous_potato" - ], - "count": 5, - "predicates": { - "minecraft:custom_data": "{gm4_heart_canister_tier:2b}" - } - } - ] - } - } - } -} diff --git a/gm4_heart_canisters/data/gm4/advancement/heart_canisters_tier_1.json b/gm4_heart_canisters/data/gm4/advancement/heart_canisters_tier_1.json deleted file mode 100644 index 2444ac6953..0000000000 --- a/gm4_heart_canisters/data/gm4/advancement/heart_canisters_tier_1.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "display": { - "icon": { - "id": "player_head", - "components": { - "minecraft:custom_model_data": "gui/advancement/heart_canisters_tier_1", - "minecraft:profile": "$heart_canister_tier_1" - } - }, - "title": { - "translate": "advancement.gm4.heart_canisters.tier_1.title", - "fallback": "Can't Buy Me Love" - }, - "description": { - "translate": "advancement.gm4.heart_canisters.tier_1.description", - "fallback": "Craft a tier 1 Heart Canister", - "color": "gray" - } - }, - "parent": "gm4:custom_crafters", - "criteria": { - "craft_tier_1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:poisonous_potato" - ], - "predicates": { - "minecraft:custom_data": "{gm4_heart_canister_tier:1b}" - } - } - ] - } - } - } -} diff --git a/gm4_heart_canisters/data/gm4/advancement/heart_canisters_tier_2.json b/gm4_heart_canisters/data/gm4/advancement/heart_canisters_tier_2.json deleted file mode 100644 index a6837a7605..0000000000 --- a/gm4_heart_canisters/data/gm4/advancement/heart_canisters_tier_2.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "display": { - "icon": { - "id": "player_head", - "components": { - "minecraft:custom_model_data": "gui/advancement/heart_canisters_tier_2", - "minecraft:profile": "$heart_canister_tier_2" - } - }, - "title": { - "translate": "advancement.gm4.heart_canisters.tier_2.title", - "fallback": "Love Is All You Need" - }, - "description": { - "translate": "advancement.gm4.heart_canisters.tier_2.description", - "fallback": "Craft a tier 2 Heart Canister", - "color": "gray" - } - }, - "parent": "gm4:heart_canisters_tier_1", - "criteria": { - "craft_tier_2": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:poisonous_potato" - ], - "predicates": { - "minecraft:custom_data": "{gm4_heart_canister_tier:2b}" - } - } - ] - } - } - } -} diff --git a/gm4_heart_canisters/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_heart_canisters/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 18cf84ad08..0000000000 --- a/gm4_heart_canisters/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_heart_canisters:check_recipes" - ] -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/advancement/upgrade_path.json b/gm4_heart_canisters/data/gm4_heart_canisters/advancement/upgrade_path.json deleted file mode 100644 index fa9a655c1b..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/advancement/upgrade_path.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "criteria": { - "upgrade_heart_canisters": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "player_head", - "predicates": { - "minecraft:custom_data": { - "gm4_heart_canister": 1 - } - } - } - ] - } - } - }, - "rewards": { - "function": "gm4_heart_canisters:upgrade_path/upgrade_heart_canisters" - } -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/function/apply_health_boost.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/function/apply_health_boost.mcfunction deleted file mode 100644 index f00e7f1287..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/function/apply_health_boost.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# @s = player where the heart canister count changed -# run from check_heart_canisters -attribute @s minecraft:max_health modifier remove minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 - -execute store result storage gm4_heart_cannisters:temp amount int 4 run scoreboard players get @s gm4_heart_can -function gm4_heart_canisters:eval_health_boost with storage gm4_heart_cannisters:temp -data remove storage gm4_heart_cannisters:temp amount - -tag @s[predicate=gm4_heart_canisters:has_health_boost] add gm4_hc_has_effect -effect give @s[tag=!gm4_hc_has_effect] health_boost 1 -effect clear @s[tag=!gm4_hc_has_effect] health_boost -tag @s remove gm4_hc_has_effect diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/function/check_heart_canisters.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/function/check_heart_canisters.mcfunction deleted file mode 100644 index f6c191be60..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/function/check_heart_canisters.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# gets called for every player with at least 1 heart canister item - -# tier 1 -execute store result score @s gm4_heart_can if items entity @s container.* poisonous_potato[custom_data~{gm4_heart_canister_tier:1b}] -execute store result score $count_add gm4_heart_can if items entity @s weapon.offhand poisonous_potato[custom_data~{gm4_heart_canister_tier:1b}] -scoreboard players operation @s gm4_heart_can += $count_add gm4_heart_can -scoreboard players operation @s gm4_heart_can < $heart_cannister_cap gm4_heart_can - -# tier 2 -execute store result score $count_tier2 gm4_heart_can if items entity @s container.* poisonous_potato[custom_data~{gm4_heart_canister_tier:2b}] -execute store result score $count_add gm4_heart_can if items entity @s weapon.offhand poisonous_potato[custom_data~{gm4_heart_canister_tier:2b}] -scoreboard players operation $count_tier2 gm4_heart_can += $count_add gm4_heart_can -scoreboard players operation $count_tier2 gm4_heart_can < $heart_cannister_cap gm4_heart_can -scoreboard players operation @s gm4_heart_can += $count_tier2 gm4_heart_can diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/function/check_recipes.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/function/check_recipes.mcfunction deleted file mode 100644 index a219a4f82f..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/function/check_recipes.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:obsidian"},{Slot:1b,id:"minecraft:iron_block"},{Slot:2b,id:"minecraft:obsidian"},{Slot:3b,id:"minecraft:golden_apple"},{Slot:4b,id:"minecraft:nether_star"},{Slot:5b,id:"minecraft:golden_apple"},{Slot:6b,id:"minecraft:obsidian"},{Slot:7b,id:"minecraft:golden_apple"},{Slot:8b,id:"minecraft:obsidian"}]} run loot replace block ~ ~ ~ container.0 loot gm4_heart_canisters:crafting/tier_1_heart_canister -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:end_stone"},{Slot:1b,id:"minecraft:iron_block"},{Slot:2b,id:"minecraft:end_stone"},{Slot:3b,id:"minecraft:poisonous_potato",components:{"minecraft:custom_data":{gm4_heart_canister:1b,gm4_heart_canister_tier:1b}}},{Slot:4b,id:"minecraft:nether_star"},{Slot:5b,id:"minecraft:poisonous_potato",components:{"minecraft:custom_data":{gm4_heart_canister:1b,gm4_heart_canister_tier:1b}}},{Slot:6b,id:"minecraft:end_stone"},{Slot:7b,id:"minecraft:poisonous_potato",components:{"minecraft:custom_data":{gm4_heart_canister:1b,gm4_heart_canister_tier:1b}}},{Slot:8b,id:"minecraft:end_stone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_heart_canisters:crafting/tier_2_heart_canister diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/function/eval_health_boost.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/function/eval_health_boost.mcfunction deleted file mode 100644 index 3fdc908629..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/function/eval_health_boost.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# apply the health boost - -$attribute @s minecraft:max_health modifier add minecraft:38a576e7-341b-46ed-a9e3-7b7291beae72 $(amount) add_value diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/function/init.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/function/init.mcfunction deleted file mode 100644 index 1f88d393ae..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/function/init.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -scoreboard objectives add gm4_heart_can dummy - -execute unless score heart_canisters gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Heart Canisters"} -execute unless score heart_canisters gm4_earliest_version < heart_canisters gm4_modules run scoreboard players operation heart_canisters gm4_earliest_version = heart_canisters gm4_modules -scoreboard players set heart_canisters gm4_modules 1 - -scoreboard players set $heart_cannister_cap gm4_heart_can 5 - -schedule function gm4_heart_canisters:main 1t - -#$moduleUpdateList diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/function/main.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/function/main.mcfunction deleted file mode 100644 index 6f6de14749..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/function/main.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -execute as @a[gamemode=!spectator,gamemode=!creative] run function gm4_heart_canisters:player - -schedule function gm4_heart_canisters:main 16t diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/function/player.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/function/player.mcfunction deleted file mode 100644 index 72fed0d6c7..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/function/player.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# check how many heart canisters the player has -scoreboard players operation $heart_can_last gm4_heart_can = @s gm4_heart_can -scoreboard players set @s gm4_heart_can 0 -execute if predicate gm4_heart_canisters:carries_heart_canister run function gm4_heart_canisters:check_heart_canisters - -execute unless score @s gm4_heart_can = $heart_can_last gm4_heart_can run function gm4_heart_canisters:apply_health_boost diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/function/upgrade_path/loop_1.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/function/upgrade_path/loop_1.mcfunction deleted file mode 100644 index 7f6f53734d..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/function/upgrade_path/loop_1.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ - -execute if score $tier_1 gm4_heart_can matches 1.. run loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister -scoreboard players remove $tier_1 gm4_heart_can 1 -execute if score $tier_1 gm4_heart_can matches 1.. run function gm4_heart_canisters:upgrade_path/loop_1 diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/function/upgrade_path/loop_2.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/function/upgrade_path/loop_2.mcfunction deleted file mode 100644 index fc75d8dd72..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/function/upgrade_path/loop_2.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ - -execute if score $tier_2 gm4_heart_can matches 1.. run loot give @s loot gm4_heart_canisters:items/tier_2_heart_canister -scoreboard players remove $tier_2 gm4_heart_can 1 -execute if score $tier_2 gm4_heart_can matches 1.. run function gm4_heart_canisters:upgrade_path/loop_2 diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/function/upgrade_path/upgrade_heart_canisters.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/function/upgrade_path/upgrade_heart_canisters.mcfunction deleted file mode 100644 index 50635ab5e1..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/function/upgrade_path/upgrade_heart_canisters.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -advancement revoke @s only gm4_heart_canisters:upgrade_path - -execute store result score $tier_1 gm4_heart_can run clear @s player_head[minecraft:custom_data~{gm4_heart_canister_tier:1b}] -execute store result score $tier_2 gm4_heart_can run clear @s player_head[minecraft:custom_data~{gm4_heart_canister_tier:2b}] - -execute if score $tier_1 gm4_heart_can matches 1.. run function gm4_heart_canisters:upgrade_path/loop_1 -execute if score $tier_2 gm4_heart_can matches 1.. run function gm4_heart_canisters:upgrade_path/loop_2 diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/gm4_recipes/tier_1_heart_canister.json b/gm4_heart_canisters/data/gm4_heart_canisters/gm4_recipes/tier_1_heart_canister.json deleted file mode 100644 index 70735790ad..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/gm4_recipes/tier_1_heart_canister.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "OIO", - "GNG", - "OGO" - ], - "key": { - "O": { - "item": "minecraft:obsidian" - }, - "I": { - "item": "minecraft:iron_block" - }, - "G": { - "item": "minecraft:golden_apple" - }, - "N": { - "item": "minecraft:nether_star" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_heart_canisters:items/tier_1_heart_canister", - "count": 1 - } - } -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/gm4_recipes/tier_2_heart_canister.json b/gm4_heart_canisters/data/gm4_heart_canisters/gm4_recipes/tier_2_heart_canister.json deleted file mode 100644 index a5dddad978..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/gm4_recipes/tier_2_heart_canister.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "EIE", - "HNH", - "EHE" - ], - "key": { - "E": { - "item": "minecraft:end_stone" - }, - "I": { - "item": "minecraft:iron_block" - }, - "H": { - "item": "minecraft:poisonous_potato", - "components": {"minecraft:custom_data":{"gm4_heart_canister":1,"gm4_heart_canister_tier":1}}, - "guidebook": { - "type": "loot_table", - "name": "gm4_heart_canisters:items/tier_1_heart_canister" - } - }, - "N": { - "item": "minecraft:nether_star" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_heart_canisters:items/tier_2_heart_canister", - "count": 1 - } - } -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/guidebook/heart_canisters.json b/gm4_heart_canisters/data/gm4_heart_canisters/guidebook/heart_canisters.json deleted file mode 100644 index d277307fa9..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/guidebook/heart_canisters.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "id": "heart_canisters", - "name": "Heart Canisters", - "module_type": "module", - "icon": { - "id": "minecraft:poisonous_potato", - "components": { - "minecraft:profile": "$heart_canister_tier_1" - } - }, - "criteria": { - "obtain_nether_star": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:nether_star" - ] - } - ] - } - }, - "obtain_heart_canister": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:poisonous_potato" - ], - "predicates": { - "minecraft:custom_data": "{gm4_heart_canister:1b}" - } - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.heart_canisters.description", - "fallback": "Heart Canisters can be used to increase health. Up to 20 additional hearts can be obtained.\n\nThey can be crafted in a Custom Crafter using golden apples and a powerful core." - } - ] - ] - }, - { - "name": "crafting_tier_1", - "enable": [], - "requirements": [ - [ - "obtain_nether_star" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.heart_canisters.crafting_tier_1", - "fallback": "The recipes for a heart canister is as follows:" - }, - "\n", - { - "insert": "recipe", - "recipe": "gm4_heart_canisters:tier_1_heart_canister" - } - ] - ] - }, - { - "name": "usage", - "enable": [], - "requirements": [ - [ - "obtain_heart_canister" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.heart_canisters.crafting_tier_2", - "fallback": "Tier 2 heart canisters can be crafted with tier 1 canisters." - }, - "\n", - { - "insert": "recipe", - "recipe": "gm4_heart_canisters:tier_2_heart_canister" - } - ], - [ - { - "translate": "text.gm4.guidebook.heart_canisters.max_amount", - "fallback": "Each heart canister will give 2 extra hearts.\n\nOnly up to five of each heart canister tier will give extra health." - } - ] - ], - "grants": [ - "crafting_tier_1" - ] - } - ] -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/crafting/tier_1_heart_canister.json b/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/crafting/tier_1_heart_canister.json deleted file mode 100644 index 0c94af6e5a..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/crafting/tier_1_heart_canister.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_heart_canisters:items/tier_1_heart_canister", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/crafting/tier_2_heart_canister.json b/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/crafting/tier_2_heart_canister.json deleted file mode 100644 index f750b66a38..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/crafting/tier_2_heart_canister.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_heart_canisters:items/tier_2_heart_canister", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/items/tier_1_heart_canister.json b/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/items/tier_1_heart_canister.json deleted file mode 100644 index 5d3dc72771..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/items/tier_1_heart_canister.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:poisonous_potato", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "!food": {}, - "!consumable": {}, - "item_model": "minecraft:player_head", - "max_stack_size": 5, - "minecraft:custom_model_data": "item/heart_canister_tier_1", - "minecraft:profile": "$heart_canister_tier_1" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_heart_canister:1b,gm4_heart_canister_tier:1b}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.heart_canister", - "fallback": "Heart Canister", - "italic": false - } - }, - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "item.gm4.heart_canister.lore.tier", - "fallback": "Tier %s", - "with": [ - "1" - ], - "italic": false, - "color": "gray" - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/items/tier_2_heart_canister.json b/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/items/tier_2_heart_canister.json deleted file mode 100644 index 5c5819fa65..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/loot_table/items/tier_2_heart_canister.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:poisonous_potato", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "!food": {}, - "!consumable": {}, - "item_model": "minecraft:player_head", - "max_stack_size": 5, - "minecraft:custom_model_data": "item/heart_canister_tier_2", - "minecraft:profile": "$heart_canister_tier_2" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_heart_canister:1b,gm4_heart_canister_tier:2b}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.heart_canister", - "fallback": "Heart Canister", - "italic": false - } - }, - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "item.gm4.heart_canister.lore.tier", - "fallback": "Tier %s", - "with": [ - "2" - ], - "italic": false, - "color": "gray" - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/predicate/carries_heart_canister.json b/gm4_heart_canisters/data/gm4_heart_canisters/predicate/carries_heart_canister.json deleted file mode 100644 index f2176d88ea..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/predicate/carries_heart_canister.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "container.*": { - "items": "minecraft:poisonous_potato", - "predicates": { - "minecraft:custom_data": "{gm4_heart_canister:1b}" - } - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "armor.*": { - "items": "minecraft:poisonous_potato", - "predicates": { - "minecraft:custom_data": "{gm4_heart_canister:1b}" - } - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "player.cursor": { - "items": "minecraft:poisonous_potato", - "predicates": { - "minecraft:custom_data": "{gm4_heart_canister:1b}" - } - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "player.crafting.*": { - "items": "minecraft:poisonous_potato", - "predicates": { - "minecraft:custom_data": "{gm4_heart_canister:1b}" - } - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "weapon.*": { - "items": "minecraft:poisonous_potato", - "predicates": { - "minecraft:custom_data": "{gm4_heart_canister:1b}" - } - } - } - } - } - ] -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/predicate/has_health_boost.json b/gm4_heart_canisters/data/gm4_heart_canisters/predicate/has_health_boost.json deleted file mode 100644 index 97a7a8d890..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/predicate/has_health_boost.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "effects": { - "minecraft:health_boost": {} - } - } -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/recipe/heart_canister_tier_1.json b/gm4_heart_canisters/data/gm4_heart_canisters/recipe/heart_canister_tier_1.json deleted file mode 100644 index f80bd543f6..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/recipe/heart_canister_tier_1.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "redstone", - "pattern": [ - "OIO", - "GNG", - "OGO" - ], - "key": { - "O": "minecraft:obsidian", - "I": "minecraft:iron_block", - "G": "minecraft:golden_apple", - "N": "minecraft:nether_star" - }, - "result": { - "id": "minecraft:poisonous_potato", - "components": { - "minecraft:custom_model_data": "item/heart_canister_tier_1", - "!food": {}, - "!consumable": {}, - "item_model": "minecraft:player_head", - "max_stack_size": 5, - "minecraft:profile": "$heart_canister_tier_1", - "minecraft:custom_data": "{gm4_heart_canister:1b,gm4_heart_canister_tier:1b}", - "minecraft:custom_name": {"translate":"item.gm4.heart_canister","fallback":"Heart Canister","italic":false}, - "minecraft:lore": [ - {"translate":"item.gm4.heart_canister.lore.tier","fallback":"Tier %s","with":["1"],"color":"gray","italic":false} - ] - } - } -} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/skins/heart_canister_tier_1.png b/gm4_heart_canisters/data/gm4_heart_canisters/skins/heart_canister_tier_1.png deleted file mode 100644 index ff6341ce89..0000000000 Binary files a/gm4_heart_canisters/data/gm4_heart_canisters/skins/heart_canister_tier_1.png and /dev/null differ diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/skins/heart_canister_tier_2.png b/gm4_heart_canisters/data/gm4_heart_canisters/skins/heart_canister_tier_2.png deleted file mode 100644 index 2c89c2685d..0000000000 Binary files a/gm4_heart_canisters/data/gm4_heart_canisters/skins/heart_canister_tier_2.png and /dev/null differ diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_1.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_1.mcfunction deleted file mode 100644 index f5a8243b07..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_1.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -# @dummy -# @optional - -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister - -await delay 1s -scoreboard objectives add gm4_test dummy -execute store result score $max_health gm4_test run attribute @s minecraft:max_health get -assert score $max_health gm4_test matches 24 - -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister - -await delay 1s -execute store result score $max_health gm4_test run attribute @s minecraft:max_health get -assert score $max_health gm4_test matches 28 - -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister - -await delay 1s -execute store result score $max_health gm4_test run attribute @s minecraft:max_health get -assert score $max_health gm4_test matches 40 diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_2.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_2.mcfunction deleted file mode 100644 index f74bc133b3..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/test/apply_tier_2.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -# @dummy -# @optional - -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister -loot give @s loot gm4_heart_canisters:items/tier_1_heart_canister - -loot give @s loot gm4_heart_canisters:items/tier_2_heart_canister - -await delay 1s - -scoreboard objectives add gm4_test dummy -execute store result score $max_health gm4_test run attribute @s minecraft:max_health get -assert score $max_health gm4_test matches 44 - -loot give @s loot gm4_heart_canisters:items/tier_2_heart_canister - -await delay 1s - -execute store result score $max_health gm4_test run attribute @s minecraft:max_health get -assert score $max_health gm4_test matches 48 diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/test/craft_tier_1.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/test/craft_tier_1.mcfunction deleted file mode 100644 index 7f3715337d..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/test/craft_tier_1.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.0 with minecraft:obsidian -item replace block ~1 ~1 ~1 container.1 with minecraft:iron_block -item replace block ~1 ~1 ~1 container.2 with minecraft:obsidian -item replace block ~1 ~1 ~1 container.3 with minecraft:golden_apple -item replace block ~1 ~1 ~1 container.4 with minecraft:nether_star -item replace block ~1 ~1 ~1 container.5 with minecraft:golden_apple -item replace block ~1 ~1 ~1 container.6 with minecraft:obsidian -item replace block ~1 ~1 ~1 container.7 with minecraft:golden_apple -item replace block ~1 ~1 ~1 container.8 with minecraft:obsidian - -await items block ~1 ~1 ~1 container.* minecraft:poisonous_potato[count=1,custom_data~{gm4_heart_canister:1b,gm4_heart_canister_tier:1b}] diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/test/craft_tier_2.mcfunction b/gm4_heart_canisters/data/gm4_heart_canisters/test/craft_tier_2.mcfunction deleted file mode 100644 index c50d487568..0000000000 --- a/gm4_heart_canisters/data/gm4_heart_canisters/test/craft_tier_2.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.0 with minecraft:end_stone -item replace block ~1 ~1 ~1 container.1 with minecraft:iron_block -item replace block ~1 ~1 ~1 container.2 with minecraft:end_stone -item replace block ~1 ~1 ~1 container.3 with minecraft:poisonous_potato[custom_data={gm4_heart_canister:1b,gm4_heart_canister_tier:1b}] -item replace block ~1 ~1 ~1 container.4 with minecraft:nether_star -item replace block ~1 ~1 ~1 container.5 with minecraft:poisonous_potato[custom_data={gm4_heart_canister:1b,gm4_heart_canister_tier:1b}] -item replace block ~1 ~1 ~1 container.6 with minecraft:end_stone -item replace block ~1 ~1 ~1 container.7 with minecraft:poisonous_potato[custom_data={gm4_heart_canister:1b,gm4_heart_canister_tier:1b}] -item replace block ~1 ~1 ~1 container.8 with minecraft:end_stone - -await items block ~1 ~1 ~1 container.* minecraft:poisonous_potato[count=1,custom_data~{gm4_heart_canister:1b,gm4_heart_canister_tier:2b}] diff --git a/gm4_heart_canisters/pack.png b/gm4_heart_canisters/pack.png deleted file mode 100644 index 031a8dbd0a..0000000000 Binary files a/gm4_heart_canisters/pack.png and /dev/null differ diff --git a/gm4_heart_canisters/pack.svg b/gm4_heart_canisters/pack.svg deleted file mode 100644 index c77509d611..0000000000 --- a/gm4_heart_canisters/pack.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gm4_holographic_tags/data/gm4/advancement/holographic_tags.json b/gm4_holographic_tags/data/gm4/advancement/holographic_tags.json index fb1f49a101..8c7a4cd042 100644 --- a/gm4_holographic_tags/data/gm4/advancement/holographic_tags.json +++ b/gm4_holographic_tags/data/gm4/advancement/holographic_tags.json @@ -3,7 +3,7 @@ "icon": { "id": "name_tag", "components": { - "minecraft:custom_model_data": "gui/advancement/holographic_tags" + "minecraft:custom_model_data": {"strings":["gm4_holographic_tags:gui/advancement/holographic_tags"]} } }, "title": { diff --git a/gm4_holographic_tags/data/gm4_holographic_tags/function/upgrade_paths/1.5.mcfunction b/gm4_holographic_tags/data/gm4_holographic_tags/function/upgrade_paths/1.5.mcfunction index 8e38882f6f..b6d9d870b6 100644 --- a/gm4_holographic_tags/data/gm4_holographic_tags/function/upgrade_paths/1.5.mcfunction +++ b/gm4_holographic_tags/data/gm4_holographic_tags/function/upgrade_paths/1.5.mcfunction @@ -3,4 +3,4 @@ # as @s # run via upgrade paths util -execute as @e[type=area_effect_cloud,tag=gm4_hologram,scores={gm4_entity_version=1}] at @s run function gm4_holographic_tags:upgrade_path/1.5/convert_to_text_display +execute as @e[type=area_effect_cloud,tag=gm4_hologram,scores={gm4_entity_version=1}] at @s run function gm4_holographic_tags:upgrade_paths/1.5/convert_to_text_display diff --git a/gm4_holographic_tags/data/gm4_holographic_tags/function/upgrade_paths/1.5/convert_to_text_display.mcfunction b/gm4_holographic_tags/data/gm4_holographic_tags/function/upgrade_paths/1.5/convert_to_text_display.mcfunction index 89d6145efa..9aec7b3bc6 100644 --- a/gm4_holographic_tags/data/gm4_holographic_tags/function/upgrade_paths/1.5/convert_to_text_display.mcfunction +++ b/gm4_holographic_tags/data/gm4_holographic_tags/function/upgrade_paths/1.5/convert_to_text_display.mcfunction @@ -1,7 +1,7 @@ # collects data from the existing aec and initiates summoning of a replacement text display # @s = outdated aec-based holographic tag # at @s -# run from upgrade_path/1.5 +# run from upgrade_paths/1.5 # summon text display based on aec tp ^ ^ ^.3 diff --git a/gm4_holographic_tags/mod.mcdoc b/gm4_holographic_tags/mod.mcdoc new file mode 100644 index 0000000000..385630dd54 --- /dev/null +++ b/gm4_holographic_tags/mod.mcdoc @@ -0,0 +1,18 @@ +use ::java::util::text::Text + +dispatch minecraft:storage[gm4_holographic_tags:temp] to struct { + properties?: struct { + raw_text?: Text, + glowing?: boolean, + rotation?: [float] @ 2, + rotation_hologram?: [float] @ 2, + rotation_x_hologram?: int, + rotation_y_hologram?: int, + text?: string, + rotation_item_frame?: [float] @ 2, + rotation_x_item_frame?: int, + rotation_y_item_frame?: int, + rotation_x_differs?: int, + rotation_y_differs?: int, + }, +} diff --git a/gm4_iacio_shamir/data/gm4_iacio_shamir/loot_table/band.json b/gm4_iacio_shamir/data/gm4_iacio_shamir/loot_table/band.json index 519d2840dc..1e5d214263 100644 --- a/gm4_iacio_shamir/data/gm4_iacio_shamir/loot_table/band.json +++ b/gm4_iacio_shamir/data/gm4_iacio_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/iacio" + "minecraft:custom_model_data": {"strings":["gm4_iacio_shamir:shamir/iacio"]} } }, { diff --git a/gm4_ink_spitting_squid/data/gm4/advancement/glow_ink_spitting_squid.json b/gm4_ink_spitting_squid/data/gm4/advancement/glow_ink_spitting_squid.json index 00db027eba..3659aeff94 100644 --- a/gm4_ink_spitting_squid/data/gm4/advancement/glow_ink_spitting_squid.json +++ b/gm4_ink_spitting_squid/data/gm4/advancement/glow_ink_spitting_squid.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:glow_ink_sac", "components": { - "minecraft:custom_model_data": "gui/advancement/glow_ink_spitting_squid" + "minecraft:custom_model_data": {"strings":["gm4_ink_spitting_squid:gui/advancement/glow_ink_spitting_squid"]} } }, "title": { diff --git a/gm4_ink_spitting_squid/data/gm4/advancement/ink_spitting_squid.json b/gm4_ink_spitting_squid/data/gm4/advancement/ink_spitting_squid.json index b4c71e6988..d52c191d47 100644 --- a/gm4_ink_spitting_squid/data/gm4/advancement/ink_spitting_squid.json +++ b/gm4_ink_spitting_squid/data/gm4/advancement/ink_spitting_squid.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:ink_sac", "components": { - "minecraft:custom_model_data": "gui/advancement/ink_spitting_squid" + "minecraft:custom_model_data": {"strings":["gm4_ink_spitting_squid:gui/advancement/ink_spitting_squid"]} } }, "title": { diff --git a/gm4_lightning_in_a_bottle/data/gm4/advancement/lightning_in_a_bottle_drink.json b/gm4_lightning_in_a_bottle/data/gm4/advancement/lightning_in_a_bottle_drink.json index 6708a06d4d..2093a9c9fb 100644 --- a/gm4_lightning_in_a_bottle/data/gm4/advancement/lightning_in_a_bottle_drink.json +++ b/gm4_lightning_in_a_bottle/data/gm4/advancement/lightning_in_a_bottle_drink.json @@ -4,7 +4,7 @@ "id": "minecraft:potion", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "gui/advancement/lightning_in_a_bottle_drink", + "minecraft:custom_model_data": {"strings":["gm4_lightning_in_a_bottle:gui/advancement/lightning_in_a_bottle_drink"]}, "minecraft:potion_contents": { "custom_color": 11985402 } diff --git a/gm4_lightning_in_a_bottle/data/gm4/advancement/lightning_in_a_bottle_shulker.json b/gm4_lightning_in_a_bottle/data/gm4/advancement/lightning_in_a_bottle_shulker.json index 8db14f456a..8496f73f37 100644 --- a/gm4_lightning_in_a_bottle/data/gm4/advancement/lightning_in_a_bottle_shulker.json +++ b/gm4_lightning_in_a_bottle/data/gm4/advancement/lightning_in_a_bottle_shulker.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:purpur_block", "components": { - "minecraft:custom_model_data": "gui/advancement/lightning_in_a_bottle_shulker" + "minecraft:custom_model_data": {"strings":["gm4_lightning_in_a_bottle:gui/advancement/lightning_in_a_bottle_shulker"]} } }, "title": { diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/consume_fuel.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/consume_fuel.mcfunction index 4c62785219..6828a559bb 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/consume_fuel.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/consume_fuel.mcfunction @@ -3,12 +3,8 @@ # positioned at brewing stand # runs from brewing_stand/check_potions -# get random value from 0-2 based on lightning bolt's UUID[3] -execute store result score $fuel_cost gm4_liab_data run data get entity @s UUID[3] -scoreboard players operation $fuel_cost gm4_liab_data %= #3 gm4_liab_data - -# move bounds from 0-2 to 1-3 -scoreboard players add $fuel_cost gm4_liab_data 1 +# get random fuel cost +execute store result score $fuel_cost gm4_liab_data run random value 1..3 # subtract fuel cost from Fuel and set to block's Fuel scoreboard players operation $fuel gm4_liab_data -= $fuel_cost gm4_liab_data diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/init.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/init.mcfunction index d0b95108f1..73f4d22628 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/init.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/init.mcfunction @@ -1,5 +1,4 @@ scoreboard objectives add gm4_liab_data dummy -scoreboard players set #3 gm4_liab_data 3 scoreboard objectives add gm4_liab.oxidization dummy execute unless score lightning_in_a_bottle gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Lightning in a Bottle"} diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/lightning/spawner_check.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/lightning/spawner_check.mcfunction deleted file mode 100644 index 0aebfff689..0000000000 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/lightning/spawner_check.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# adds Charged Creeper spawners -# run from #gm4_spawner_minecarts:spawner_check - -execute unless score $valid_spawner gm4_spawner_data matches 1 if data storage gm4_spawner_minecarts:temp spawner{SpawnPotentials:[{data:{entity:{id:"minecraft:creeper",powered:1b,DeathLootTable:"gm4_lightning_in_a_bottle:entities/charged_creeper"}}}]} run scoreboard players set $valid_spawner gm4_spawner_data 1 diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/bottle_of_lightning.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/bottle_of_lightning.json index 1e79342e82..cf491fbf45 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/bottle_of_lightning.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/bottle_of_lightning.json @@ -32,7 +32,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "item/lightning_in_a_bottle", + "minecraft:custom_model_data": {"strings":["gm4_lightning_in_a_bottle:item/lightning_in_a_bottle"]}, "minecraft:potion_contents": { "custom_color": 11985402 }, diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/lingering_bottle_of_lightning.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/lingering_bottle_of_lightning.json index 4537c093eb..4a0a661b60 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/lingering_bottle_of_lightning.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/lingering_bottle_of_lightning.json @@ -32,7 +32,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "item/lingering_lightning_in_a_bottle", + "minecraft:custom_model_data": {"strings":["gm4_lightning_in_a_bottle:item/lingering_lightning_in_a_bottle"]}, "minecraft:potion_contents": { "custom_color": 11985402, "custom_effects": [ diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/splash_bottle_of_lightning.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/splash_bottle_of_lightning.json index 0df876f95a..8ecc2434a6 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/splash_bottle_of_lightning.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/item_modifier/splash_bottle_of_lightning.json @@ -32,7 +32,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "item/splash_lightning_in_a_bottle", + "minecraft:custom_model_data": {"strings":["gm4_lightning_in_a_bottle:item/splash_lightning_in_a_bottle"]}, "minecraft:potion_contents": { "custom_color": 11985402 }, diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/modules/liquid_tanks/liquid_features.bolt b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/modules/liquid_tanks/liquid_features.bolt index 99007f40b2..f9649d8e47 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/modules/liquid_tanks/liquid_features.bolt +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/modules/liquid_tanks/liquid_features.bolt @@ -15,7 +15,7 @@ class BottledLightning: @liquid.util_below def lightning_strike(): - execute as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] + execute as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] unless entity @s[predicate=gm4_lightning_in_a_bottle:on_fire] run function gm4_lightning_in_a_bottle:liquid_tanks/util/lightning: diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/exposed_lightning_rod.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/exposed_lightning_rod.json index 0c78df4acf..7fe8ec2e99 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/exposed_lightning_rod.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/exposed_lightning_rod.json @@ -1,6 +1,6 @@ { "values": [ - {"id": "minecraft:exposed_lightning_rod", "required": false}, - {"id": "minecraft:waxed_exposed_lightning_rod", "required": false} + "minecraft:exposed_lightning_rod", + "minecraft:waxed_exposed_lightning_rod" ] } diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/lightning_rod.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/lightning_rod.json index 06da699b3e..5ad0a0140a 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/lightning_rod.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/lightning_rod.json @@ -1,12 +1,12 @@ { "values": [ "minecraft:lightning_rod", - {"id": "minecraft:exposed_lightning_rod", "required": false}, - {"id": "minecraft:weathered_lightning_rod", "required": false}, - {"id": "minecraft:oxidized_lightning_rod", "required": false}, - {"id": "minecraft:waxed_lightning_rod", "required": false}, - {"id": "minecraft:waxed_exposed_lightning_rod", "required": false}, - {"id": "minecraft:waxed_weathered_lightning_rod", "required": false}, - {"id": "minecraft:waxed_oxidized_lightning_rod", "required": false}, + "minecraft:exposed_lightning_rod", + "minecraft:weathered_lightning_rod", + "minecraft:oxidized_lightning_rod", + "minecraft:waxed_lightning_rod", + "minecraft:waxed_exposed_lightning_rod", + "minecraft:waxed_weathered_lightning_rod", + "minecraft:waxed_oxidized_lightning_rod" ] } diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/normal_lightning_rod.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/normal_lightning_rod.json index ba7f4dfd3d..b10e3e1bea 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/normal_lightning_rod.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/normal_lightning_rod.json @@ -1,6 +1,6 @@ { "values": [ "minecraft:lightning_rod", - {"id": "minecraft:waxed_lightning_rod", "required": false} + "minecraft:waxed_lightning_rod" ] } diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/oxidized_lightning_rod.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/oxidized_lightning_rod.json index 8600a54c6e..75d5488a0a 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/oxidized_lightning_rod.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/oxidized_lightning_rod.json @@ -1,6 +1,6 @@ { "values": [ - {"id": "minecraft:oxidized_lightning_rod", "required": false}, - {"id": "minecraft:waxed_oxidized_lightning_rod", "required": false} + "minecraft:oxidized_lightning_rod", + "minecraft:waxed_oxidized_lightning_rod" ] } diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/weathered_lightning_rod.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/weathered_lightning_rod.json index 9d04d34759..f19d6b3427 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/weathered_lightning_rod.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/weathered_lightning_rod.json @@ -1,6 +1,6 @@ { "values": [ - {"id": "minecraft:weathered_lightning_rod", "required": false}, - {"id": "minecraft:waxed_weathered_lightning_rod", "required": false} + "minecraft:weathered_lightning_rod", + "minecraft:waxed_weathered_lightning_rod" ] } diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/item/lightning_rod.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/item/lightning_rod.json index 06da699b3e..5ad0a0140a 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/item/lightning_rod.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/item/lightning_rod.json @@ -1,12 +1,12 @@ { "values": [ "minecraft:lightning_rod", - {"id": "minecraft:exposed_lightning_rod", "required": false}, - {"id": "minecraft:weathered_lightning_rod", "required": false}, - {"id": "minecraft:oxidized_lightning_rod", "required": false}, - {"id": "minecraft:waxed_lightning_rod", "required": false}, - {"id": "minecraft:waxed_exposed_lightning_rod", "required": false}, - {"id": "minecraft:waxed_weathered_lightning_rod", "required": false}, - {"id": "minecraft:waxed_oxidized_lightning_rod", "required": false}, + "minecraft:exposed_lightning_rod", + "minecraft:weathered_lightning_rod", + "minecraft:oxidized_lightning_rod", + "minecraft:waxed_lightning_rod", + "minecraft:waxed_exposed_lightning_rod", + "minecraft:waxed_weathered_lightning_rod", + "minecraft:waxed_oxidized_lightning_rod" ] } diff --git a/gm4_lightning_in_a_bottle/data/gm4_spawner_minecarts/tags/function/spawner_check.json b/gm4_lightning_in_a_bottle/data/gm4_spawner_minecarts/tags/function/spawner_check.json deleted file mode 100644 index d32397eef9..0000000000 --- a/gm4_lightning_in_a_bottle/data/gm4_spawner_minecarts/tags/function/spawner_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_lightning_in_a_bottle:lightning/spawner_check" - ] -} diff --git a/gm4_liquid_minecarts/assets/translations.csv b/gm4_liquid_minecarts/assets/translations.csv index a47dfc9247..0e0010014a 100644 --- a/gm4_liquid_minecarts/assets/translations.csv +++ b/gm4_liquid_minecarts/assets/translations.csv @@ -4,6 +4,6 @@ text.gm4.liquid_minecarts.level_report,% Full advancement.gm4.liquid_minecarts.title,Liquid Locomotive advancement.gm4.liquid_minecarts.description,Put a liquid tank on wheels text.gm4.guidebook.module_desc.liquid_minecarts,Adds Liquid Tank Minecarts that allow you to move your liquids from one Liquid Tank to another. -text.gm4.guidebook.liquid_minecarts.crafting,Combining a liquid tank and a minecart in a Custom Crafter will craft a liquid minecart.\n\nLiquid minecarts can be used to move liquids from one tank to another. +text.gm4.guidebook.liquid_minecarts.crafting,Combining a liquid tank and a minecart in a crafting table will craft a liquid minecart.\n\nLiquid minecarts can be used to move liquids from one tank to another. text.gm4.guidebook.liquid_minecarts.usage,"Unlike liquid tanks, liquid minecarts cannot interact with any entities or blocks in the world.\n\nLiquid minecarts can be filled by a tank pointing into the minecart and can be drained by driving one over a tank." text.gm4.guidebook.liquid_minecarts.usage_1,"Similar to a tank, if a liquid minecart already has liquid in it, it will only accept the contents of tanks with the same liquid.\n\nDriving a liquid minecart over an activator rail will discard any liquid inside." diff --git a/gm4_liquid_minecarts/data/gm4/advancement/liquid_minecarts_create.json b/gm4_liquid_minecarts/data/gm4/advancement/liquid_minecarts_create.json index 466d0d997f..6c0cf0a8be 100644 --- a/gm4_liquid_minecarts/data/gm4/advancement/liquid_minecarts_create.json +++ b/gm4_liquid_minecarts/data/gm4/advancement/liquid_minecarts_create.json @@ -3,7 +3,7 @@ "icon": { "id": "hopper_minecart", "components": { - "minecraft:custom_model_data": "gui/advancement/liquid_minecarts_create" + "minecraft:custom_model_data": {"strings":["gm4_liquid_minecarts:gui/advancement/liquid_minecarts_create"]} } }, "title": { diff --git a/gm4_liquid_minecarts/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_liquid_minecarts/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 7bdb49f1b2..0000000000 --- a/gm4_liquid_minecarts/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values":[ - "gm4_liquid_minecarts:check_recipes" - ] - -} diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/check_recipes.mcfunction b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/check_recipes.mcfunction deleted file mode 100644 index 458f12964d..0000000000 --- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/check_recipes.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# @s = custom crafter running recipes -# run from #gm4_custom_crafters:check_recipes - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 2 if score $stack_size gm4_crafting matches 1 if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:player_head",components:{"minecraft:custom_data":{gm4_machines:{id:"liquid_tank"}}}},{id:"minecraft:minecart"}]} run loot replace block ~ ~ ~ container.0 loot gm4_liquid_minecarts:crafting/liquid_minecart diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/gm4_recipes/liquid_minecarts.json b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/gm4_recipes/liquid_minecarts.json deleted file mode 100644 index d202cae483..0000000000 --- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/gm4_recipes/liquid_minecarts.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "L", - "M" - ], - "key": { - "L": { - "item": "minecraft:player_head", - "components": {"minecraft:custom_data":{"gm4_machines":{"id":"liquid_tank"}}} - }, - "M": { - "item": "minecraft:minecart" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_liquid_minecarts:items/liquid_minecart", - "count": 1 - } - } -} diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/guidebook/liquid_minecarts.json b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/guidebook/liquid_minecarts.json index f92c635bf4..27bb7df78f 100644 --- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/guidebook/liquid_minecarts.json +++ b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/guidebook/liquid_minecarts.json @@ -54,7 +54,7 @@ }, { "translate": "text.gm4.guidebook.liquid_minecarts.crafting", - "fallback": "Combining a liquid tank and a minecart in a Custom Crafter will craft a liquid minecart.\n\nLiquid minecarts can be used to move liquids from one tank to another." + "fallback": "Combining a liquid tank and a minecart in a crafting table will craft a liquid minecart.\n\nLiquid minecarts can be used to move liquids from one tank to another." } ] ] diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/loot_table/crafting/liquid_minecart.json b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/loot_table/crafting/liquid_minecart.json deleted file mode 100644 index 730fef5544..0000000000 --- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/loot_table/crafting/liquid_minecart.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_liquid_minecarts:items/liquid_minecart", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/loot_table/items/liquid_minecart.json b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/loot_table/items/liquid_minecart.json index 8b15eb7b8c..62e9a81f4b 100644 --- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/loot_table/items/liquid_minecart.json +++ b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/loot_table/items/liquid_minecart.json @@ -11,7 +11,7 @@ { "function": "set_components", "components": { - "minecraft:custom_model_data": "item/liquid_minecart" + "minecraft:custom_model_data": {"strings":["gm4_liquid_minecarts:item/liquid_minecart"]} } }, { diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/recipe/liquid_minecart.json b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/recipe/liquid_minecart.json index abc67528d0..807adf0cca 100644 --- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/recipe/liquid_minecart.json +++ b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/recipe/liquid_minecart.json @@ -15,7 +15,7 @@ "result": { "id": "minecraft:hopper_minecart", "components": { - "minecraft:custom_model_data": "item/liquid_minecart", + "minecraft:custom_model_data": {"strings":["gm4_liquid_minecarts:item/liquid_minecart"]}, "minecraft:custom_data": "{gm4_machines:{id:'liquid_minecart'}}", "minecraft:custom_name": {"translate":"item.gm4.liquid_minecart","fallback":"Minecart with Liquid Tank","color":"white","italic":false} } diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/test/craft.mcfunction b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/test/craft.mcfunction deleted file mode 100644 index 70664fa120..0000000000 --- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/test/craft.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.1 with minecraft:minecart -item replace block ~1 ~1 ~1 container.4 with minecraft:player_head[custom_data={gm4_machines:{id:"liquid_tank"}}] - -await items block ~1 ~1 ~1 container.* minecraft:hopper_minecart[count=1,custom_data~{gm4_machines:{id:"liquid_minecart"}}] diff --git a/gm4_liquid_tanks/README.md b/gm4_liquid_tanks/README.md index 618c173d53..3171f54887 100644 --- a/gm4_liquid_tanks/README.md +++ b/gm4_liquid_tanks/README.md @@ -1,4 +1,4 @@ -# Liquid Tank +# Liquid Tanks Store liquids like water and lava or liquids like soup and honey in a compact form to enable autobottling! diff --git a/gm4_liquid_tanks/assets/translations.csv b/gm4_liquid_tanks/assets/translations.csv index 717c7f0f89..ae3eb0a78d 100644 --- a/gm4_liquid_tanks/assets/translations.csv +++ b/gm4_liquid_tanks/assets/translations.csv @@ -22,7 +22,7 @@ item.gm4.glow_ink_bottle,Glow Ink Bottle item.gm4.ink_bottle,Ink Bottle text.gm4.guidebook.module_desc.liquid_tanks,"Store liquids like Water, Lava, Milk, or Soup compactly in special tanks and interact with them!" text.gm4.guidebook.liquid_tanks.description,Liquid Tanks can store various liquids in bulk.\n\nThe first slot of the liquid tank acts as both the input and output of the liquid tank. -text.gm4.guidebook.liqud_tanks.crafting,Liquid Tanks can be crafted in a Custom Crafter: +text.gm4.guidebook.liqud_tanks.crafting,Liquid Tanks can be crafted in a crafting table: text.gm4.guidebook.module_desc.standard_liquids,"Store liquids like Water, Lava, Milk, or Soup compactly in special tanks and interact with them!" text.gm4.guidebook.standard_liquids.water,"Standard liquids can be stored by liquid tanks.\n\nWater Tank\n- Drains water buckets, water bottles\n- Fills buckets, bottles\n- Fills adjacent cauldrons" text.gm4.guidebook.standard_liquids.lava,Lava Tank\n- Drains lava buckets\n- Fills buckets\n- Fuels adjacent furnaces\n- Drains lava cauldrons\n- Fills adjacent cauldrons diff --git a/gm4_liquid_tanks/beet.yaml b/gm4_liquid_tanks/beet.yaml index bb63b8147d..b27e6cf3a6 100644 --- a/gm4_liquid_tanks/beet.yaml +++ b/gm4_liquid_tanks/beet.yaml @@ -15,7 +15,6 @@ pipeline: - override_formatting - gm4.plugins.extend.module - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters meta: bolt: @@ -24,7 +23,6 @@ meta: gm4: versioning: required: - lib_custom_crafters: 3.4.0 lib_machines: 1.4.0 schedule_loops: [main] model_data: @@ -71,7 +69,6 @@ meta: - gm4_zauber_liquids - gm4_liquid_minecarts - gm4_cement_mixers - - gm4_relocators notes: [] modrinth: project_id: h4BcuD3C diff --git a/gm4_liquid_tanks/bolt-docs.md b/gm4_liquid_tanks/bolt-docs.md index 292974b3ec..1121287123 100644 --- a/gm4_liquid_tanks/bolt-docs.md +++ b/gm4_liquid_tanks/bolt-docs.md @@ -66,7 +66,7 @@ This set of commands is called on tanks of the matching type, and run as provide ```py @liquid.util_below def dispense_ink(): - execute as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:blindness'}]}] run function gm4_standard_liquids:util/liquid_dispensing/ink + execute as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:blindness'}]}] run function gm4_standard_liquids:util/liquid_dispensing/ink ``` # Advanced Usage diff --git a/gm4_liquid_tanks/data/gm4/advancement/liquid_tanks_create.json b/gm4_liquid_tanks/data/gm4/advancement/liquid_tanks_create.json index 6ce7bf2202..24f12d8b44 100644 --- a/gm4_liquid_tanks/data/gm4/advancement/liquid_tanks_create.json +++ b/gm4_liquid_tanks/data/gm4/advancement/liquid_tanks_create.json @@ -3,7 +3,7 @@ "icon": { "id": "hopper", "components": { - "minecraft:custom_model_data": "gui/advancement/liquid_tanks_create" + "minecraft:custom_model_data": {"strings":["gm4_liquid_tanks:gui/advancement/liquid_tanks_create"]} } }, "title": { @@ -16,7 +16,7 @@ "color": "gray" } }, - "parent": "gm4:custom_crafters", + "parent": "gm4:root", "criteria": { "obtain_liquid_tank": { "trigger": "minecraft:inventory_changed", diff --git a/gm4_liquid_tanks/data/gm4/advancement/standard_liquids.json b/gm4_liquid_tanks/data/gm4/advancement/standard_liquids.json index d864ea0876..f4a881ada5 100644 --- a/gm4_liquid_tanks/data/gm4/advancement/standard_liquids.json +++ b/gm4_liquid_tanks/data/gm4/advancement/standard_liquids.json @@ -3,7 +3,7 @@ "icon": { "id": "experience_bottle", "components": { - "minecraft:custom_model_data": "standard_liquids:gui/advancement/standard_liquids" + "minecraft:custom_model_data": {"strings":["standard_liquids:gui/advancement/standard_liquids"]} } }, "title": { diff --git a/gm4_liquid_tanks/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_liquid_tanks/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 90ed6867fb..0000000000 --- a/gm4_liquid_tanks/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_liquid_tanks:check_recipes" - ] -} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/check_recipes.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/check_recipes.mcfunction deleted file mode 100644 index 5e75c0aa2a..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/check_recipes.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# @s = custom crafter running recipes -# run from #gm4_custom_crafters:check_recipes - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 7 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:iron_ingot"},{Slot:1b,id:"minecraft:glass"},{Slot:2b,id:"minecraft:iron_ingot"},{Slot:3b,id:"minecraft:iron_ingot"},{Slot:4b,id:"minecraft:comparator"},{Slot:5b,id:"minecraft:iron_ingot"},{Slot:7b,id:"minecraft:hopper"}]} run loot replace block ~ ~ ~ container.0 loot gm4_liquid_tanks:crafting/liquid_tank diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/init.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/init.mcfunction index ee6be514b0..2dd632cbbd 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/init.mcfunction +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/init.mcfunction @@ -3,7 +3,6 @@ scoreboard objectives add gm4_lt_max dummy scoreboard objectives add gm4_lt_prior_val dummy scoreboard objectives add gm4_lt_disp_val dummy scoreboard objectives add gm4_lt_util dummy -#declare storage gm4_liquid_tanks:temp execute unless score liquid_tanks gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Liquid Tanks"} execute unless score liquid_tanks gm4_earliest_version < liquid_tanks gm4_modules run scoreboard players operation liquid_tanks gm4_earliest_version = liquid_tanks gm4_modules diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/down.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/down.mcfunction index 3d45a10f95..34dddef27f 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/down.mcfunction +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/down.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ hopper[facing=down]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank","font":"gm4:default","color":"#404040"}]]}} # summon display entity and marker entity -summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":"block/liquid_tank"}},Rotation:[0.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} +summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_liquid_tanks:block/liquid_tank"]}}},Rotation:[0.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} summon marker ~ ~ ~ {Tags:["gm4_liquid_tank","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank",Rotation:[0.0f,0.0f]} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/east.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/east.mcfunction index c8cefda9b3..cade92a96a 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/east.mcfunction +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/east.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ hopper[facing=east]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank","font":"gm4:default","color":"#404040"}]]}} # summon display entity and marker entity -summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":"block/liquid_tank_side"}},Rotation:[-90.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} +summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_liquid_tanks:block/liquid_tank_side"]}}},Rotation:[-90.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} summon marker ~ ~ ~ {Tags:["gm4_liquid_tank","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank",Rotation:[-90.0f,0.0f]} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/north.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/north.mcfunction index a3df587b2d..a37be8a14a 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/north.mcfunction +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/north.mcfunction @@ -7,5 +7,5 @@ setblock ~ ~ ~ hopper[facing=north]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank","font":"gm4:default","color":"#404040"}]]}} # summon display entity and marker entity -summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":"block/liquid_tank_side"}},Rotation:[180.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} +summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_liquid_tanks:block/liquid_tank_side"]}}},Rotation:[180.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} summon marker ~ ~ ~ {Tags:["gm4_liquid_tank","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank",Rotation:[180.0f,0.0f]} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/south.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/south.mcfunction index 665fb75c5d..3db3c4eb66 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/south.mcfunction +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/south.mcfunction @@ -7,6 +7,6 @@ setblock ~ ~ ~ hopper[facing=south]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank","font":"gm4:default","color":"#404040"}]]}} # summon display entity and marker entity -summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":"block/liquid_tank_side"}},Rotation:[0.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} +summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_liquid_tanks:block/liquid_tank_side"]}}},Rotation:[0.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} summon marker ~ ~ ~ {Tags:["gm4_liquid_tank","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank",Rotation:[0.0f,0.0f]} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/west.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/west.mcfunction index 3fd1b4e774..7f6a1c820b 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/west.mcfunction +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/machine/rotate/west.mcfunction @@ -7,6 +7,6 @@ setblock ~ ~ ~ hopper[facing=west]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank","font":"gm4:default","color":"#404040"}]]}} # summon display entity and marker entity -summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":"block/liquid_tank_side"}},Rotation:[90.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} +summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_liquid_tanks:block/liquid_tank_side"]}}},Rotation:[90.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} summon marker ~ ~ ~ {Tags:["gm4_liquid_tank","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank",Rotation:[90.0f,0.0f]} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/pick_up_check.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/pick_up_check.mcfunction deleted file mode 100644 index f98ce8096b..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/pick_up_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from #gm4_relocators:pick_up_check - -execute if score gm4_liquid_tanks load.status matches 3.. if entity @s[tag=gm4_liquid_tank] run function gm4_liquid_tanks:relocate/set_pick_up_data diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/place_down.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/place_down.mcfunction deleted file mode 100644 index 9028428a90..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/place_down.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# @s = command block placed by "gm4_relocators:backwards_compatibility/place_down/replace_head" -# located at the command block (where the player head was) - -execute if block ~ ~ ~ command_block[facing=east] run setblock ~ ~ ~ hopper[facing=east] -execute if block ~ ~ ~ command_block[facing=west] run setblock ~ ~ ~ hopper[facing=west] -execute if block ~ ~ ~ command_block[facing=south] run setblock ~ ~ ~ hopper[facing=south] -execute if block ~ ~ ~ command_block[facing=north] run setblock ~ ~ ~ hopper[facing=north] -execute if block ~ ~ ~ command_block[facing=down] run setblock ~ ~ ~ hopper[facing=down] - -data merge block ~ ~ ~ {CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank","font":"gm4:default","color":"#404040"}]]}} -summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":"block/liquid_tank"}},Rotation:[0.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} -summon marker ~ ~ ~ {Tags:["gm4_liquid_tank","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank",Rotation:[0.0f,0.0f]} -execute as @e[tag=gm4_liquid_tank,limit=1,distance=..0.3] run function gm4_liquid_tanks:init_tank_scores -playsound block.end_portal_frame.fill block @a[distance=..30] ~ ~ ~ 1 0.5 diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/place_down_check.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/place_down_check.mcfunction deleted file mode 100644 index 29cf48414e..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/place_down_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = player who placed the block -# located at the center of the block to be placed -# run from #gm4_relocators:place_down_check - -execute if score $placed_block gm4_rl_data matches 0 if score gm4_liquid_tanks load.status matches 3 if data storage gm4_relocators:temp gm4_relocation{custom_block:"gm4_liquid_tank"} run function gm4_liquid_tanks:relocate/summon_block_markers diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/restore_liquid.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/restore_liquid.mcfunction deleted file mode 100644 index 1f68a980b2..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/restore_liquid.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# restores the liquid from the tank -# @s = marker for this liquid tank -# located at the center of the liquid tank -# run from gm4_liquid_tanks:relocate/summon_block_markers - -data modify entity @s {} merge from storage gm4_relocators:temp gm4_relocation.entity_data.marker -execute store result score @s gm4_lt_value run data get storage gm4_relocators:temp gm4_relocation.entity_data.lt_value -execute store result score @s gm4_lt_max run data get storage gm4_relocators:temp gm4_relocation.entity_data.lt_max -scoreboard players set @s gm4_lt_disp_val 0 -function #gm4_liquid_tanks:relocate/restore_liquid - -summon item_display ~ ~ ~ {CustomName: "gm4_liquid_tank_liquid_display",Tags: ["gm4_liquid_tank_liquid_display","smithed.entity","smithed.strict","gm4_new_display"],transformation:{left_rotation: [0f,0f,0f,1f],right_rotation: [0f,0f,0f,1f],translation: [0f,0.2185f,0f],scale: [0.83, 0.83, 0.83]},item_display: head} -data modify entity @e[type=item_display,tag=gm4_new_display,distance=..1,limit=1] {} merge from storage gm4_relocators:temp gm4_relocation.entity_data.liquid_display -function gm4_liquid_tanks:liquid_value_update diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/set_pick_up_data.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/set_pick_up_data.mcfunction deleted file mode 100644 index ab7e21dd49..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/set_pick_up_data.mcfunction +++ /dev/null @@ -1,31 +0,0 @@ -# sets the specific relocator data -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from gm4_liquid_tanks:relocate/pick_up_check - -data modify storage gm4_relocators:temp merge_data set value {custom_block:"gm4_liquid_tank",lore:{"translate":"block.gm4.liquid_tank","fallback":"Liquid Tank","color":"gray","italic":true}} -data modify storage gm4_relocators:temp merge_data.entity_data.Rotation set from entity @s Rotation - -tag @s remove gm4_relocating_block -data modify storage gm4_relocators:temp merge_data.entity_data.marker.Tags set from entity @s Tags -tag @s add gm4_relocating_block -data modify storage gm4_relocators:temp merge_data.entity_data.marker.data set from entity @s data - -data modify storage gm4_relocators:temp merge_data.entity_data.display.item set from entity @e[type=item_display,tag=gm4_liquid_tank_display,distance=..0.5,limit=1] item -data modify storage gm4_relocators:temp merge_data.entity_data.display.Tags set from entity @e[type=item_display,tag=gm4_liquid_tank_display,distance=..0.5,limit=1] Tags - -execute positioned ~ ~ ~ run data modify storage gm4_relocators:temp merge_data.entity_data.liquid_display set from entity @e[type=item_display,tag=gm4_liquid_tank_liquid_display,distance=..0.8,limit=1] {} -data remove storage gm4_relocators:temp merge_data.entity_data.liquid_display.Pos - -execute store result storage gm4_relocators:temp merge_data.entity_data.lt_value int 1 run scoreboard players get @s gm4_lt_value -execute store result storage gm4_relocators:temp merge_data.entity_data.lt_max int 1 run scoreboard players get @s gm4_lt_max -execute store result storage gm4_relocators:temp merge_data.entity_data.lt_prior_value int 1 run scoreboard players get @s gm4_lt_prior_value - -function #gm4_liquid_tanks:relocate/set_data - -execute positioned ~ ~ ~ run kill @e[type=marker,tag=gm4_liquid_tank,limit=1,distance=..0.01] -execute positioned ~ ~0.4 ~ run kill @e[type=item_display,tag=gm4_liquid_tank_display,distance=..0.1,limit=1] -execute positioned ~ ~ ~ run kill @e[type=item_display,tag=gm4_liquid_tank_liquid_display,distance=..0.8,limit=1] -execute positioned ~ ~0.5 ~ run kill @e[type=area_effect_cloud,distance=..0.5,tag=gm4_lt_util_block] -kill @s -scoreboard players set $found_marker gm4_rl_data 1 diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/summon_block_markers.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/summon_block_markers.mcfunction deleted file mode 100644 index 11b6f43763..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/relocate/summon_block_markers.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# summons the entities for this machine -# @s = player who placed the block -# located at the center of the block to be placed -# run from gm4_liquid_tanks:relocate/place_down_check - -scoreboard players set $placed_block gm4_rl_data 1 - -summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":"block/liquid_tank"}},Rotation:[0.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]},item_display:'head'} -summon marker ~ ~ ~ {Tags:["gm4_liquid_tank","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank",Rotation:[0.0f,0.0f]} - -execute as @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.1] run function gm4_liquid_tanks:relocate/restore_liquid - -execute as @e[tag=gm4_new_machine,distance=..2] run data modify entity @s Rotation set from storage gm4_relocators:temp gm4_relocation.entity_data.Rotation -execute as @e[tag=gm4_new_machine,distance=..2] at @s rotated as @e[type=marker,tag=gm4_new_machine,distance=..2,limit=1] run tp ~ ~ ~ -execute as @e[type=item_display,tag=gm4_new_machine,distance=..2] run data modify entity @s {} merge from storage gm4_relocators:temp gm4_relocation.entity_data.display -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 2 -tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/upgrade_paths/2.8/entity_replacement.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/upgrade_paths/2.8/entity_replacement.mcfunction index 6c8be4b09a..efea60c06b 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/function/upgrade_paths/2.8/entity_replacement.mcfunction +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/function/upgrade_paths/2.8/entity_replacement.mcfunction @@ -3,7 +3,7 @@ # run by upgrade_paths/2.5 # replace primary armor stand with item display -summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":"block/liquid_tank"}},Rotation:[0.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} +summon item_display ~ ~0.4 ~ {Tags:["gm4_liquid_tank_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_liquid_tank_display",item:{id:"glass",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_liquid_tanks:block/liquid_tank"]}}},Rotation:[0.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} data modify entity @e[type=item_display,limit=1,distance=..1,tag=gm4_new_machine] Rotation set from entity @e[type=armor_stand,limit=1,distance=..1,tag=gm4_liquid_tank_stand] Rotation kill @e[type=armor_stand,limit=1,distance=..1,tag=gm4_liquid_tank_stand] scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 2 diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/gm4_recipes/liquid_tank.json b/gm4_liquid_tanks/data/gm4_liquid_tanks/gm4_recipes/liquid_tank.json deleted file mode 100644 index 02fccf7e5e..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/gm4_recipes/liquid_tank.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "IGI", - "ICI", - " H " - ], - "key": { - "I": { - "item": "minecraft:iron_ingot" - }, - "G": { - "item": "minecraft:glass" - }, - "C": { - "item": "minecraft:comparator" - }, - "H": { - "item": "minecraft:hopper" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_liquid_tanks:items/liquid_tank", - "count": 1 - } - } -} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/guidebook/liquid_tanks.json b/gm4_liquid_tanks/data/gm4_liquid_tanks/guidebook/liquid_tanks.json index afb019f6bd..65043188f7 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/guidebook/liquid_tanks.json +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/guidebook/liquid_tanks.json @@ -6,24 +6,6 @@ "id": "minecraft:glass" }, "criteria": { - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, "obtain_hopper": { "trigger": "minecraft:inventory_changed", "conditions": { @@ -70,9 +52,6 @@ "name": "crafting", "enable": [], "requirements": [ - [ - "open_custom_crafter" - ], [ "obtain_hopper" ], @@ -84,7 +63,7 @@ [ { "translate": "text.gm4.guidebook.liqud_tanks.crafting", - "fallback": "Liquid Tanks can be crafted in a Custom Crafter:" + "fallback": "Liquid Tanks can be crafted in a crafting table:" }, "\n", { diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_table/crafting/liquid_tank.json b/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_table/crafting/liquid_tank.json deleted file mode 100644 index e72bc02ece..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_table/crafting/liquid_tank.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_liquid_tanks:items/liquid_tank", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_table/items/liquid_tank.json b/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_table/items/liquid_tank.json index 3bfc1d2c59..255441167b 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_table/items/liquid_tank.json +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/loot_table/items/liquid_tank.json @@ -11,7 +11,7 @@ { "function": "set_components", "components": { - "minecraft:custom_model_data": "item/liquid_tank", + "minecraft:custom_model_data": {"strings":["gm4_liquid_tanks:item/liquid_tank"]}, "minecraft:profile": "$liquid_tank" } }, diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/modules/liquid_wrappers.bolt b/gm4_liquid_tanks/data/gm4_liquid_tanks/modules/liquid_wrappers.bolt index c18b80ff92..b43c88b78e 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/modules/liquid_wrappers.bolt +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/modules/liquid_wrappers.bolt @@ -9,7 +9,7 @@ from bolt.contrib.defer import Defer from gm4.utils import add_namespace from gm4_liquid_tanks.mcmeta_stacksize import retrieve_stacksizes -unstackables, stackable_16, _ = retrieve_stacksizes(ctx.cache, "1.21.8") +unstackables, stackable_16, _ = retrieve_stacksizes(ctx.cache, "1.21.11") # function that generates no mcfunction def emptyfunc(): diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/recipe/liquid_tank.json b/gm4_liquid_tanks/data/gm4_liquid_tanks/recipe/liquid_tank.json index c23ef12a21..34bc0830b4 100644 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/recipe/liquid_tank.json +++ b/gm4_liquid_tanks/data/gm4_liquid_tanks/recipe/liquid_tank.json @@ -15,7 +15,7 @@ "result": { "id": "minecraft:player_head", "components": { - "minecraft:custom_model_data": "item/liquid_tank", + "minecraft:custom_model_data": {"strings":["gm4_liquid_tanks:item/liquid_tank"]}, "minecraft:profile": "$liquid_tank", "minecraft:custom_data": "{gm4_machines:{id:'liquid_tank'}}", "minecraft:custom_name": {"translate":"block.gm4.liquid_tank","fallback":"Liquid Tank","color":"white","italic":false} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/tags/function/relocate/restore_liquid.json b/gm4_liquid_tanks/data/gm4_liquid_tanks/tags/function/relocate/restore_liquid.json deleted file mode 100644 index 82523888aa..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/tags/function/relocate/restore_liquid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "values": [] -} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/tags/function/relocate/set_data.json b/gm4_liquid_tanks/data/gm4_liquid_tanks/tags/function/relocate/set_data.json deleted file mode 100644 index 82523888aa..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/tags/function/relocate/set_data.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "values": [] -} diff --git a/gm4_liquid_tanks/data/gm4_liquid_tanks/test/craft.mcfunction b/gm4_liquid_tanks/data/gm4_liquid_tanks/test/craft.mcfunction deleted file mode 100644 index b1e0a79658..0000000000 --- a/gm4_liquid_tanks/data/gm4_liquid_tanks/test/craft.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.0 with minecraft:iron_ingot -item replace block ~1 ~1 ~1 container.1 with minecraft:glass -item replace block ~1 ~1 ~1 container.2 with minecraft:iron_ingot -item replace block ~1 ~1 ~1 container.3 with minecraft:iron_ingot -item replace block ~1 ~1 ~1 container.4 with minecraft:comparator -item replace block ~1 ~1 ~1 container.5 with minecraft:iron_ingot -item replace block ~1 ~1 ~1 container.7 with minecraft:hopper - -await items block ~1 ~1 ~1 container.* minecraft:player_head[custom_data~{gm4_machines:{id:"liquid_tank"}}] diff --git a/gm4_liquid_tanks/data/gm4_relocators/tags/function/pick_up_check.json b/gm4_liquid_tanks/data/gm4_relocators/tags/function/pick_up_check.json deleted file mode 100644 index 72893f2c3d..0000000000 --- a/gm4_liquid_tanks/data/gm4_relocators/tags/function/pick_up_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_liquid_tanks:relocate/pick_up_check" - ] -} diff --git a/gm4_liquid_tanks/data/gm4_relocators/tags/function/place_down_check.json b/gm4_liquid_tanks/data/gm4_relocators/tags/function/place_down_check.json deleted file mode 100644 index 7aff3c9545..0000000000 --- a/gm4_liquid_tanks/data/gm4_relocators/tags/function/place_down_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_liquid_tanks:relocate/place_down_check" - ] -} diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/experience/deposit_one_level.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/experience/deposit_one_level.mcfunction index 7159a2ed74..3510a0a840 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/experience/deposit_one_level.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/experience/deposit_one_level.mcfunction @@ -33,7 +33,7 @@ function gm4_standard_liquids:util/experience/macro_experience with storage gm4_ execute as @e[type=marker,tag=gm4_liquid_tank,limit=1,distance=..0.5] unless score @s gm4_lt_prior_val = @s gm4_lt_value run function gm4_liquid_tanks:liquid_value_update # vfx -execute unless score $level_calc gm4_lt_util matches 0 playsound minecraft:entity.experience_orb.pickup block @s +execute unless score $level_calc gm4_lt_util matches 0 run playsound minecraft:entity.experience_orb.pickup block @s function #gm4_liquid_tanks:level_report_check # reset accelerating clock diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/experience/withdraw_one_level.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/experience/withdraw_one_level.mcfunction index 325a81a2f9..f342c3450c 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/experience/withdraw_one_level.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/experience/withdraw_one_level.mcfunction @@ -28,7 +28,7 @@ function gm4_standard_liquids:util/experience/macro_experience with storage gm4_ execute as @e[type=marker,tag=gm4_liquid_tank,limit=1,distance=..0.5] unless score @s gm4_lt_prior_val = @s gm4_lt_value run function gm4_liquid_tanks:liquid_value_update # vfx -execute unless score $level_calc gm4_lt_util matches 0 playsound minecraft:entity.experience_orb.pickup block @s +execute unless score $level_calc gm4_lt_util matches 0 run playsound minecraft:entity.experience_orb.pickup block @s from itertools import product, count c = count(0) for offset in product([0, -0.05, 0.05], repeat=2): diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/furnace_fueling/furnace_start.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/furnace_fueling/furnace_start.mcfunction index e516db4181..5b98241507 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/furnace_fueling/furnace_start.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/furnace_fueling/furnace_start.mcfunction @@ -1,7 +1,7 @@ #@s = liquid tank, positioned at furnace #run from standard_liquids:util/furnace_fueling/lava_tank -execute if score @s gm4_lt_util matches 1.. run item replace block ~ ~ ~ container.1 with wooden_hoe[damage=59,custom_name="Bug",custom_data={tankhoe:1b}] 1 +execute if score @s gm4_lt_util matches 1.. run item replace block ~ ~ ~ container.1 with wooden_hoe[damage=59,item_name="Bug",custom_data={tankhoe:1b}] 1 execute if score @s gm4_lt_util matches 1.. run data merge block ~ ~ ~ {cooking_time_spent:0} execute if score @s gm4_lt_util matches 1.. run tag @s add gm4_lt_furnace_start execute if score @s gm4_lt_util matches 1.. run scoreboard players remove @s gm4_lt_util 1 diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/honey_casting/honey_cauldron.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/honey_casting/honey_cauldron.mcfunction index 954a3b5f37..4effad58bc 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/honey_casting/honey_cauldron.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/function/util/honey_casting/honey_cauldron.mcfunction @@ -8,7 +8,7 @@ execute if score @s gm4_lt_util matches 4.. run summon item_display ~0.5 ~ ~0.5 item: id: "minecraft:honey_block" count: 1 - components: {"minecraft:custom_model_data":"block/cast_honey_block"} + components: {"minecraft:custom_model_data":{"strings":["gm4_liquid_tanks:block/cast_honey_block"]}} transformation: left_rotation: [0,0,0,1] right_rotation: [0,0,0,1] diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/function/util_below.mcfunction b/gm4_liquid_tanks/data/gm4_standard_liquids/function/util_below.mcfunction index 2f1e09b2fb..4204155651 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/function/util_below.mcfunction +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/function/util_below.mcfunction @@ -4,10 +4,10 @@ tag @s add gm4_processing_tank #milk clearing potion effects -execute if score @s[tag=gm4_lt_milk] gm4_lt_value matches 3.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt={active_effects:[{}]}] run function gm4_standard_liquids:util/liquid_dispensing/milk +execute if score @s[tag=gm4_lt_milk] gm4_lt_value matches 3.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt={active_effects:[{}]}] run function gm4_standard_liquids:util/liquid_dispensing/milk #honey clearing poison and applying saturation -execute if score @s[tag=gm4_lt_honey] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt={active_effects:[{id:'minecraft:poison'}]}] run function gm4_standard_liquids:util/liquid_dispensing/honey +execute if score @s[tag=gm4_lt_honey] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt={active_effects:[{id:'minecraft:poison'}]}] run function gm4_standard_liquids:util/liquid_dispensing/honey execute if score @s[tag=gm4_lt_honey] gm4_lt_value matches 1.. as @a[gamemode=!spectator,limit=1,dx=0] unless entity @s[nbt={foodLevel:20}] run function gm4_standard_liquids:util/liquid_dispensing/honey #mushroom soup applying saturation @@ -20,8 +20,8 @@ execute if score @s[tag=gm4_lt_rabbit_stew] gm4_lt_value matches 1.. as @a[gamem execute if score @s[tag=gm4_lt_beetroot_soup] gm4_lt_value matches 1.. as @a[gamemode=!spectator,limit=1,dx=0] unless entity @s[nbt={foodLevel:20}] run function gm4_standard_liquids:util/liquid_dispensing/beetroot_soup #ink tanks applying effects -execute if score @s[tag=gm4_lt_ink] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:blindness'}]}] run function gm4_standard_liquids:util/liquid_dispensing/ink -execute if score @s[tag=gm4_lt_glow_ink] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:glowing'}]}] run function gm4_standard_liquids:util/liquid_dispensing/glow_ink +execute if score @s[tag=gm4_lt_ink] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:blindness'}]}] run function gm4_standard_liquids:util/liquid_dispensing/ink +execute if score @s[tag=gm4_lt_glow_ink] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:glowing'}]}] run function gm4_standard_liquids:util/liquid_dispensing/glow_ink #player withdrawing experience execute if score $schedule_withdraw_exp gm4_lt_util matches 2.. run schedule clear gm4_standard_liquids:util/experience/scheduled_withdraw diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/loot_table/glow_ink_bottle.json b/gm4_liquid_tanks/data/gm4_standard_liquids/loot_table/glow_ink_bottle.json index 43738f06c7..4f20843e55 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/loot_table/glow_ink_bottle.json +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/loot_table/glow_ink_bottle.json @@ -11,7 +11,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "gm4_standard_liquids:item/glow_ink_bottle", + "minecraft:custom_model_data": {"strings":["gm4_standard_liquids:item/glow_ink_bottle"]}, "minecraft:potion_contents": { "custom_color": 9828808, "custom_effects": [ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/loot_table/ink_bottle.json b/gm4_liquid_tanks/data/gm4_standard_liquids/loot_table/ink_bottle.json index 273d925bcb..3bbba515c2 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/loot_table/ink_bottle.json +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/loot_table/ink_bottle.json @@ -11,7 +11,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "gm4_standard_liquids:item/ink_bottle", + "minecraft:custom_model_data": {"strings":["gm4_standard_liquids:item/ink_bottle"]}, "minecraft:potion_contents": { "custom_color": 68378, "custom_effects": [ diff --git a/gm4_liquid_tanks/data/gm4_standard_liquids/modules/main.bolt b/gm4_liquid_tanks/data/gm4_standard_liquids/modules/main.bolt index 5382b251da..6f28e01cd4 100644 --- a/gm4_liquid_tanks/data/gm4_standard_liquids/modules/main.bolt +++ b/gm4_liquid_tanks/data/gm4_standard_liquids/modules/main.bolt @@ -114,7 +114,7 @@ class Ink: @liquid.util_below def dispense_ink(): - execute as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:blindness'}]}] run function gm4_standard_liquids:util/liquid_dispensing/ink + execute as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:blindness'}]}] run function gm4_standard_liquids:util/liquid_dispensing/ink @liquid class GlowInk: @@ -133,7 +133,7 @@ class GlowInk: @liquid.util_below def dispense_ink(): - execute as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:glowing'}]}] run function gm4_standard_liquids:util/liquid_dispensing/glow_ink + execute as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:glowing'}]}] run function gm4_standard_liquids:util/liquid_dispensing/glow_ink # tell bolt how to name different ominous bottles - they have the same item id so this is a special case def omnious_naming_scheme(input_name: str, output_name: str) -> str | bool: @@ -157,7 +157,7 @@ for lvl, numeral_lvl in zip((0,1,2,3,4), ("I", "II", "III", "IV", "V")): @liquid.util_below def dispense_omen(): execute - as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] + as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:bad_omen'}]}] run function f"gm4_standard_liquids:util/liquid_dispensing/ominous_bottle_{lvl}": diff --git a/gm4_liquid_tanks/mod.mcdoc b/gm4_liquid_tanks/mod.mcdoc new file mode 100644 index 0000000000..b2dd4a3cee --- /dev/null +++ b/gm4_liquid_tanks/mod.mcdoc @@ -0,0 +1,5 @@ +dispatch minecraft:storage[gm4_liquid_tanks:temp] to struct { + exp?: struct { + points: int, + }, +} diff --git a/gm4_live_catch/data/gm4/advancement/live_catch.json b/gm4_live_catch/data/gm4/advancement/live_catch.json index 47360c82eb..b1f14d412c 100644 --- a/gm4_live_catch/data/gm4/advancement/live_catch.json +++ b/gm4_live_catch/data/gm4/advancement/live_catch.json @@ -3,7 +3,7 @@ "icon": { "id": "pufferfish", "components": { - "minecraft:custom_model_data": "gui/advancement/live_catch" + "minecraft:custom_model_data": {"strings":["gm4_live_catch:gui/advancement/live_catch"]} } }, "title": { diff --git a/gm4_live_catch/mod.mcdoc b/gm4_live_catch/mod.mcdoc new file mode 100644 index 0000000000..68667e1e0d --- /dev/null +++ b/gm4_live_catch/mod.mcdoc @@ -0,0 +1,7 @@ +dispatch minecraft:storage[gm4_live_catch:temp/input] to struct { + Target?: minecraft:entity[%fallback], +} + +dispatch minecraft:storage[gm4_live_catch:temp/output] to struct { + Target?: minecraft:entity[%fallback], +} diff --git a/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/get_mainhand_data.mcfunction b/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/get_mainhand_data.mcfunction deleted file mode 100644 index c01f3f4493..0000000000 --- a/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/get_mainhand_data.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -# stores mainhand item data -# @s = player who right clicked on interaction holding a supported item -# at @s -# run from mechanics/interactions/placement/interact_rcd - -scoreboard players set $mainhand gm4_llp.data 1 - -data modify storage gm4_llp:temp DisplayType set from entity @s SelectedItem.id - -execute if items entity @s weapon.mainhand #gm4_lively_lily_pads:coral_fan run \ - scoreboard players set $item_type gm4_llp.data 1 -execute if items entity @s weapon.mainhand #gm4_lively_lily_pads:dead_coral_fan run \ - scoreboard players set $item_type gm4_llp.data 2 -execute if items entity @s weapon.mainhand minecraft:torch run \ - scoreboard players set $item_type gm4_llp.data 3 -execute if items entity @s weapon.mainhand minecraft:lantern run \ - scoreboard players set $item_type gm4_llp.data 4 -execute if items entity @s weapon.mainhand minecraft:soul_torch run \ - scoreboard players set $item_type gm4_llp.data 5 -execute if items entity @s weapon.mainhand minecraft:soul_lantern run \ - scoreboard players set $item_type gm4_llp.data 6 -execute if items entity @s weapon.mainhand #minecraft:candles run \ - scoreboard players set $item_type gm4_llp.data 7 -execute if items entity @s weapon.mainhand minecraft:cactus_flower run \ - scoreboard players set $item_type gm4_llp.data 8 -execute if items entity @s weapon.mainhand minecraft:redstone_torch run \ - scoreboard players set $item_type gm4_llp.data 9 -execute if items entity @s weapon.mainhand minecraft:spore_blossom run \ - scoreboard players set $item_type gm4_llp.data 10 diff --git a/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/get_offhand_data.mcfunction b/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/get_offhand_data.mcfunction deleted file mode 100644 index d70f3eb482..0000000000 --- a/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/placement/get_offhand_data.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -# stores offhand item data -# @s = player who right clicked on interaction holding a supported item -# at @s -# run from mechanics/interactions/placement/interact_rcd - -scoreboard players set $offhand gm4_llp.data 1 - -data modify storage gm4_llp:temp DisplayType set from entity @s equipment.offhand.id - -execute if items entity @s weapon.offhand #gm4_lively_lily_pads:coral_fan run \ - scoreboard players set $item_type gm4_llp.data 1 -execute if items entity @s weapon.offhand #gm4_lively_lily_pads:dead_coral_fan run \ - scoreboard players set $item_type gm4_llp.data 2 -execute if items entity @s weapon.offhand minecraft:torch run \ - scoreboard players set $item_type gm4_llp.data 3 -execute if items entity @s weapon.offhand minecraft:lantern run \ - scoreboard players set $item_type gm4_llp.data 4 -execute if items entity @s weapon.offhand minecraft:soul_torch run \ - scoreboard players set $item_type gm4_llp.data 5 -execute if items entity @s weapon.offhand minecraft:soul_lantern run \ - scoreboard players set $item_type gm4_llp.data 6 -execute if items entity @s weapon.offhand #minecraft:candles run \ - scoreboard players set $item_type gm4_llp.data 7 -execute if items entity @s weapon.offhand minecraft:cactus_flower run \ - scoreboard players set $item_type gm4_llp.data 8 -execute if items entity @s weapon.offhand minecraft:redstone_torch run \ - scoreboard players set $item_type gm4_llp.data 9 -execute if items entity @s weapon.offhand minecraft:spore_blossom run \ - scoreboard players set $item_type gm4_llp.data 10 diff --git a/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/max_durability_mainhand_axe.mcfunction b/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/max_durability_mainhand_axe.mcfunction deleted file mode 100644 index 46da57b435..0000000000 --- a/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/max_durability_mainhand_axe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# returns 1 if max durability reached -# @s = player holding axe -# at @s -# run from mechanics/interactions/waxed_copper_lantern/used_mainhand_axe - -# EMPTY TO AVOID ERRORS diff --git a/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/max_durability_offhand_axe.mcfunction b/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/max_durability_offhand_axe.mcfunction deleted file mode 100644 index 53ca7cd773..0000000000 --- a/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/interactions/waxed_copper_lantern/max_durability_offhand_axe.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# returns 1 if max durability reached -# @s = player holding axe -# at @s -# run from mechanics/interactions/waxed_copper_lantern/used_offhand_axe - -# EMPTY TO AVOID ERRORS diff --git a/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/particles/select_type.mcfunction b/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/particles/select_type.mcfunction deleted file mode 100644 index 9f389368f9..0000000000 --- a/gm4_lively_lily_pads/backport_81/data/gm4_lively_lily_pads/function/mechanics/particles/select_type.mcfunction +++ /dev/null @@ -1,25 +0,0 @@ -# dispatches type -# @s = block display, tag=gm4_llp_light -# at @s -# run from tick - -execute if entity @s[tag=gm4_llp_lit_candle] run return run function gm4_lively_lily_pads:mechanics/particles/candle_count - -execute store result score $rand gm4_llp.data run random value 1..10 -execute if entity @s[tag=gm4_llp_smoke_torch] \ - if score $rand gm4_llp.data matches 1..6 run particle smoke ~ ~.6 ~ -execute if data entity @s {block_state:{Name:"minecraft:soul_torch"}} \ - if score $rand gm4_llp.data matches 1..9 run particle soul_fire_flame ~ ~.58 ~ -execute if data entity @s {block_state:{Name:"minecraft:torch"}} \ - if score $rand gm4_llp.data matches 1..9 run particle flame ~ ~.58 ~ -execute if data entity @s {block_state:{Name:"minecraft:redstone_torch"}} \ - if score $rand gm4_llp.data matches 1..8 run particle dust{color:[1,0,0],scale:0.8} ~ ~.58 ~ - -# refresh light block -execute if block ~ ~1 ~ light run setblock ~ ~1 ~ air -execute if entity @s[tag=gm4_llp_light.14] run setblock ~ ~1 ~ light[level=14] keep -execute if entity @s[tag=gm4_llp_light.9] run setblock ~ ~1 ~ light[level=9] keep -execute if entity @s[tag=gm4_llp_light.6] run setblock ~ ~1 ~ light[level=6] keep - -# copper lantern oxidization -execute if entity @s[tag=gm4_llp_unwaxed_copper_lantern] run function gm4_lively_lily_pads:mechanics/interactions/unwaxed_copper_lantern/attempt_oxidization diff --git a/gm4_lively_lily_pads/beet.yaml b/gm4_lively_lily_pads/beet.yaml index 99afb876bd..6814a781de 100644 --- a/gm4_lively_lily_pads/beet.yaml +++ b/gm4_lively_lily_pads/beet.yaml @@ -4,13 +4,6 @@ version: 3.1.X data_pack: load: . - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 81 - min_format: 1 - max_format: 81 - directory: backport_81 pipeline: - gm4.plugins.extend.module diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/copper_lanterns.json b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/copper_lanterns.json index 04475cfdba..2666804e65 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/copper_lanterns.json +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/copper_lanterns.json @@ -1,8 +1,8 @@ { "values": [ - {"id": "minecraft:copper_lantern", "required": false}, - {"id": "minecraft:exposed_copper_lantern", "required": false}, - {"id": "minecraft:weathered_copper_lantern", "required": false}, - {"id": "minecraft:oxidized_copper_lantern", "required": false} + "minecraft:copper_lantern", + "minecraft:exposed_copper_lantern", + "minecraft:weathered_copper_lantern", + "minecraft:oxidized_copper_lantern" ] } diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/placeable_item.json b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/placeable_item.json index 8bccc11b7b..076223b19f 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/placeable_item.json +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/placeable_item.json @@ -6,7 +6,7 @@ "#gm4_lively_lily_pads:waxed_copper_lanterns", "#minecraft:candles", "minecraft:cactus_flower", - {"id": "minecraft:copper_torch", "required": false}, + "minecraft:copper_torch", "minecraft:lantern", "minecraft:redstone_torch", "minecraft:torch", diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/waxed_copper_lanterns.json b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/waxed_copper_lanterns.json index 8dbd085944..e3ea281c86 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/waxed_copper_lanterns.json +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/tags/item/waxed_copper_lanterns.json @@ -1,8 +1,8 @@ { "values": [ - {"id": "minecraft:waxed_copper_lantern", "required": false}, - {"id": "minecraft:waxed_exposed_copper_lantern", "required": false}, - {"id": "minecraft:waxed_weathered_copper_lantern", "required": false}, - {"id": "minecraft:waxed_oxidized_copper_lantern", "required": false} + "minecraft:waxed_copper_lantern", + "minecraft:waxed_exposed_copper_lantern", + "minecraft:waxed_weathered_copper_lantern", + "minecraft:waxed_oxidized_copper_lantern" ] } diff --git a/gm4_lively_lily_pads/mod.mcdoc b/gm4_lively_lily_pads/mod.mcdoc new file mode 100644 index 0000000000..11a3f5439d --- /dev/null +++ b/gm4_lively_lily_pads/mod.mcdoc @@ -0,0 +1,12 @@ +use ::java::world::item::ItemStack + +dispatch minecraft:storage[gm4_llp:temp] to struct { + item?: struct { + id: #[id="item"] string, + count: int, + motion: [double] @ 3, + }, + held_item?: #[id="item"] string, + DisplayType?: #[id="item"] string, + damage?: int, +} diff --git a/gm4_lumos_shamir/data/gm4_lumos_shamir/loot_table/band.json b/gm4_lumos_shamir/data/gm4_lumos_shamir/loot_table/band.json index 8ff5a0c994..44e3bed87f 100644 --- a/gm4_lumos_shamir/data/gm4_lumos_shamir/loot_table/band.json +++ b/gm4_lumos_shamir/data/gm4_lumos_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/lumos" + "minecraft:custom_model_data": {"strings":["gm4_lumos_shamir:shamir/lumos"]} } }, { diff --git a/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/init_scoreboards.mcfunction b/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/init_scoreboards.mcfunction deleted file mode 100644 index fbc4d71983..0000000000 --- a/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/init_scoreboards.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# @s = unspecified -# at = unspecified -# run from gm4_metallurgy:init - -scoreboard objectives add gm4_use_axe_net minecraft.used:minecraft.netherite_axe -scoreboard objectives add gm4_use_axe_dia minecraft.used:minecraft.diamond_axe -scoreboard objectives add gm4_use_axe_gol minecraft.used:minecraft.golden_axe -scoreboard objectives add gm4_use_axe_iro minecraft.used:minecraft.iron_axe -scoreboard objectives add gm4_use_axe_sto minecraft.used:minecraft.stone_axe -scoreboard objectives add gm4_use_axe_woo minecraft.used:minecraft.wooden_axe -scoreboard objectives add gm4_arb_depth dummy -scoreboard objectives add gm4_arb_data dummy -scoreboard players set #1 gm4_arb_data 1 diff --git a/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/player/analyze_axe.mcfunction b/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/player/analyze_axe.mcfunction deleted file mode 100644 index a956ef2250..0000000000 --- a/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/player/analyze_axe.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -# Calculates the speed of the axe used to break blocks. -# @s = player that just used an axe with arborenda -# at @s -# run from gm4_arborenda:player/chop - -# safe axe nbt (also used to calculate unbreaking numbers in gm4_arborenda_shamir:player/modify_axe_durability) -data modify storage gm4_arborenda_shamir:temp tool set from entity @s SelectedItem - -# set base material speed / breaking delay between block breaks -execute if score @s gm4_use_axe_net matches 1.. run scoreboard players set $axe_delay gm4_arb_data 5 -execute if score @s gm4_use_axe_dia matches 1.. run scoreboard players set $axe_delay gm4_arb_data 6 -execute if score @s gm4_use_axe_gol matches 1.. run scoreboard players set $axe_delay gm4_arb_data 3 -execute if score @s gm4_use_axe_iro matches 1.. run scoreboard players set $axe_delay gm4_arb_data 8 -execute if score @s gm4_use_axe_sto matches 1.. run scoreboard players set $axe_delay gm4_arb_data 13 -execute if score @s gm4_use_axe_woo matches 1.. run scoreboard players set $axe_delay gm4_arb_data 22 - -# efficiency bonus (simplified formula, does not match vanilla) -execute store result score $efficiency_level gm4_arb_data run data get storage gm4_arborenda_shamir:temp tool.components."minecraft:enchantments"."minecraft:efficiency" -scoreboard players operation $axe_delay gm4_arb_data -= $efficiency_level gm4_arb_data - -# limit to min delay of 1 tick between block breaks -scoreboard players operation $axe_delay gm4_arb_data > #1 gm4_arb_data - -# calculate max depth -scoreboard players set $max_depth gm4_arb_data 32 -scoreboard players operation $max_depth gm4_arb_data *= $axe_delay gm4_arb_data diff --git a/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/player/check_for_axe.mcfunction b/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/player/check_for_axe.mcfunction deleted file mode 100644 index 11d23e047e..0000000000 --- a/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/player/check_for_axe.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Checks whether the player has used an arborenda axe. -# @s = all players -# at world spawn -# run from gm4_metallurgy:tick - -execute if entity @s[scores={gm4_use_axe_net=1..},predicate=gm4_metallurgy:arborenda_active] at @s run function gm4_arborenda_shamir:player/chop -execute if entity @s[scores={gm4_use_axe_dia=1..},predicate=gm4_metallurgy:arborenda_active] at @s run function gm4_arborenda_shamir:player/chop -execute if entity @s[scores={gm4_use_axe_gol=1..},predicate=gm4_metallurgy:arborenda_active] at @s run function gm4_arborenda_shamir:player/chop -execute if entity @s[scores={gm4_use_axe_iro=1..},predicate=gm4_metallurgy:arborenda_active] at @s run function gm4_arborenda_shamir:player/chop -execute if entity @s[scores={gm4_use_axe_sto=1..},predicate=gm4_metallurgy:arborenda_active] at @s run function gm4_arborenda_shamir:player/chop -execute if entity @s[scores={gm4_use_axe_woo=1..},predicate=gm4_metallurgy:arborenda_active] at @s run function gm4_arborenda_shamir:player/chop -scoreboard players reset @s gm4_use_axe_net -scoreboard players reset @s gm4_use_axe_dia -scoreboard players reset @s gm4_use_axe_gol -scoreboard players reset @s gm4_use_axe_iro -scoreboard players reset @s gm4_use_axe_sto -scoreboard players reset @s gm4_use_axe_woo diff --git a/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/player/modify_axe_durability.mcfunction b/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/player/modify_axe_durability.mcfunction deleted file mode 100644 index 24d5cba6c8..0000000000 --- a/gm4_metallurgy/backport_81/data/gm4_arborenda_shamir/function/player/modify_axe_durability.mcfunction +++ /dev/null @@ -1,27 +0,0 @@ -# Reduces the durability on an arborenda axe according to the amount of blocks broken. -# @s = player that just used an axe with arborenda -# at @s -# run from gm4_arborenda:player/chop - -# get max damage - 1 for material type -execute if score @s gm4_use_axe_net matches 1.. run scoreboard players set $max_damage gm4_arb_data 2030 -execute if score @s gm4_use_axe_dia matches 1.. run scoreboard players set $max_damage gm4_arb_data 1560 -execute if score @s gm4_use_axe_gol matches 1.. run scoreboard players set $max_damage gm4_arb_data 31 -execute if score @s gm4_use_axe_iro matches 1.. run scoreboard players set $max_damage gm4_arb_data 249 -execute if score @s gm4_use_axe_sto matches 1.. run scoreboard players set $max_damage gm4_arb_data 130 -execute if score @s gm4_use_axe_woo matches 1.. run scoreboard players set $max_damage gm4_arb_data 58 - -# get unbreaking level -execute store result score $unbreaking_level gm4_arb_data run data get storage gm4_arborenda_shamir:temp tool.components."minecraft:enchantments"."minecraft:unbreaking" -scoreboard players add $unbreaking_level gm4_arb_data 1 -scoreboard players set $damage_chance gm4_arb_data 100 -scoreboard players operation $damage_chance gm4_arb_data /= $unbreaking_level gm4_arb_data - -# calclulate and apply damage -execute store result score $current_damage gm4_arb_data run data get storage gm4_arborenda_shamir:temp tool.components."minecraft:damage" -execute store result score $incoming_damage gm4_arb_data run loot spawn ~ -4096 ~ loot gm4_arborenda_shamir:roll_binomial_distribution -scoreboard players operation $current_damage gm4_arb_data += $incoming_damage gm4_arb_data -scoreboard players operation $current_damage gm4_arb_data < $max_damage gm4_arb_data - -execute store result storage gm4_arborenda_shamir:temp damage int 1 run scoreboard players get $current_damage gm4_arb_data -function gm4_arborenda_shamir:player/set_damage with storage gm4_arborenda_shamir:temp diff --git a/gm4_metallurgy/backport_81/data/gm4_moneo_shamir/function/store_maximum.mcfunction b/gm4_metallurgy/backport_81/data/gm4_moneo_shamir/function/store_maximum.mcfunction deleted file mode 100644 index 994af3a8ac..0000000000 --- a/gm4_metallurgy/backport_81/data/gm4_moneo_shamir/function/store_maximum.mcfunction +++ /dev/null @@ -1,37 +0,0 @@ -# run from #gm4_metallurgy:apply_band -# @s = moneo tool item - -# used by Audere Shamir as well -execute if items entity @s contents minecraft:wooden_shovel run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 59 -execute if items entity @s contents minecraft:wooden_pickaxe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 59 -execute if items entity @s contents minecraft:wooden_hoe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 59 -execute if items entity @s contents minecraft:wooden_axe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 59 - -execute if items entity @s contents minecraft:stone_shovel run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 131 -execute if items entity @s contents minecraft:stone_pickaxe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 131 -execute if items entity @s contents minecraft:stone_hoe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 131 -execute if items entity @s contents minecraft:stone_axe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 131 - -execute if items entity @s contents minecraft:iron_shovel run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 250 -execute if items entity @s contents minecraft:iron_pickaxe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 250 -execute if items entity @s contents minecraft:iron_hoe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 250 -execute if items entity @s contents minecraft:iron_axe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 250 - -execute if items entity @s contents minecraft:diamond_shovel run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 1561 -execute if items entity @s contents minecraft:diamond_pickaxe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 1561 -execute if items entity @s contents minecraft:diamond_hoe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 1561 -execute if items entity @s contents minecraft:diamond_axe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 1561 - -execute if items entity @s contents minecraft:netherite_shovel run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 2031 -execute if items entity @s contents minecraft:netherite_pickaxe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 2031 -execute if items entity @s contents minecraft:netherite_hoe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 2031 -execute if items entity @s contents minecraft:netherite_axe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 2031 - -execute if items entity @s contents minecraft:golden_shovel run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 32 -execute if items entity @s contents minecraft:golden_pickaxe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 32 -execute if items entity @s contents minecraft:golden_hoe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 32 -execute if items entity @s contents minecraft:golden_axe run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 32 - -execute if items entity @s contents minecraft:shears run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 237 - -execute if items entity @s contents minecraft:elytra run data modify entity @s Item.components."minecraft:custom_data".MaxDurability set value 432 diff --git a/gm4_metallurgy/beet.yaml b/gm4_metallurgy/beet.yaml index 8d4a751fc1..6c9e30773a 100644 --- a/gm4_metallurgy/beet.yaml +++ b/gm4_metallurgy/beet.yaml @@ -4,13 +4,6 @@ version: 1.7.X data_pack: load: . - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 81 - min_format: 1 - max_format: 81 - directory: backport_81 resource_pack: load: . diff --git a/gm4_metallurgy/data/gm4/advancement/metallurgy_blast_ore.json b/gm4_metallurgy/data/gm4/advancement/metallurgy_blast_ore.json index 947894f917..23846e479d 100644 --- a/gm4_metallurgy/data/gm4/advancement/metallurgy_blast_ore.json +++ b/gm4_metallurgy/data/gm4/advancement/metallurgy_blast_ore.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:player_head", "components": { - "minecraft:custom_model_data": "gui/advancement/metallurgy_blast_ore", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:gui/advancement/metallurgy_blast_ore"]}, "minecraft:profile": "$gm4_metallurgy:ore/aluminium" } }, diff --git a/gm4_metallurgy/data/gm4/advancement/metallurgy_cast.json b/gm4_metallurgy/data/gm4/advancement/metallurgy_cast.json index 9fb4c6fa04..0ebe7d476c 100644 --- a/gm4_metallurgy/data/gm4/advancement/metallurgy_cast.json +++ b/gm4_metallurgy/data/gm4/advancement/metallurgy_cast.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:player_head", "components": { - "minecraft:custom_model_data": "gui/advancement/metallurgy_cast", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:gui/advancement/metallurgy_cast"]}, "minecraft:profile": "$gm4_metallurgy:band/aluminium" } }, diff --git a/gm4_metallurgy/data/gm4/advancement/metallurgy_overheat_cast.json b/gm4_metallurgy/data/gm4/advancement/metallurgy_overheat_cast.json index b1c7c857ee..315f17f11f 100644 --- a/gm4_metallurgy/data/gm4/advancement/metallurgy_overheat_cast.json +++ b/gm4_metallurgy/data/gm4/advancement/metallurgy_overheat_cast.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:lava_bucket", "components": { - "minecraft:custom_model_data": "gui/advancement/metallurgy_overheat_cast" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:gui/advancement/metallurgy_overheat_cast"]} } }, "title": { diff --git a/gm4_metallurgy/data/gm4/tags/entity_type/undead.json b/gm4_metallurgy/data/gm4/tags/entity_type/undead.json deleted file mode 100644 index eaae205e89..0000000000 --- a/gm4_metallurgy/data/gm4/tags/entity_type/undead.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "values": [ - "minecraft:bogged", - {"id": "minecraft:camel_husk", "required": false}, - "minecraft:drowned", - "minecraft:husk", - {"id": "minecraft:parched", "required": false}, - "minecraft:phantom", - "minecraft:skeleton", - "minecraft:skeleton_horse", - "minecraft:stray", - "minecraft:wither", - "minecraft:wither_skeleton", - "minecraft:zoglin", - "minecraft:zombie", - "minecraft:zombie_horse", - "minecraft:zombie_villager", - {"id": "minecraft:zombie_nautilus", "required": false}, - "minecraft:zombified_piglin" - ] -} diff --git a/gm4_metallurgy/data/gm4_arborenda_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_arborenda_shamir/loot_table/band.json index c8a8f99d5d..92119dda17 100644 --- a/gm4_metallurgy/data/gm4_arborenda_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_arborenda_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/arborenda" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/arborenda"]} } }, { diff --git a/gm4_metallurgy/data/gm4_defuse_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_defuse_shamir/loot_table/band.json index 248c8915ca..6ba63b86c1 100644 --- a/gm4_metallurgy/data/gm4_defuse_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_defuse_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/defuse" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/defuse"]} } }, { diff --git a/gm4_metallurgy/data/gm4_ender_bolt_shamir/function/infection/spread.mcfunction b/gm4_metallurgy/data/gm4_ender_bolt_shamir/function/infection/spread.mcfunction index f9bdaa5733..d9baa5df1e 100644 --- a/gm4_metallurgy/data/gm4_ender_bolt_shamir/function/infection/spread.mcfunction +++ b/gm4_metallurgy/data/gm4_ender_bolt_shamir/function/infection/spread.mcfunction @@ -7,4 +7,4 @@ scoreboard players operation $source gm4_ender_bolt_foreign_id = @s gm4_ender_bolt_foreign_id # spread -execute as @e[distance=..1.6,team=!gm4_invalid,type=!armor_stand,tag=!smithed.strict] unless score @s gm4_bolt_time matches -40.. run function gm4_ender_bolt_shamir:infection/check_ignore_list +execute as @e[distance=..1.6,type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict] unless score @s gm4_bolt_time matches -40.. run function gm4_ender_bolt_shamir:infection/check_ignore_list diff --git a/gm4_metallurgy/data/gm4_ender_bolt_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_ender_bolt_shamir/loot_table/band.json index 70693cdfb8..a7628c5d6d 100644 --- a/gm4_metallurgy/data/gm4_ender_bolt_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_ender_bolt_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/ender_bolt" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/ender_bolt"]} } }, { diff --git a/gm4_metallurgy/data/gm4_ender_bolt_shamir/tags/entity_type/pets.json b/gm4_metallurgy/data/gm4_ender_bolt_shamir/tags/entity_type/pets.json index 31eb53c90f..e751b401ba 100644 --- a/gm4_metallurgy/data/gm4_ender_bolt_shamir/tags/entity_type/pets.json +++ b/gm4_metallurgy/data/gm4_ender_bolt_shamir/tags/entity_type/pets.json @@ -5,7 +5,7 @@ "minecraft:horse", "minecraft:llama", "minecraft:mule", - {"id": "minecraft:nautilus", "required": false}, + "minecraft:nautilus", "minecraft:parrot", "minecraft:skeleton_horse", "minecraft:trader_llama", diff --git a/gm4_metallurgy/data/gm4_forterra_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_forterra_shamir/loot_table/band.json index fc4d91f8e7..43b27fbb57 100644 --- a/gm4_metallurgy/data/gm4_forterra_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_forterra_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/forterra" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/forterra"]} } }, { diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_gemini_shamir/loot_table/band.json index 77672b5ec7..22ea28e529 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/gemini" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/gemini"]} } }, { diff --git a/gm4_metallurgy/data/gm4_hypexperia_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_hypexperia_shamir/loot_table/band.json index 331bad4662..06daaea19c 100644 --- a/gm4_metallurgy/data/gm4_hypexperia_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_hypexperia_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/hypexperia" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/hypexperia"]} } }, { diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/item_modifier/restore_shamir.json b/gm4_metallurgy/data/gm4_infinitas_shamir/item_modifier/restore_shamir.json index 828edb3bee..b0112df97d 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/item_modifier/restore_shamir.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/item_modifier/restore_shamir.json @@ -3,7 +3,7 @@ "function": "minecraft:set_components", "components": { "minecraft:max_stack_size": 1, - "minecraft:custom_model_data": "shamir/infinitas" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/infinitas"]} } }, { diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_infinitas_shamir/loot_table/band.json index ca77625fb9..69bb568944 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/infinitas" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/infinitas"]} } }, { diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_aluminium.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_aluminium.mcfunction index b65ba5a33f..3e8c7d83d6 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_aluminium.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_aluminium.mcfunction @@ -5,7 +5,7 @@ tag @s add gm4_contains_metal item modify entity @s armor.head gm4_metallurgy:mould/hot_metal scoreboard players operation @s gm4_ml_ore_al += $metal_amount gm4_ml_data -execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":"item/slightly_damaged_obsidian","minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} +execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_metallurgy:item/slightly_damaged_obsidian"]},"minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} execute unless score $is_obsidian_cast gm4_ml_data matches 1.. run particle minecraft:block{block_state:"minecraft:andesite"} ~.45 ~0.1 ~.65 .1 .1 .1 0 9 particle minecraft:block{block_state:"minecraft:pink_terracotta"} ~.45 ~0.1 ~.65 .1 .1 .1 0 2 playsound item.bucket.empty_lava block @a[distance=..8] ~ ~ ~ .25 1.5 diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_barimium.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_barimium.mcfunction index aef42a8052..5101601fe9 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_barimium.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_barimium.mcfunction @@ -11,7 +11,7 @@ scoreboard players operation @s gm4_ml_ore_al += $metal_amount gm4_ml_data # add secondary metal execute store result score $metal_amount gm4_ml_data run data get storage gm4_metallurgy:temp/item/ore gm4_metallurgy.metal.amount[1] scoreboard players operation @s gm4_ml_ore_ba += $metal_amount gm4_ml_data -execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":"item/slightly_damaged_obsidian","minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} +execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_metallurgy:item/slightly_damaged_obsidian"]},"minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} # visuals particle minecraft:block{block_state:"minecraft:dead_fire_coral_block"} ~.45 ~0.1 ~.65 .1 .1 .1 0 2 diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_barium.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_barium.mcfunction index 3d5fee85dc..cfea7bb9ea 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_barium.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_barium.mcfunction @@ -5,7 +5,7 @@ tag @s add gm4_contains_metal item modify entity @s armor.head gm4_metallurgy:mould/hot_metal scoreboard players operation @s gm4_ml_ore_ba += $metal_amount gm4_ml_data -execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":"item/slightly_damaged_obsidian","minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} +execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_metallurgy:item/slightly_damaged_obsidian"]},"minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} execute unless score $is_obsidian_cast gm4_ml_data matches 1.. run particle minecraft:block{block_state:"minecraft:granite"} ~.45 ~0.1 ~.65 .1 .1 .1 0 9 particle minecraft:block{block_state:"minecraft:white_concrete_powder"} ~.45 ~0.1 ~.65 .1 .1 .1 0 2 playsound item.bucket.empty_lava block @a[distance=..8] ~ ~ ~ .25 1.5 diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_bismuth.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_bismuth.mcfunction index cab5e845db..4ac5a3bfcb 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_bismuth.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_bismuth.mcfunction @@ -5,7 +5,7 @@ tag @s add gm4_contains_metal item modify entity @s armor.head gm4_metallurgy:mould/hot_metal scoreboard players operation @s gm4_ml_ore_bi += $metal_amount gm4_ml_data -execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":"item/slightly_damaged_obsidian","minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} +execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_metallurgy:item/slightly_damaged_obsidian"]},"minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} execute unless score $is_obsidian_cast gm4_ml_data matches 1.. run particle minecraft:block{block_state:"minecraft:stone"} ~.45 ~0.1 ~.65 .1 .1 .1 0 9 particle minecraft:block{block_state:"minecraft:melon"} ~.45 ~0.1 ~.65 .1 .1 .1 0 2 playsound item.bucket.empty_lava block @a[distance=..8] ~ ~ ~ .25 1.5 diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_copper.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_copper.mcfunction index c9b22f227e..813817dc40 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_copper.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_copper.mcfunction @@ -5,7 +5,7 @@ tag @s add gm4_contains_metal item modify entity @s armor.head gm4_metallurgy:mould/hot_metal scoreboard players operation @s gm4_ml_ore_bi += $metal_amount gm4_ml_data -execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":"item/slightly_damaged_obsidian","minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} +execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_metallurgy:item/slightly_damaged_obsidian"]},"minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} execute unless score $is_obsidian_cast gm4_ml_data matches 1.. run particle minecraft:block{block_state:"minecraft:stone"} ~.45 ~0.1 ~.65 .1 .1 .1 0 9 particle minecraft:block{block_state:"minecraft:weathered_copper"} ~.45 ~0.1 ~.65 .1 .1 .1 0 2 playsound item.bucket.empty_lava block @a[distance=..8] ~ ~ ~ .25 1.5 diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_curies_bismium.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_curies_bismium.mcfunction index a776254437..cbc45d7e70 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_curies_bismium.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_curies_bismium.mcfunction @@ -11,7 +11,7 @@ scoreboard players operation @s gm4_ml_ore_th += $metal_amount gm4_ml_data # add secondary metal execute store result score $metal_amount gm4_ml_data run data get storage gm4_metallurgy:temp/item/ore gm4_metallurgy.metal.amount[1] scoreboard players operation @s gm4_ml_ore_bi += $metal_amount gm4_ml_data -execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":"item/slightly_damaged_obsidian","minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} +execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_metallurgy:item/slightly_damaged_obsidian"]},"minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} # visuals particle minecraft:block{block_state:"minecraft:lime_concrete_powder"} ~.45 ~0.1 ~.65 .1 .1 .1 0 2 diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_thorium.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_thorium.mcfunction index ec63c12149..c04a6415d3 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_thorium.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_thorium.mcfunction @@ -5,7 +5,7 @@ tag @s add gm4_contains_metal item modify entity @s armor.head gm4_metallurgy:mould/hot_metal scoreboard players operation @s gm4_ml_ore_th += $metal_amount gm4_ml_data -execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":"item/slightly_damaged_obsidian","minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} +execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_metallurgy:item/slightly_damaged_obsidian"]},"minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} execute unless score $is_obsidian_cast gm4_ml_data matches 1.. run particle minecraft:block{block_state:"minecraft:diorite"} ~.45 ~0.1 ~.65 .1 .1 .1 0 9 particle minecraft:block{block_state:"minecraft:dead_fire_coral_block"} ~.45 ~0.1 ~.65 .1 .1 .1 0 2 playsound item.bucket.empty_lava block @a[distance=..8] ~ ~ ~ .25 1.5 diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_thorium_brass.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_thorium_brass.mcfunction index d199c8d760..6e12e26c5a 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_thorium_brass.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/casting/add_metal/add_thorium_brass.mcfunction @@ -11,7 +11,7 @@ scoreboard players operation @s gm4_ml_ore_th += $metal_amount gm4_ml_data # add secondary metal execute store result score $metal_amount gm4_ml_data run data get storage gm4_metallurgy:temp/item/ore gm4_metallurgy.metal.amount[1] scoreboard players operation @s gm4_ml_ore_bi += $metal_amount gm4_ml_data -execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":"item/slightly_damaged_obsidian","minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} +execute if score $is_obsidian_cast gm4_ml_data matches 1.. run summon item ~.45 ~0.1 ~.65 {Item:{id:"minecraft:obsidian",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_metallurgy:item/slightly_damaged_obsidian"]},"minecraft:lore":[{"translate":"item.gm4.slightly_damaged_obsidian","fallback":"Slightly Damaged Obsidian","color":"dark_gray"}]}}} # visuals particle minecraft:block{block_state:"minecraft:lime_concrete_powder"} ~.45 ~0.1 ~.65 .1 .1 .1 0 2 diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/casting/create_mould.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/casting/create_mould.mcfunction index a0c0d7958f..a6d7a6b542 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/casting/create_mould.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/casting/create_mould.mcfunction @@ -1,7 +1,7 @@ # @s = obsidian block with count of 1 on top of sand next to a clay ball with a count of 1 # run from main -summon armor_stand ~.45 ~-1.150 ~.65 {CustomName:"gm4_sand_ring",Tags:["gm4_sand_ring","gm4_new_sand_ring"],equipment:{feet:{id:"minecraft:stick",count:1},head:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"block/mould/cool_empty","minecraft:profile":"$mould/cool_empty"}}},Silent:1b,Invulnerable:1b,Marker:1b,Invisible:1b,NoGravity:1b,Small:1b,HasVisualFire:1b} +summon armor_stand ~.45 ~-1.150 ~.65 {CustomName:"gm4_sand_ring",Tags:["gm4_sand_ring","gm4_new_sand_ring"],equipment:{feet:{id:"minecraft:stick",count:1},head:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_metallurgy:block/mould/cool_empty"]},"minecraft:profile":"$mould/cool_empty"}}},Silent:1b,Invulnerable:1b,Marker:1b,Invisible:1b,NoGravity:1b,Small:1b,HasVisualFire:1b} scoreboard players add @e[type=armor_stand,tag=gm4_new_sand_ring] gm4_ml_ore_al 0 scoreboard players add @e[type=armor_stand,tag=gm4_new_sand_ring] gm4_ml_ore_ba 0 diff --git a/gm4_metallurgy/data/gm4_metallurgy/function/casting/set_mould.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/function/casting/set_mould.mcfunction index 2cf398b8a4..1d8c395ce1 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/function/casting/set_mould.mcfunction +++ b/gm4_metallurgy/data/gm4_metallurgy/function/casting/set_mould.mcfunction @@ -17,7 +17,7 @@ execute if entity @s[scores={gm4_ml_ore_bi=6,gm4_ml_ore_al=0,gm4_ml_ore_ba=0,gm4 # apply broken band if all other bands fail -execute if score $band_applied gm4_ml_data matches 0 run summon item ~ ~ ~ {Item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":"item/mundane_band","minecraft:profile":"$band/mundane","minecraft:custom_name":{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"},"minecraft:lore":[{"italic":false,"color":"gray","translate":"item.gm4.metallurgy.mundane_band","fallback":"Mundane Band"}]}}} +execute if score $band_applied gm4_ml_data matches 0 run summon item ~ ~ ~ {Item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_metallurgy:item/mundane_band"]},"minecraft:profile":"$band/mundane","minecraft:item_name":{"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"},"minecraft:lore":[{"italic":false,"color":"gray","translate":"item.gm4.metallurgy.mundane_band","fallback":"Mundane Band"}]}}} # spawn xp if band was applied execute if score $band_applied gm4_ml_data matches 1 if entity @p[distance=..4,gamemode=!spectator] run summon experience_orb ~ ~ ~ {Value:37s} diff --git a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/cool_empty.json b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/cool_empty.json index e80480a51e..e029299b2f 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/cool_empty.json +++ b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/cool_empty.json @@ -1,7 +1,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "block/mould/cool_empty", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:block/mould/cool_empty"]}, "minecraft:profile": "$mould/cool_empty" } } diff --git a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/cool_metal.json b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/cool_metal.json index 1d028d3310..c1b739b477 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/cool_metal.json +++ b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/cool_metal.json @@ -1,7 +1,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "block/mould/cool_metal", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:block/mould/cool_metal"]}, "minecraft:profile": "$mould/cool_metal" } } diff --git a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/hot_empty.json b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/hot_empty.json index 836837dacc..de2fdf28be 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/hot_empty.json +++ b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/hot_empty.json @@ -1,7 +1,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "block/mould/hot_empty", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:block/mould/hot_empty"]}, "minecraft:profile": "$mould/hot_empty" } } diff --git a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/hot_metal.json b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/hot_metal.json index fa393dbdaa..be2d0e65f5 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/hot_metal.json +++ b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/mould/hot_metal.json @@ -1,7 +1,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "block/mould/hot_metal", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:block/mould/hot_metal"]}, "minecraft:profile": "$mould/hot_metal" } } diff --git a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/slightly_damaged_obsidian.json b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/slightly_damaged_obsidian.json index ffa43ce8c5..0d704549ec 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/slightly_damaged_obsidian.json +++ b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/slightly_damaged_obsidian.json @@ -2,7 +2,8 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/slightly_damaged_obsidian", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:item/slightly_damaged_obsidian"]}, + "!minecraft:item_name": {}, "!minecraft:custom_name": {}, "!minecraft:profile": {} } diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/aluminium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/aluminium_band.json index 811e7a9d59..76f6ffb443 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/aluminium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/aluminium_band.json @@ -19,10 +19,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.obsidian_cast", - "fallback": "Obsidian Cast", - "italic": false + "fallback": "Obsidian Cast" } }, { diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/barimium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/barimium_band.json index 2658c100c7..3a29de0053 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/barimium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/barimium_band.json @@ -19,10 +19,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.obsidian_cast", - "fallback": "Obsidian Cast", - "italic": false + "fallback": "Obsidian Cast" } }, { diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/barium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/barium_band.json index 1d23678cb5..d09ac487f8 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/barium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/barium_band.json @@ -19,10 +19,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.obsidian_cast", - "fallback": "Obsidian Cast", - "italic": false + "fallback": "Obsidian Cast" } }, { diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/baryte_lump.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/baryte_lump.json index ffb9e32c0c..2409a79997 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/baryte_lump.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/baryte_lump.json @@ -9,12 +9,10 @@ "functions": [ { "function": "minecraft:set_name", - "entity": "this", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.baryte_lump", - "fallback": "Baryte Lump", - "italic": false, - "color": "white" + "fallback": "Baryte Lump" } }, { @@ -41,7 +39,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/lump/baryte", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:item/lump/baryte"]}, "minecraft:profile": "$ore/barium" } }, diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/bauxite_lump.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/bauxite_lump.json index 3ec4a13815..d417e6e379 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/bauxite_lump.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/bauxite_lump.json @@ -9,12 +9,10 @@ "functions": [ { "function": "minecraft:set_name", - "entity": "this", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.bauxite_lump", - "fallback": "Bauxite Lump", - "italic": false, - "color": "white" + "fallback": "Bauxite Lump" } }, { @@ -41,7 +39,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/lump/bauxite", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:item/lump/bauxite"]}, "minecraft:profile": "$ore/aluminium" } }, diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismuth_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismuth_band.json index dd5f2f602f..51d878f9a0 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismuth_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismuth_band.json @@ -19,10 +19,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.obsidian_cast", - "fallback": "Obsidian Cast", - "italic": false + "fallback": "Obsidian Cast" } }, { diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismutite_lump.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismutite_lump.json index a4eb51e50b..4f3b4e17fd 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismutite_lump.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/bismutite_lump.json @@ -9,12 +9,10 @@ "functions": [ { "function": "minecraft:set_name", - "entity": "this", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.bismutite_lump", - "fallback": "Bismutite Lump", - "italic": false, - "color": "white" + "fallback": "Bismutite Lump" } }, { @@ -77,7 +75,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/lump/bismutite", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:item/lump/bismutite"]}, "minecraft:profile": "$ore/bismuth" } }, diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/copper_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/copper_band.json index 51518e6b2e..f7e0200112 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/copper_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/copper_band.json @@ -19,10 +19,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.obsidian_cast", - "fallback": "Obsidian Cast", - "italic": false + "fallback": "Obsidian Cast" } }, { diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/curies_bismium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/curies_bismium_band.json index efe7dedea5..1831117d20 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/curies_bismium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/curies_bismium_band.json @@ -19,10 +19,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.obsidian_cast", - "fallback": "Obsidian Cast", - "italic": false + "fallback": "Obsidian Cast" } }, { diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/malachite_lump.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/malachite_lump.json index 68ee084196..6142b4c978 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/malachite_lump.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/malachite_lump.json @@ -9,12 +9,10 @@ "functions": [ { "function": "minecraft:set_name", - "entity": "this", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.malachite_lump", - "fallback": "Malachite Lump", - "italic": false, - "color": "white" + "fallback": "Malachite Lump" } }, { diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorianite_lump.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorianite_lump.json index 6116516716..551ba23390 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorianite_lump.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorianite_lump.json @@ -9,12 +9,10 @@ "functions": [ { "function": "minecraft:set_name", - "entity": "this", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.thorianite_lump", - "fallback": "Thorianite Lump", - "italic": false, - "color": "white" + "fallback": "Thorianite Lump" } }, { @@ -41,7 +39,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/lump/thorianite", + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:item/lump/thorianite"]}, "minecraft:profile": "$ore/thorium" } }, diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_band.json index 3679f6a46a..9a4d6548f4 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_band.json @@ -19,10 +19,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.obsidian_cast", - "fallback": "Obsidian Cast", - "italic": false + "fallback": "Obsidian Cast" } }, { diff --git a/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_brass_band.json b/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_brass_band.json index 76f87225ca..26b9c1444e 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_brass_band.json +++ b/gm4_metallurgy/data/gm4_metallurgy/loot_table/thorium_brass_band.json @@ -19,10 +19,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.metallurgy.obsidian_cast", - "fallback": "Obsidian Cast", - "italic": false + "fallback": "Obsidian Cast" } }, { diff --git a/gm4_metallurgy/data/gm4_moneo_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_moneo_shamir/loot_table/band.json index fe10f565d8..d3aed896fb 100644 --- a/gm4_metallurgy/data/gm4_moneo_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_moneo_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/moneo" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/moneo"]} } }, { diff --git a/gm4_metallurgy/data/gm4_musical_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_musical_shamir/loot_table/band.json index 1cc531328c..0cc040f009 100644 --- a/gm4_metallurgy/data/gm4_musical_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_musical_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/musical" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/musical"]} } }, { diff --git a/gm4_metallurgy/data/gm4_sensus_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_sensus_shamir/loot_table/band.json index 50fc9713a7..45102231db 100644 --- a/gm4_metallurgy/data/gm4_sensus_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_sensus_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/sensus" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/sensus"]} } }, { diff --git a/gm4_metallurgy/data/gm4_tinker_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_tinker_shamir/loot_table/band.json index 1dde91865c..12e93cefd9 100644 --- a/gm4_metallurgy/data/gm4_tinker_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_tinker_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/tinker" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/tinker"]} } }, { diff --git a/gm4_metallurgy/data/gm4_vibro_shamir/function/shock/apply_mob.mcfunction b/gm4_metallurgy/data/gm4_vibro_shamir/function/shock/apply_mob.mcfunction index aa5ad8b7a7..4357750f00 100644 --- a/gm4_metallurgy/data/gm4_vibro_shamir/function/shock/apply_mob.mcfunction +++ b/gm4_metallurgy/data/gm4_vibro_shamir/function/shock/apply_mob.mcfunction @@ -31,8 +31,8 @@ data remove storage gm4_vibro_shamir:temp Pos # visuals effect give @s resistance 1 4 true -effect give @s[type=#gm4:undead] instant_health -effect give @s[type=!#gm4:undead] instant_damage +effect give @s[type=#minecraft:undead] instant_health +effect give @s[type=!#minecraft:undead] instant_damage playsound minecraft:entity.player.attack.crit player @a[distance=..8] ~ ~ ~ 1 1.4 particle minecraft:crit ~ ~.5 ~ 0 0 0 .5 20 diff --git a/gm4_metallurgy/data/gm4_vibro_shamir/function/shock/user.mcfunction b/gm4_metallurgy/data/gm4_vibro_shamir/function/shock/user.mcfunction index 7f00403068..9868779408 100644 --- a/gm4_metallurgy/data/gm4_vibro_shamir/function/shock/user.mcfunction +++ b/gm4_metallurgy/data/gm4_vibro_shamir/function/shock/user.mcfunction @@ -6,7 +6,7 @@ tag @s add gm4_vibro_user scoreboard players operation $damage gm4_vibro_shock = @s gm4_vibro_shock # calculate damage dealt to mobs -execute as @e[team=!gm4_invalid_team,type=!armor_stand,tag=!gm4_vibro_user,distance=..6] at @s run function gm4_vibro_shamir:shock/calculate +execute as @e[type=!#gm4:non_living,type=!armor_stand,tag=!gm4_vibro_user,distance=..6] at @s run function gm4_vibro_shamir:shock/calculate # visuals particle minecraft:cloud ~ ~.3 ~ 0.2 0.2 0.2 0.1 20 diff --git a/gm4_metallurgy/data/gm4_vibro_shamir/loot_table/band.json b/gm4_metallurgy/data/gm4_vibro_shamir/loot_table/band.json index 2c24d8f498..e55ea84d58 100644 --- a/gm4_metallurgy/data/gm4_vibro_shamir/loot_table/band.json +++ b/gm4_metallurgy/data/gm4_vibro_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/vibro" + "minecraft:custom_model_data": {"strings":["gm4_metallurgy:shamir/vibro"]} } }, { diff --git a/gm4_metallurgy/mod.mcdoc b/gm4_metallurgy/mod.mcdoc index 5d73f0ed95..0888ba93ee 100644 --- a/gm4_metallurgy/mod.mcdoc +++ b/gm4_metallurgy/mod.mcdoc @@ -1,3 +1,28 @@ +use ::java::world::item::ItemStack +use ::java::world::component::DataComponentPatch + +dispatch minecraft:storage[gm4_arborenda_shamir:temp] to struct { + tool?: ItemStack, + damage?: int, +} + +dispatch minecraft:storage[gm4_infinitas_shamir:bucket] to struct { + fish_data?: DataComponentPatch, +} + +dispatch minecraft:storage[gm4_metallurgy:temp/item/cast] to struct { + stored_shamir?: string, + recasted_shamir?: string, +} + +dispatch minecraft:storage[gm4_metallurgy:temp/item/ore] to struct { + gm4_metallurgy?: CustomData, +} + +dispatch minecraft:storage[gm4_vibro_shamir:temp] to struct { + Pos?: [double] @ 3, +} + dispatch mcdoc:custom_data[gm4_metallurgy] to struct CustomData { has_shamir?: 1b, active_shamir?: string, diff --git a/gm4_metallurgy/shamir_model_template.py b/gm4_metallurgy/shamir_model_template.py index b693295be5..4f0aac3e87 100644 --- a/gm4_metallurgy/shamir_model_template.py +++ b/gm4_metallurgy/shamir_model_template.py @@ -221,7 +221,7 @@ def beet_default(ctx: Context): # bind context object to a ClassVar so it can be accessed later during template processing ShamirTemplate.bound_ctx = ctx vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '1.21.9' + vanilla.minecraft_version = '1.21.11' ShamirTemplate.vanilla_models_jar = vanilla.mount("assets/minecraft/items") merge_policy(ctx) diff --git a/gm4_mob_curing/README.md b/gm4_mob_curing/README.md deleted file mode 100644 index 949a5c6729..0000000000 --- a/gm4_mob_curing/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Mob Curing - -Convert mobs to their prior forms, much like Zombie Villager curing, but on a much larger scale. - -### Features -- Adds the ability to convert mobs that have a one way direction of curing -- Allows converting Zoglins to Hoglins, Cows to Mooshrooms, Zombified Piglins to Pigs/Piglins and Witches to Potion Clerics -- Witches converted to Potion Clerics have a randomized set of potions for between 3-11 emeralds diff --git a/gm4_mob_curing/assets/minecraft/optifine/mob/villager/profession/cleric.properties b/gm4_mob_curing/assets/minecraft/optifine/mob/villager/profession/cleric.properties deleted file mode 100644 index cd0a56de6b..0000000000 --- a/gm4_mob_curing/assets/minecraft/optifine/mob/villager/profession/cleric.properties +++ /dev/null @@ -1,4 +0,0 @@ -#gm4_mob_conversion:brewer -skins.2=2 -name.2=regex:(Potion Cleric\u00A7|Preparador de Pociones\u00A7) -professions.2=minecraft:cleric diff --git a/gm4_mob_curing/assets/minecraft/optifine/mob/villager/profession/cleric2.png b/gm4_mob_curing/assets/minecraft/optifine/mob/villager/profession/cleric2.png deleted file mode 100644 index 883cd17875..0000000000 Binary files a/gm4_mob_curing/assets/minecraft/optifine/mob/villager/profession/cleric2.png and /dev/null differ diff --git a/gm4_mob_curing/assets/translations.csv b/gm4_mob_curing/assets/translations.csv deleted file mode 100644 index fc441fc9eb..0000000000 --- a/gm4_mob_curing/assets/translations.csv +++ /dev/null @@ -1,10 +0,0 @@ -key,en_us -advancement.gm4.mob_curing.title,Witch Doctor -advancement.gm4.mob_curing.description.1,Cure a Witch into a Potion Cleric -advancement.gm4.mob_curing.description.2,\u266b Ooh ee ooh ah ah ting tang walla walla bing bang \u266b -entity.gm4.potion_cleric,Potion Cleric§ -text.gm4.guidebook.module_desc.mob_curing,"Revert mooshrooms, pigmen and witches back to their previous forms." -text.gm4.guidebook.mob_curing.description,"Similar to Zombie curing, some mobs can be reverted to previous forms.\n\nThe curing process requires one to splash the mob with a potion and drop an item at its feet." -text.gm4.guidebook.mob_curing.conversions,Zomb. Piglin -> Pig\n - Swiftness\n - Golden Carrot\n\nZomb. Piglin -> Piglin\n OR Zoglin -> Hoglin\n - Weakness\n - Golden Carrot\n\nWitch -> Potion Cleric\n - Weakness\n - Golden Apple -text.gm4.guidebook.mob_curing.conversions_1,Evoker -> Pillager\n - Slowness IV\n - Crossbow\n\nIllusioner -> Evoker\n - Swiftness\n - Totem of Undying\n\nCow -> Mooshroom\n - Slowness\n - Red Mushroom\n - Brown Mushroom -text.gm4.guidebook.mob_curing.potion_cleric,"The Potion Cleric will sell various potions for emeralds. Each potion trade is randomized starting from 3 emeralds, up to 13 emeralds.\n\nThe curer will be rewarded temporarily with some discounted potion prices." diff --git a/gm4_mob_curing/beet.yaml b/gm4_mob_curing/beet.yaml deleted file mode 100644 index 6cda2bd4e1..0000000000 --- a/gm4_mob_curing/beet.yaml +++ /dev/null @@ -1,38 +0,0 @@ -id: gm4_mob_curing -name: Mob Curing -version: 1.8.X - -data_pack: - load: . - -resource_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - - gm4.plugins.include.lib_trades - -meta: - gm4: - versioning: - required: - lib_trades: 1.6.0 - schedule_loops: [main] - model_data: - - item: potion - reference: gui/advancement/mob_curing - template: advancement - website: - description: Revert mooshrooms, pigmen and witches back to their previous forms. - recommended: - - gm4_lightning_in_a_bottle - - gm4_shroomites - notes: [] - modrinth: - project_id: F06LrkeC - wiki: https://wiki.gm4.co/wiki/Mob_Curing - credits: - Creator: - - Epyon - Icon Design: - - Sparks diff --git a/gm4_mob_curing/data/gm4/advancement/mob_curing.json b/gm4_mob_curing/data/gm4/advancement/mob_curing.json deleted file mode 100644 index 561fa018f1..0000000000 --- a/gm4_mob_curing/data/gm4/advancement/mob_curing.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "display": { - "icon": { - "id": "minecraft:potion", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "gui/advancement/mob_curing", - "minecraft:potion_contents": { - "custom_color": 16262179 - } - } - }, - "title": { - "translate": "advancement.gm4.mob_curing.title", - "fallback": "Witch Doctor" - }, - "description": [ - { - "translate": "advancement.gm4.mob_curing.description.1", - "fallback": "Cure a Witch into a Potion Cleric", - "color": "gray" - }, - { - "text": "\n\n" - }, - { - "translate": "advancement.gm4.mob_curing.description.2", - "fallback": "♫ Ooh ee ooh ah ah ting tang walla walla bing bang ♫", - "italic": true - } - ] - }, - "parent": "gm4:root", - "criteria": { - "requirement": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/check_item.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/check_item.mcfunction deleted file mode 100644 index bbc3875fe5..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/check_item.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# checks items and nearby items or entities for valid cure attempts -# @s = any item -# at @s -# run from main - -execute if items entity @s contents minecraft:red_mushroom if items entity @e[type=item,distance=..1.5] contents minecraft:brown_mushroom as @e[type=cow,tag=!smithed.entity,distance=..1.5,limit=1,nbt={active_effects:[{id:'minecraft:slowness'}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/mooshroom -execute if items entity @s contents minecraft:golden_carrot as @e[type=zombified_piglin,tag=!smithed.entity,distance=..1.5,limit=1] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/zombified_check -execute if items entity @s contents minecraft:golden_carrot as @e[type=zoglin,tag=!smithed.entity,distance=..1.5,limit=1,nbt={active_effects:[{id:'minecraft:speed'}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/zoglin -execute if items entity @s contents minecraft:golden_apple as @e[type=witch,tag=!smithed.entity,distance=..1.5,limit=1,nbt={active_effects:[{id:'minecraft:weakness'}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/witch -execute if score gm4_lightning_in_a_bottle load.status matches 1.. run function gm4_mob_curing:cure/liab/check diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/cure/consume_item.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/cure/consume_item.mcfunction deleted file mode 100644 index 3558407af5..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/cure/consume_item.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -# @s = item that needs 1 removed from count -# run from items in convert files - -# store count in scoreboard -execute store result score @s gm4_mob_curing_data run data get entity @s Item.count -# remove 1 -scoreboard players remove @s gm4_mob_curing_data 1 -# store back into nbt -execute store result entity @s Item.count byte 1 run scoreboard players get @s gm4_mob_curing_data - -# Spigot fix -kill @s[scores={gm4_mob_curing_data=0}] - -# remove the tag -tag @s remove gm4_gapple diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/cure/liab/check.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/cure/liab/check.mcfunction deleted file mode 100644 index a9ecb30d84..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/cure/liab/check.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# Checks Lightning in a Bottle-specific entity reverting -# @s = item -# at @s -# run from check_item - -execute if items entity @s contents minecraft:totem_of_undying as @e[type=illusioner,tag=!smithed.entity,distance=..1.5,limit=1,nbt={active_effects:[{id:'minecraft:speed'}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/liab/illusioner -execute if items entity @s contents minecraft:crossbow as @e[type=evoker,tag=!smithed.entity,distance=..1.5,limit=1,nbt={active_effects:[{id:'minecraft:slowness',amplifier:3b}]}] unless data entity @s NoAI at @s run function gm4_mob_curing:cure/liab/evoker diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/cure/liab/evoker.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/cure/liab/evoker.mcfunction deleted file mode 100644 index 18c1e8adc8..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/cure/liab/evoker.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Reverts the Evoker to an Pillager -# @s = Evoker with Slowness II needing conversion -# at @s -# run from cure/liab/check - -summon pillager ~ ~ ~ {Tags:["gm4_mob_curing_new_pillager"]} - -tp @e[type=pillager,distance=..1,tag=gm4_mob_curing_new_pillager,sort=nearest,limit=1] @s -data modify entity @e[type=pillager,tag=gm4_mob_curing_new_pillager,limit=1] {} merge from entity @s {} -tag @e[type=pillager,tag=gm4_mob_curing_new_pillager] remove gm4_mob_curing_new_pillager - -particle explosion ~ ~.5 ~ 1 .3 1 0 1 -playsound minecraft:entity.zombie_villager.converted neutral @a[distance=..8] -execute as @e[type=item,limit=1,nbt={Item:{id:"minecraft:crossbow"}},distance=..3,sort=nearest] run function gm4_mob_curing:cure/consume_item -tp @s ~ ~-2050 ~ -kill @s diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/cure/liab/illusioner.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/cure/liab/illusioner.mcfunction deleted file mode 100644 index 44fdf3aa01..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/cure/liab/illusioner.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Reverts the Illusioner to an Evoker -# @s = Illusioner with Swiftness needing conversion -# at @s -# run from cure/liab/check - -summon evoker ~ ~ ~ {Tags:["gm4_mob_curing_new_evoker"]} - -tp @e[type=evoker,distance=..1,tag=gm4_mob_curing_new_evoker,sort=nearest,limit=1] @s -data modify entity @e[type=evoker,tag=gm4_mob_curing_new_evoker,limit=1] {} merge from entity @s {} -tag @e[type=evoker,tag=gm4_mob_curing_new_evoker] remove gm4_mob_curing_new_evoker - -particle explosion ~ ~.5 ~ 1 .3 1 0 1 -playsound minecraft:entity.zombie_villager.converted neutral @a[distance=..8] -execute as @e[type=item,limit=1,nbt={Item:{id:"minecraft:totem_of_undying"}},distance=..3,sort=nearest] run function gm4_mob_curing:cure/consume_item -tp @s ~ ~-2050 ~ -kill @s diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/cure/mooshroom.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/cure/mooshroom.mcfunction deleted file mode 100644 index 03334f4135..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/cure/mooshroom.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# Replaces cows with mooshrooms -# @s = cows with slowness needing conversion -# at @s -# run from check_item - -summon mooshroom ~ ~ ~ {Tags:["gm4_mob_curing_new_mooshroom"]} - -tp @e[type=mooshroom,distance=..1,tag=gm4_mob_curing_new_mooshroom,sort=nearest,limit=1] @s -data modify entity @e[type=mooshroom,tag=gm4_mob_curing_new_mooshroom,limit=1] {} merge from entity @s {} -tag @e[type=mooshroom,tag=gm4_mob_curing_new_mooshroom] remove gm4_mob_curing_new_mooshroom - -particle explosion ~ ~.5 ~ 1 .3 1 0 1 -playsound minecraft:entity.zombie_villager.converted neutral @a[distance=..8] -execute as @e[type=item,limit=1,nbt={Item:{id:"minecraft:red_mushroom"}},distance=..3,sort=nearest] run function gm4_mob_curing:cure/consume_item -execute as @e[type=item,limit=1,nbt={Item:{id:"minecraft:brown_mushroom"}},distance=..3,sort=nearest] run function gm4_mob_curing:cure/consume_item -tp @s ~ ~-2050 ~ -kill @s diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/cure/witch.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/cure/witch.mcfunction deleted file mode 100644 index 592f8388e3..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/cure/witch.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -# Replaces the Witch with a Potion Cleric -# @s = witch with weakness needing conversion -# at @s -# run from check_item - -summon villager ~ ~ ~ {Tags:["gm4_mob_curing_potion_cleric","gm4_mob_curing_needs_init"],VillagerData:{profession:"minecraft:cleric",level:5,type:"minecraft:plains"},Xp:1,CustomName:{"translate":"entity.gm4.potion_cleric","fallback":"Potion Cleric§"},Team:"gm4_hide_name"} - -tp @e[type=villager,distance=..1,tag=gm4_mob_curing_needs_init,sort=nearest,limit=1] @s -tag @s add gm4_mob_curing_needs_init -data modify entity @e[type=villager,tag=gm4_mob_curing_needs_init,limit=1] {} merge from entity @s {} - -# Mark the gapple -tag @e[type=item,limit=1,nbt={Item:{id:"minecraft:golden_apple"}},distance=..3,sort=nearest] add gm4_gapple - -# Randomise the number of emeralds each potion costs -execute as @e[type=villager,tag=gm4_mob_curing_needs_init,limit=1,distance=..1] at @s run function gm4_mob_curing:potion_cleric/initialise - -# effects -particle explosion ~ ~.5 ~ 1 .3 1 0 1 -playsound minecraft:entity.zombie_villager.converted neutral @a[distance=..8] - -# Clean up -execute as @e[type=item,limit=1,tag=gm4_gapple,distance=..3] run function gm4_mob_curing:cure/consume_item - -tp @s ~ ~-2050 ~ -kill @s diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/cure/zoglin.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/cure/zoglin.mcfunction deleted file mode 100644 index 4635c5c836..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/cure/zoglin.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Replaces zombified hoglin with hoglin -# @s = zombified hoglin with swiftness needing conversion -# at @s -# run from main - -summon hoglin ~ ~ ~ {Tags:["gm4_mob_curing_new_hoglin"]} - -tp @e[type=hoglin,distance=..1,tag=gm4_mob_curing_new_hoglin,sort=nearest,limit=1] @s -data modify entity @e[type=hoglin,tag=gm4_mob_curing_new_hoglin,limit=1] {} merge from entity @s {} -tag @e[type=hoglin,tag=gm4_mob_curing_new_hoglin] remove gm4_mob_curing_new_hoglin - -particle explosion ~ ~.5 ~ 1 .3 1 0 1 -playsound minecraft:entity.zombie_villager.converted neutral @a[distance=..8] -execute as @e[type=item,limit=1,nbt={Item:{id:"minecraft:golden_carrot"}},distance=..3,sort=nearest] run function gm4_mob_curing:cure/consume_item -tp @s ~ ~-2050 ~ -kill @s diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/cure/zombified_check.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/cure/zombified_check.mcfunction deleted file mode 100644 index 589854efd4..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/cure/zombified_check.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# check potion effect of zombified piglin -# @s = zombified piglin with golden carrot nearby -# at @s -# run from main - -execute if entity @s[nbt={active_effects:[{id:'minecraft:weakness'}]}] run function gm4_mob_curing:cure/zombified_piglin -execute if entity @s[nbt={active_effects:[{id:'minecraft:speed'}]}] run function gm4_mob_curing:cure/zombified_pig diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/cure/zombified_pig.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/cure/zombified_pig.mcfunction deleted file mode 100644 index c7692e326c..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/cure/zombified_pig.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Replaces zombified piglin with pig -# @s = zombified piglin with swiftness needing conversion -# at @s -# run from cure/zombified_check - -summon pig ~ ~ ~ {Tags:["gm4_mob_curing_new_pig"]} - -tp @e[type=pig,distance=..1,tag=gm4_mob_curing_new_pig,sort=nearest,limit=1] @s -data modify entity @e[type=pig,tag=gm4_mob_curing_new_pig,limit=1] {} merge from entity @s {} -tag @e[type=pig,tag=gm4_mob_curing_new_pig] remove gm4_mob_curing_new_pig - -particle explosion ~ ~.5 ~ 1 .3 1 0 1 -playsound minecraft:entity.zombie_villager.converted neutral @a[distance=..8] -execute as @e[type=item,limit=1,nbt={Item:{id:"minecraft:golden_carrot"}},distance=..3,sort=nearest] run function gm4_mob_curing:cure/consume_item -tp @s ~ ~-2050 ~ -kill @s diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/cure/zombified_piglin.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/cure/zombified_piglin.mcfunction deleted file mode 100644 index d69e1af5cd..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/cure/zombified_piglin.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Replaces zombified piglin with piglin -# @s = zombified piglin with swiftness needing conversion -# at @s -# run from cure/zombified_check - -summon piglin ~ ~ ~ {Tags:["gm4_mob_curing_new_piglin"]} - -tp @e[type=piglin,distance=..1,tag=gm4_mob_curing_new_piglin,sort=nearest,limit=1] @s -data modify entity @e[type=piglin,tag=gm4_mob_curing_new_piglin,limit=1] {} merge from entity @s {} -tag @e[type=piglin,tag=gm4_mob_curing_new_piglin] remove gm4_mob_curing_new_piglin - -particle explosion ~ ~.5 ~ 1 .3 1 0 1 -playsound minecraft:entity.zombie_villager.converted neutral @a[distance=..8] -execute as @e[type=item,limit=1,nbt={Item:{id:"minecraft:golden_carrot"}},distance=..3,sort=nearest] run function gm4_mob_curing:cure/consume_item -tp @s ~ ~-2050 ~ -kill @s diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/init.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/init.mcfunction deleted file mode 100644 index c1c5edddf3..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/init.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -scoreboard objectives add gm4_mob_curing_data dummy -team add gm4_hide_name -team modify gm4_hide_name nametagVisibility never - -execute unless score mob_curing gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Mob Curing"} -execute unless score mob_curing gm4_earliest_version < mob_curing gm4_modules run scoreboard players operation mob_curing gm4_earliest_version = mob_curing gm4_modules -scoreboard players set mob_curing gm4_modules 1 - -schedule function gm4_mob_curing:main 1t - - - -#$moduleUpdateList diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/main.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/main.mcfunction deleted file mode 100644 index 701b92be2f..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/main.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -execute as @e[type=item] at @s run function gm4_mob_curing:check_item - -schedule function gm4_mob_curing:main 16t diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/potion_cleric/discount_curer.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/potion_cleric/discount_curer.mcfunction deleted file mode 100644 index 0084a5a49f..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/potion_cleric/discount_curer.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -# Gives the curer a discount for the newly cured Potion Cleric -# @s = Potion Cleric villager converted from witch. -# at @s -# run from initialise_potion_cleric - -# Builds the gossips array on storage to avoid a bug with modifying gossips -data merge storage gm4_mob_curing:temp {Gossips:[{Type:"minor_positive",Value:20}]} -data modify storage gm4_mob_curing:temp Gossips[0].Target set from entity @e[type=minecraft:item,limit=1,distance=..3,tag=gm4_gapple] Thrower -data modify entity @s Gossips set from storage gm4:temp Gossips - -execute store result score $curer gm4_mob_curing_data run data get storage gm4_mob_curing:temp Gossips[0].Target[3] 0.001 -execute as @a[distance=..16] store result score @s gm4_mob_curing_data run data get entity @s UUID[3] 0.001 -execute as @a[distance=..16] if score @s gm4_mob_curing_data = $curer gm4_mob_curing_data run advancement grant @s only gm4:mob_curing - -data remove storage gm4_mob_curing:temp {} diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/potion_cleric/initialise.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/potion_cleric/initialise.mcfunction deleted file mode 100644 index 1b808a7f91..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/potion_cleric/initialise.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# Creates Potion Cleric's trades based on lib_trades -# @s = Potion Cleric -# at @s -# run from gm4_mob_curing:cure/witch - -# trade stuff -function gm4_mob_curing:potion_cleric/register_trades -function #gm4_trades:modify_external_trader - -# discount the curer -execute if data entity @e[type=minecraft:item,limit=1,distance=..3,tag=gm4_gapple] Thrower run function gm4_mob_curing:potion_cleric/discount_curer -tag @s remove gm4_mob_curing_needs_init diff --git a/gm4_mob_curing/data/gm4_mob_curing/function/potion_cleric/register_trades.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/function/potion_cleric/register_trades.mcfunction deleted file mode 100644 index 9c942bd570..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/function/potion_cleric/register_trades.mcfunction +++ /dev/null @@ -1,45 +0,0 @@ -# @s = Potion Cleric -# run from gm4_mob_curing:verify_dimension - -# remove vanilla trades -data remove entity @s Offers.Recipes - -# trade for slot 1 (nether wart for 4-7 emeralds) -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_mob_curing_trade_0_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:9999999,rewardXp:8b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_mob_curing_trade_0_option] horse.0 loot gm4_mob_curing:technical/potion_cleric/trade_1 - -# trade for slot 2 (gunpowder for 3-5 emeralds) -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_mob_curing_trade_1_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:9999999,rewardXp:8b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_mob_curing_trade_1_option] horse.0 loot gm4_mob_curing:technical/potion_cleric/trade_2 - -# trade for slot 3 -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_mob_curing_trade_2_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:9999999,rewardXp:24b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_mob_curing_trade_2_option] horse.0 loot gm4_mob_curing:technical/potion_cleric/all_trades - -# trade for slot 4 -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_mob_curing_trade_3_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:9999999,rewardXp:24b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_mob_curing_trade_3_option] horse.0 loot gm4_mob_curing:technical/potion_cleric/all_trades - -# trade for slot 5 -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_mob_curing_trade_4_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:9999999,rewardXp:24b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_mob_curing_trade_4_option] horse.0 loot gm4_mob_curing:technical/potion_cleric/all_trades - -# trade for slot 6 -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_mob_curing_trade_5_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:9999999,rewardXp:24b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_mob_curing_trade_5_option] horse.0 loot gm4_mob_curing:technical/potion_cleric/all_trades - -# trade for slot 7 -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_mob_curing_trade_6_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:9999999,rewardXp:24b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_mob_curing_trade_6_option] horse.0 loot gm4_mob_curing:technical/potion_cleric/all_trades - -# trade for slot 8 -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_mob_curing_trade_7_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:9999999,rewardXp:24b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_mob_curing_trade_7_option] horse.0 loot gm4_mob_curing:technical/potion_cleric/all_trades - -# trade for slot 9 -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_mob_curing_trade_8_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:9999999,rewardXp:24b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_mob_curing_trade_8_option] horse.0 loot gm4_mob_curing:technical/potion_cleric/all_trades - -# trade for slot 10 -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_mob_curing_trade_9_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:9999999,rewardXp:24b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_mob_curing_trade_9_option] horse.0 loot gm4_mob_curing:technical/potion_cleric/all_trades diff --git a/gm4_mob_curing/data/gm4_mob_curing/guidebook/mob_curing.json b/gm4_mob_curing/data/gm4_mob_curing/guidebook/mob_curing.json deleted file mode 100644 index c8be5ff1a9..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/guidebook/mob_curing.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "id": "mob_curing", - "name": "Mob Curing", - "module_type": "module", - "icon": { - "id": "minecraft:golden_apple" - }, - "criteria": { - "obtain_splash_potion": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:splash_potion" - ] - } - ] - } - }, - "find_potion_cleric": { - "trigger": "minecraft:player_interacted_with_entity", - "conditions": { - "entity": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type": "minecraft:villager", - "components": { - "minecraft:villager/variant": "minecraft:plains" - }, - "nbt": "{CustomName:{\"translate\":\"entity.gm4.potion_cleric\",\"fallback\":\"Potion Cleric§\"}}" - } - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.mob_curing.description", - "fallback": "Similar to Zombie curing, some mobs can be reverted to previous forms.\n\nThe curing process requires one to splash the mob with a potion and drop an item at its feet." - } - ] - ] - }, - { - "name": "conversions", - "enable": [], - "requirements": [ - [ - "obtain_splash_potion" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.mob_curing.conversions", - "fallback": "Zomb. Piglin -> Pig\n - Swiftness\n - Golden Carrot\n\nZomb. Piglin -> Piglin\n OR Zoglin -> Hoglin\n - Weakness\n - Golden Carrot\n\nWitch -> Potion Cleric\n - Weakness\n - Golden Apple" - } - ], - [ - { - "translate": "text.gm4.guidebook.mob_curing.conversions_1", - "fallback": "Evoker -> Pillager\n - Slowness IV\n - Crossbow\n\nIllusioner -> Evoker\n - Swiftness\n - Totem of Undying\n\nCow -> Mooshroom\n - Slowness\n - Red Mushroom\n - Brown Mushroom" - } - ] - ] - }, - { - "name": "potion_cleric", - "enable": [], - "requirements": [ - [ - "find_potion_cleric" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.mob_curing.potion_cleric", - "fallback": "The Potion Cleric will sell various potions for emeralds. Each potion trade is randomized starting from 3 emeralds, up to 13 emeralds.\n\nThe curer will be rewarded temporarily with some discounted potion prices." - } - ] - ], - "grants": [ - "conversions" - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/all_trades.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/all_trades.json deleted file mode 100644 index 0b1287b0a0..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/all_trades.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "weight": 40, - "value": "gm4_mob_curing:technical/potion_cleric/base/drinkable" - }, - { - "type": "minecraft:loot_table", - "weight": 20, - "value": "gm4_mob_curing:technical/potion_cleric/base/splash" - }, - { - "type": "minecraft:loot_table", - "weight": 5, - "value": "gm4_mob_curing:technical/potion_cleric/base/lingering" - }, - { - "type": "minecraft:loot_table", - "weight": 20, - "value": "gm4_mob_curing:technical/potion_cleric/upgraded/drinkable" - }, - { - "type": "minecraft:loot_table", - "weight": 10, - "value": "gm4_mob_curing:technical/potion_cleric/upgraded/splash" - }, - { - "type": "minecraft:loot_table", - "weight": 5, - "value": "gm4_mob_curing:technical/potion_cleric/upgraded/lingering" - }, - { - "type": "minecraft:loot_table", - "weight": 10, - "value": "gm4_mob_curing:technical/potion_cleric/zauber/drinkable", - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_zauber_cauldrons" - }, - "score": "load.status" - }, - "range": 1 - } - ] - }, - { - "type": "minecraft:loot_table", - "weight": 4, - "value": "gm4_mob_curing:technical/potion_cleric/zauber/splash", - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_zauber_cauldrons" - }, - "score": "load.status" - }, - "range": 1 - } - ] - }, - { - "type": "minecraft:loot_table", - "weight": 1, - "value": "gm4_mob_curing:technical/potion_cleric/zauber/lingering", - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_zauber_cauldrons" - }, - "score": "load.status" - }, - "range": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/base/drinkable.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/base/drinkable.json deleted file mode 100644 index 1e1170aa91..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/base/drinkable.json +++ /dev/null @@ -1,288 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:fire_resistance" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:harming" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:healing" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:infested" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:invisibility" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:leaping" - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:luck" - } - ], - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_zauber_cauldrons" - }, - "score": "load.status" - }, - "range": 1 - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:night_vision" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:oozing" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:poison" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:regeneration" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:slow_falling" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strength" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:swiftness" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:turtle_master" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:water_breathing" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:weakness" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:weaving" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:wind_charged" - } - ] - }, - { - "type": "minecraft:loot_table", - "weight": 3, - "value": "gm4_lightning_in_a_bottle:items/bottle_of_lightning", - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_lightning_in_a_bottle" - }, - "score": "load.status" - }, - "range": 1 - } - ] - }, - { - "type": "minecraft:loot_table", - "weight": 3, - "value": "gm4_potion_liquids:floating_potion", - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_potion_liquids" - }, - "score": "load.status" - }, - "range": 1 - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 3, - "max": 5 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/base/lingering.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/base/lingering.json deleted file mode 100644 index 80bdaef41c..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/base/lingering.json +++ /dev/null @@ -1,288 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:fire_resistance" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:harming" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:healing" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:infested" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:invisibility" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:leaping" - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:luck" - } - ], - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_zauber_cauldrons" - }, - "score": "load.status" - }, - "range": 1 - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:night_vision" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:oozing" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:poison" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:regeneration" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:slow_falling" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strength" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:swiftness" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:turtle_master" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:water_breathing" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:weakness" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:weaving" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:wind_charged" - } - ] - }, - { - "type": "minecraft:loot_table", - "weight": 3, - "value": "gm4_lightning_in_a_bottle:items/lingering_bottle_of_lightning", - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_lightning_in_a_bottle" - }, - "score": "load.status" - }, - "range": 1 - } - ] - }, - { - "type": "minecraft:loot_table", - "weight": 3, - "value": "gm4_potion_liquids:lingering_floating_potion", - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_potion_liquids" - }, - "score": "load.status" - }, - "range": 1 - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 5, - "max": 7 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/base/splash.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/base/splash.json deleted file mode 100644 index 49d221d577..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/base/splash.json +++ /dev/null @@ -1,288 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:fire_resistance" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:harming" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:healing" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:infested" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:invisibility" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:leaping" - } - ] - }, - { - "type": "minecraft:item", - "weight": 1, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:luck" - } - ], - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_zauber_cauldrons" - }, - "score": "load.status" - }, - "range": 1 - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:night_vision" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:oozing" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:poison" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:regeneration" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:slow_falling" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strength" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:swiftness" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:turtle_master" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:water_breathing" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:weakness" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:weaving" - } - ] - }, - { - "type": "minecraft:item", - "weight": 5, - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:wind_charged" - } - ] - }, - { - "type": "minecraft:loot_table", - "weight": 3, - "value": "gm4_lightning_in_a_bottle:items/splash_bottle_of_lightning", - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_lightning_in_a_bottle" - }, - "score": "load.status" - }, - "range": 1 - } - ] - }, - { - "type": "minecraft:loot_table", - "weight": 3, - "value": "gm4_potion_liquids:splash_floating_potion", - "conditions": [ - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "gm4_potion_liquids" - }, - "score": "load.status" - }, - "range": 1 - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 4, - "max": 6 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/trade_1.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/trade_1.json deleted file mode 100644 index 2ec6fa8ad9..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/trade_1.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:nether_wart", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - }, - { - "function": "minecraft:set_count", - "count": 1, - "add": true, - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.2 - } - ] - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald" - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 4, - "max": 7 - } - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/trade_2.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/trade_2.json deleted file mode 100644 index 97c9f91fc8..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/trade_2.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:gunpowder", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald" - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 3, - "max": 5 - } - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/upgraded/drinkable.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/upgraded/drinkable.json deleted file mode 100644 index ed1b495346..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/upgraded/drinkable.json +++ /dev/null @@ -1,247 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_fire_resistance" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_invisibility" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_leaping" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_night_vision" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_poison" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_regeneration" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_slow_falling" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_slowness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_strength" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_swiftness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_turtle_master" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_water_breathing" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_weakness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_harming" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_healing" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_leaping" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_poison" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_regeneration" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_slowness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_strength" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_swiftness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_turtle_master" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 6, - "max": 8 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/upgraded/lingering.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/upgraded/lingering.json deleted file mode 100644 index 4069a761d5..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/upgraded/lingering.json +++ /dev/null @@ -1,247 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_fire_resistance" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_invisibility" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_leaping" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_night_vision" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_poison" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_regeneration" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_slow_falling" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_slowness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_strength" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_swiftness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_turtle_master" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_water_breathing" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_weakness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_harming" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_healing" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_leaping" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_poison" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_regeneration" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_slowness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_strength" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_swiftness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:lingering_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_turtle_master" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 8, - "max": 10 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/upgraded/splash.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/upgraded/splash.json deleted file mode 100644 index 7c6327af83..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/upgraded/splash.json +++ /dev/null @@ -1,247 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_fire_resistance" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_invisibility" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_leaping" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_night_vision" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_poison" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_regeneration" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_slow_falling" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_slowness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_strength" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_swiftness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_turtle_master" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_water_breathing" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:long_weakness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_harming" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_healing" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_leaping" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_poison" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_regeneration" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_slowness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_strength" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_swiftness" - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:splash_potion", - "functions": [ - { - "function": "minecraft:set_potion", - "id": "minecraft:strong_turtle_master" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 7, - "max": 9 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/zauber/drinkable.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/zauber/drinkable.json deleted file mode 100644 index ea96555cf1..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/zauber/drinkable.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/drinkable/instant_damage" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/drinkable/instant_health" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/drinkable/jump_boost" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/drinkable/poison" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/drinkable/regeneration" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/drinkable/speed" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/drinkable/strength" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 9, - "max": 11 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/zauber/lingering.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/zauber/lingering.json deleted file mode 100644 index b16fd41c3b..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/zauber/lingering.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/lingering/instant_damage" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/lingering/instant_health" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/lingering/jump_boost" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/lingering/poison" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/lingering/regeneration" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/lingering/speed" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/lingering/strength" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 11, - "max": 13 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/zauber/splash.json b/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/zauber/splash.json deleted file mode 100644 index 58cf05193e..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/loot_table/technical/potion_cleric/zauber/splash.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/splash/instant_damage" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/splash/instant_health" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/splash/jump_boost" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/splash/poison" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/splash/regeneration" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/splash/speed" - }, - { - "type": "minecraft:loot_table", - "value": "gm4_zauber_cauldrons:items/potions/splash/strength" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 10, - "max": 12 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mob_curing/data/gm4_mob_curing/test/cow_to_mooshroom.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/test/cow_to_mooshroom.mcfunction deleted file mode 100644 index 9fce678b92..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/test/cow_to_mooshroom.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# @template gm4:test_tube - -summon cow ~1.5 ~1 ~1.5 -summon item ~1.5 ~2 ~1.5 {Item:{id:"red_mushroom"}} -summon item ~1.5 ~2 ~1.5 {Item:{id:"brown_mushroom"}} -summon splash_potion ~1.5 ~3 ~1.5 {Item:{id:"splash_potion",components:{"minecraft:potion_contents":"minecraft:slowness"}}} - -await entity @e[type=mooshroom] inside -assert not entity @e[type=cow] inside -assert not entity @e[type=item] inside diff --git a/gm4_mob_curing/data/gm4_mob_curing/test/witch_to_potion_cleric.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/test/witch_to_potion_cleric.mcfunction deleted file mode 100644 index 7f9549e3f8..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/test/witch_to_potion_cleric.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @template gm4:test_tube - -summon witch ~1.5 ~1 ~1.5 -summon item ~1.5 ~2 ~1.5 {Item:{id:"golden_apple"}} -summon splash_potion ~1.5 ~3 ~1.5 {Item:{id:"splash_potion",components:{"minecraft:potion_contents":"minecraft:weakness"}}} - -await entity @e[type=villager] inside -assert not entity @e[type=zombified_piglin] inside -assert not entity @e[type=item] inside diff --git a/gm4_mob_curing/data/gm4_mob_curing/test/ziglin_to_pig.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/test/ziglin_to_pig.mcfunction deleted file mode 100644 index 4530242106..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/test/ziglin_to_pig.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @template gm4:test_tube - -summon zombified_piglin ~1.5 ~1 ~1.5 -summon item ~1.5 ~2 ~1.5 {Item:{id:"golden_carrot"}} -summon splash_potion ~1.5 ~3 ~1.5 {Item:{id:"splash_potion",components:{"minecraft:potion_contents":"minecraft:swiftness"}}} - -await entity @e[type=pig] inside -assert not entity @e[type=zombified_piglin] inside -assert not entity @e[type=item] inside diff --git a/gm4_mob_curing/data/gm4_mob_curing/test/ziglin_to_piglin.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/test/ziglin_to_piglin.mcfunction deleted file mode 100644 index cc43fcd3f2..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/test/ziglin_to_piglin.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @template gm4:test_tube - -summon zombified_piglin ~1.5 ~1 ~1.5 -summon item ~1.5 ~2 ~1.5 {Item:{id:"golden_carrot"}} -summon splash_potion ~1.5 ~3 ~1.5 {Item:{id:"splash_potion",components:{"minecraft:potion_contents":"minecraft:weakness"}}} - -await entity @e[type=piglin] inside -assert not entity @e[type=zombified_piglin] inside -assert not entity @e[type=item] inside diff --git a/gm4_mob_curing/data/gm4_mob_curing/test/zoglin_to_hoglin.mcfunction b/gm4_mob_curing/data/gm4_mob_curing/test/zoglin_to_hoglin.mcfunction deleted file mode 100644 index 342b6a189d..0000000000 --- a/gm4_mob_curing/data/gm4_mob_curing/test/zoglin_to_hoglin.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @template gm4:test_tube - -summon zoglin ~1.5 ~1 ~1.5 -summon item ~1.5 ~2 ~1.5 {Item:{id:"golden_carrot"}} -summon splash_potion ~1.5 ~3 ~1.5 {Item:{id:"splash_potion",components:{"minecraft:potion_contents":"minecraft:swiftness"}}} - -await entity @e[type=hoglin] inside -assert not entity @e[type=zoglin] inside -assert not entity @e[type=item] inside diff --git a/gm4_mob_curing/pack.png b/gm4_mob_curing/pack.png deleted file mode 100644 index 006ad2aa3e..0000000000 Binary files a/gm4_mob_curing/pack.png and /dev/null differ diff --git a/gm4_mob_curing/pack.svg b/gm4_mob_curing/pack.svg deleted file mode 100644 index c76965d240..0000000000 --- a/gm4_mob_curing/pack.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/function/init.mcfunction b/gm4_monsters_unbound/data/gm4_monsters_unbound/function/init.mcfunction index 042db8c107..dd17a72cdc 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/function/init.mcfunction +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/function/init.mcfunction @@ -23,7 +23,7 @@ execute unless score $phantoms_disabled gm4_mu_data matches 1 run gamerule spawn execute unless score $phantoms_disabled gm4_mu_data matches 1 run data modify storage gm4:log queue append value {type:"text",message:{"text":"[INFO] Monsters Unbound changed gamerule spawn_phantoms to false"}} scoreboard players set $phantoms_disabled gm4_mu_data 1 execute store result score $doinsomnia gm4_mu_data run gamerule spawn_phantoms -execute if score $spawn_phantoms gm4_mu_config matches 1 if score $doinsomnia gm4_mu_data matches 1 run data modify storage gm4:log queue append value {type:"text",message:[{"text":"[WARN]","color":"red"},{"text":" Monsters Unbound requires minecraft:spawn_phantoms to be false, but it is true. ","color":"white"},{"text":"click here to fix","color":"red","clickEvent":{"action":"suggest_command","value":"/gamerule spawn_phantoms false"}}]} +execute if score $spawn_phantoms gm4_mu_config matches 1 if score $doinsomnia gm4_mu_data matches 1 run data modify storage gm4:log queue append value {type:"text",message:[{"text":"[WARN]","color":"red"},{"text":" Monsters Unbound requires minecraft:spawn_phantoms to be false, but it is true. ","color":"white"},{"text":"click here to fix","color":"red","click_event":{"action":"suggest_command","command":"/gamerule spawn_phantoms false"}}]} # mob caps execute unless score $mob_limit.husk_army gm4_mu_config matches -2147483648..2147483647 run scoreboard players set $mob_limit.husk_army gm4_mu_config 128 diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/guidebook/monsters_unbound.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/guidebook/monsters_unbound.json index 6b31d4f79d..d044e8399c 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/guidebook/monsters_unbound.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/guidebook/monsters_unbound.json @@ -288,9 +288,9 @@ "translate": "text.gm4.guidebook.monsters_unbound.burned", "fallback": "burned", "color": "blue", - "hoverEvent": { + "hover_event": { "action": "show_text", - "contents": [ + "value": [ "- ", { "translate": "biome.minecraft.desert" @@ -362,9 +362,9 @@ "translate": "text.gm4.guidebook.monsters_unbound.flowering", "fallback": "flowering", "color": "blue", - "hoverEvent": { + "hover_event": { "action": "show_text", - "contents": [ + "value": [ "- ", { "translate": "biome.minecraft.sunflower_plains" @@ -407,9 +407,9 @@ "translate": "text.gm4.guidebook.monsters_unbound.growth", "fallback": "growth", "color": "blue", - "hoverEvent": { + "hover_event": { "action": "show_text", - "contents": [ + "value": [ "- ", { "translate": "biome.minecraft.snowy_taiga" @@ -464,9 +464,9 @@ "translate": "text.gm4.guidebook.monsters_unbound.mountainous", "fallback": "mountainous", "color": "blue", - "hoverEvent": { + "hover_event": { "action": "show_text", - "contents": [ + "value": [ "- ", { "translate": "biome.minecraft.snowy_slopes" @@ -541,9 +541,9 @@ "translate": "text.gm4.guidebook.monsters_unbound.snowy", "fallback": "snowy", "color": "blue", - "hoverEvent": { + "hover_event": { "action": "show_text", - "contents": [ + "value": [ "- ", { "translate": "biome.minecraft.snowy_plains" @@ -614,9 +614,9 @@ "translate": "text.gm4.guidebook.monsters_unbound.toxic", "fallback": "toxic", "color": "blue", - "hoverEvent": { + "hover_event": { "action": "show_text", - "contents": [ + "value": [ "- ", { "translate": "biome.minecraft.swamp" diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/glacial.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/glacial.json index e38a0530fc..913c9759c2 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/glacial.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/glacial.json @@ -14,7 +14,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/elite_headwear/glacial", + "minecraft:custom_model_data": {"strings":["gm4_monsters_unbound:item/elite_headwear/glacial"]}, "enchantment_glint_override": false, "enchantments": { "binding_curse": 1 diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/mending.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/mending.json index dd31bbd99d..b4593c5f88 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/mending.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/mending.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/elite_headwear/mending", + "minecraft:custom_model_data": {"strings":["gm4_monsters_unbound:item/elite_headwear/mending"]}, "enchantment_glint_override": false, "enchantments": { "binding_curse": 1 diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/pearlescent.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/pearlescent.json index 72e33b3220..ae2966c7ee 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/pearlescent.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/elite/pearlescent.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/elite_headwear/pearlescent", + "minecraft:custom_model_data": {"strings":["gm4_monsters_unbound:item/elite_headwear/pearlescent"]}, "enchantment_glint_override": false, "enchantments": { "binding_curse": 1 diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/mob/equip_armor/spore.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/mob/equip_armor/spore.json index 682023d45d..520446a2a8 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/mob/equip_armor/spore.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/mob/equip_armor/spore.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/spore/cherry" + "minecraft:custom_model_data": {"strings":["gm4_monsters_unbound:item/spore/cherry"]} } } ], @@ -31,7 +31,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/spore/default" + "minecraft:custom_model_data": {"strings":["gm4_monsters_unbound:item/spore/default"]} } } ], @@ -59,7 +59,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/spore/flowering" + "minecraft:custom_model_data": {"strings":["gm4_monsters_unbound:item/spore/flowering"]} } } ], @@ -87,8 +87,7 @@ "target": "item_name", "name": { "translate": "item.gm4.monsters_unbound.zombie_spore", - "fallback": "Zombie Spore", - "italic": false + "fallback": "Zombie Spore" } } ] diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/predicate/chance/spawn_phantom.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/predicate/chance/spawn_phantom.json index 3723be3e3d..4e6d35c711 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/predicate/chance/spawn_phantom.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/predicate/chance/spawn_phantom.json @@ -9,6 +9,7 @@ }, { "condition": "minecraft:time_check", + "clock": "minecraft:overworld", "value": { "min": 13188, "max": 22812 diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/tags/entity_type/modify.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/tags/entity_type/modify.json index 79d0c5d5ca..3fb8d1c6cf 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/tags/entity_type/modify.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/tags/entity_type/modify.json @@ -6,7 +6,7 @@ "minecraft:drowned", "minecraft:enderman", "minecraft:husk", - {"id": "minecraft:parched", "required": false}, + "minecraft:parched", "minecraft:phantom", "minecraft:piglin", "minecraft:silverfish", diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/tags/entity_type/skeleton_types.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/tags/entity_type/skeleton_types.json index c6134d6b8e..4be07ecb00 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/tags/entity_type/skeleton_types.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/tags/entity_type/skeleton_types.json @@ -1,7 +1,7 @@ { "values": [ "minecraft:bogged", - {"id": "minecraft:parched", "required": false}, + "minecraft:parched", "minecraft:skeleton", "minecraft:stray", "minecraft:wither_skeleton" diff --git a/gm4_monsters_unbound/mod.mcdoc b/gm4_monsters_unbound/mod.mcdoc new file mode 100644 index 0000000000..a6037990fb --- /dev/null +++ b/gm4_monsters_unbound/mod.mcdoc @@ -0,0 +1,18 @@ +use ::java::util::text::Text + +dispatch minecraft:storage[gm4_monsters_unbound:temp] to struct { + slowness?: struct { + level: int, + }, + deal?: struct { + damage: float, + }, + set?: struct { + speed: float, + damage: float, + knockback_resistance: float, + }, + Rotation?: [float] @ 2, + Pos?: [double] @ 3, + CustomName?: Text, +} diff --git a/gm4_monsters_unbound/pack.png b/gm4_monsters_unbound/pack.png new file mode 100644 index 0000000000..176885aaea Binary files /dev/null and b/gm4_monsters_unbound/pack.png differ diff --git a/gm4_mountaineering/README.md b/gm4_mountaineering/README.md deleted file mode 100644 index d0d7029a9d..0000000000 --- a/gm4_mountaineering/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Mountaineering - -Scale mountains and cross fields of snow with ease! Climb steep slopes with Crampons and descend into valleys on Skis, perhaps with a jump on the way. - -Mountaineering Example - -### Features -- Crampons allow for vertical stone walls to be climbed -- Use Skis to descend hills quickly and safely; your speed depends on the slope gradient -- Hold Poles in each hand to gain jump boost effects; best paired with Skis -- Adds two Ski-related advancements diff --git a/gm4_mountaineering/beet.yaml b/gm4_mountaineering/beet.yaml deleted file mode 100644 index b6638445b8..0000000000 --- a/gm4_mountaineering/beet.yaml +++ /dev/null @@ -1,48 +0,0 @@ -id: gm4_mountaineering -name: Mountaineering -version: 1.4.X - -data_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - - gm4.plugins.include.lib_custom_crafters - -meta: - gm4: - versioning: - required: - lib_custom_crafters: 3.4.0 - schedule_loops: - - main - - fast_main - model_data: - - item: iron_boots - reference: gui/advancement/ski - template: advancement - - item: diamond_boots - reference: gui/advancement/ski_fast - template: advancement - - item: chainmail_boots - reference: item/crampons - template: vanilla - - item: stick - reference: item/poles - template: vanilla - - item: iron_boots - reference: item/skis - template: vanilla - website: - description: A mezze of mountaineering means! Glide down slopes and scale cliffs. - recommended: [] - notes: - - Experimental Module! Features may be unbalanced and added or removed without an easy upgrade path. - modrinth: - project_id: Wq7Qfkuh - smithed: - pack_id: gm4_mountaineering - wiki: https://wiki.gm4.co/wiki/Mountaineering - credits: - Creator: - - foodiebonus diff --git a/gm4_mountaineering/data/gm4/advancement/ski.json b/gm4_mountaineering/data/gm4/advancement/ski.json deleted file mode 100644 index ca6985c1b7..0000000000 --- a/gm4_mountaineering/data/gm4/advancement/ski.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "display": { - "icon": { - "id": "iron_boots", - "components": { - "minecraft:custom_model_data": "gui/advancement/ski" - } - }, - "title": { - "translate": "advancement.gm4.mountaineering.ski.title", - "fallback": "Piste de Résistance" - }, - "description": { - "translate": "advancement.gm4.mountaineering.ski.description", - "fallback": "Get yourself a pair of skis", - "color": "gray" - } - }, - "parent": "gm4:custom_crafters", - "criteria": { - "mountaineering": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_boots" - ], - "predicates": { - "minecraft:custom_data": "{gm4_mountaineering:{item:\"skis\"}}" - } - } - ] - } - } - } -} diff --git a/gm4_mountaineering/data/gm4/advancement/ski_fast.json b/gm4_mountaineering/data/gm4/advancement/ski_fast.json deleted file mode 100644 index 137f7a3093..0000000000 --- a/gm4_mountaineering/data/gm4/advancement/ski_fast.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "display": { - "icon": { - "id": "diamond_boots", - "components": { - "minecraft:custom_model_data": "gui/advancement/ski_fast" - } - }, - "title": { - "translate": "advancement.gm4.mountaineering.ski_fast.title", - "fallback": "Ski ya Later!" - }, - "description": { - "translate": "advancement.gm4.mountaineering.ski_fast.description", - "fallback": "Reach the highest speed boost while skiing", - "color": "gray" - } - }, - "parent": "gm4:ski", - "criteria": { - "requirement": { - "trigger": "minecraft:impossible" - } - } - } diff --git a/gm4_mountaineering/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_mountaineering/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 0e23a3f3bc..0000000000 --- a/gm4_mountaineering/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "gm4_mountaineering:check_recipes" - ] - } - \ No newline at end of file diff --git a/gm4_mountaineering/data/gm4_mountaineering/advancement/recipes/skis.json b/gm4_mountaineering/data/gm4_mountaineering/advancement/recipes/skis.json deleted file mode 100644 index d38fd96e76..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/advancement/recipes/skis.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "gm4_mountaineering:skis" - } - }, - "has_the_ski_pole_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "gm4_mountaineering:ski_pole" - } - }, - "has_materials": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_boots" - ] - } - ] - } - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_the_ski_pole_recipe", - "has_materials" - ] - ], - "rewards": { - "recipes": [ - "gm4_mountaineering:skis", - "gm4_mountaineering:ski_pole" - ] - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/check_recipes.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/check_recipes.mcfunction deleted file mode 100644 index 3327072636..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/check_recipes.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# Checks for recipes then runs the relevant function to create mountaineering gear - -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 7 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:iron_ingot"},{Slot:2b,id:"minecraft:iron_ingot"},{Slot:3b,id:"minecraft:iron_ingot"},{Slot:4b,id:"minecraft:iron_boots"},{Slot:5b,id:"minecraft:iron_ingot"},{Slot:6b,id:"minecraft:iron_ingot"},{Slot:8b,id:"minecraft:iron_ingot"}]} unless data storage gm4_custom_crafters:temp/crafter Items[3].components."minecraft:custom_data".gm4_mountaineering run function gm4_mountaineering:new_skis -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 3 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:tripwire_hook"},{Slot:3b,id:"minecraft:stick"},{Slot:6b,id:"minecraft:stick"}]} run loot replace block ~ ~ ~ container.0 loot gm4_mountaineering:crafting/poles -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 4 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:chainmail_boots"},{Slot:3b,id:"minecraft:iron_nugget"},{Slot:4b,id:"minecraft:iron_nugget"},{Slot:5b,id:"minecraft:iron_nugget"}]} unless data storage gm4_custom_crafters:temp/crafter Items[0].components."minecraft:custom_data".gm4_mountaineering run function gm4_mountaineering:new_crampons diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/climbing_effects/add_climb_effects.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/climbing_effects/add_climb_effects.mcfunction deleted file mode 100644 index 0290b12811..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/climbing_effects/add_climb_effects.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# add the climbing tag, and spawn shulkers (which die after a brief time) to allow the player to climb a vertical wall -# @s = player wearing crampons, with using_crampons tag, and facing a climbable block -# at @s -# run from player_fast_main - -# provide jump boost -effect give @s jump_boost 1 1 true - -# summon shulker in front and below player, but 1000 blocks up, facing towards them -execute if entity @s[y_rotation=135..-135] positioned ~ ~-1.5 ~-1 align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:2,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"gm4:empty",active_effects:[{id:'minecraft:invisibility',duration:100000,show_particles:0b}]} -execute if entity @s[y_rotation=-135..-45] positioned ~1 ~-1.5 ~ align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:5,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"gm4:empty",active_effects:[{id:'minecraft:invisibility',duration:100000,show_particles:0b}]} -execute if entity @s[y_rotation=-45..45] positioned ~ ~-1.5 ~1 align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:3,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"gm4:empty",active_effects:[{id:'minecraft:invisibility',duration:100000,show_particles:0b}]} -execute if entity @s[y_rotation=45..135] positioned ~-1 ~-1.5 ~ align xyz unless entity @e[type=shulker, tag=gm4_mountaineering_climb_assist, dx=0.5, dz=0.5, dy=1] unless block ~0.5 ~1 ~0.5 minecraft:air run summon minecraft:shulker ~0.5 ~1000 ~0.5 {Color:7,AttachFace:4,Invulnerable:1b,NoAI:1b,NoGravity:1b,PersistenceRequired:1b,Silent:1b,Tags:[gm4_mountaineering_climb_assist, gm4_mountaineering_new_shulker, gm4_mountaineering_peek_unset],DeathLootTable:"gm4:empty",active_effects:[{id:'minecraft:invisibility',duration:100000,show_particles:0b}]} - -# teleport shulker down 999 blocks to bring them into position (999 to put the shulker one block below feet) -execute positioned ~ ~1000 ~ as @e[type=shulker, tag=gm4_mountaineering_climb_assist, tag=gm4_mountaineering_new_shulker] at @s run teleport @s ~ ~-999 ~ -tag @e[type=shulker] remove gm4_mountaineering_new_shulker - -# schedule a function to set the peek of the shulker (can't do it in the same tick as teleporting) -schedule function gm4_mountaineering:climbing_effects/reset_shulker_peek 1t diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/climbing_effects/damage_shulkers.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/climbing_effects/damage_shulkers.mcfunction deleted file mode 100644 index f81a0f6d2f..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/climbing_effects/damage_shulkers.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# increase the score of each climbing shulker, and kill after reaching 6 -# @s = shulker with tag gm4_mountaineering_climb_assist -# at @s -# run from main - -scoreboard players add @s gm4_mountaineering_climbing_shulker_countdown 1 -teleport @s[scores={gm4_mountaineering_climbing_shulker_countdown=6..}] ~ -10000 ~ -kill @s[scores={gm4_mountaineering_climbing_shulker_countdown=6..}] diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/climbing_effects/reset_shulker_peek.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/climbing_effects/reset_shulker_peek.mcfunction deleted file mode 100644 index 5c7ca45ea9..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/climbing_effects/reset_shulker_peek.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# reset the peek values of new shulkers and remove the relevant tag -# @s = player wearing crampons, with using_crampons tag, and facing a climbable block -# at @s -# run from add_climb_effects - -execute as @e[type=shulker, tag=gm4_mountaineering_climb_assist, tag=gm4_mountaineering_peek_unset] run data merge entity @s {Peek:10} -tag @e[type=shulker] remove gm4_mountaineering_peek_unset diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/fast_main.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/fast_main.mcfunction deleted file mode 100644 index 85b9a7c60d..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/fast_main.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# Running on a faster clock to enable smoother climbing and for poles fall damage reduction to work - -execute as @a[gamemode=!spectator] at @s run function gm4_mountaineering:player_fast_main - -schedule function gm4_mountaineering:fast_main 4t diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/get_velocity.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/get_velocity.mcfunction deleted file mode 100644 index 5c56125abb..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/get_velocity.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -# Update the player's velocity scores -# @s = player wearing skis -# at @s -# run from ski_effects/skis_equipped and pole_effects/poles_equipped - -# Get current y-position, store as y1 -execute store result score @s gm4_mountaineering_y1 run data get entity @s Pos[1] - -# Velocity is current position y1 minus previous position y2 -scoreboard players operation @s gm4_mountaineering_vy = @s gm4_mountaineering_y1 -scoreboard players operation @s gm4_mountaineering_vy -= @s gm4_mountaineering_y2 - -# Update y2 for use on next run of this function -scoreboard players operation @s gm4_mountaineering_y2 = @s gm4_mountaineering_y1 - -# Use the same method to get x velocity -execute store result score @s gm4_mountaineering_x1 run data get entity @s Pos[0] -scoreboard players operation @s gm4_mountaineering_vx = @s gm4_mountaineering_x1 -scoreboard players operation @s gm4_mountaineering_vx -= @s gm4_mountaineering_x2 -scoreboard players operation @s gm4_mountaineering_x2 = @s gm4_mountaineering_x1 - -# Use the same method to get z velocity -execute store result score @s gm4_mountaineering_z1 run data get entity @s Pos[2] -scoreboard players operation @s gm4_mountaineering_vz = @s gm4_mountaineering_z1 -scoreboard players operation @s gm4_mountaineering_vz -= @s gm4_mountaineering_z2 -scoreboard players operation @s gm4_mountaineering_z2 = @s gm4_mountaineering_z1 diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/init.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/init.mcfunction deleted file mode 100644 index 002772ebb2..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/init.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -execute unless score mountaineering gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Mountaineering"} -scoreboard players set mountaineering gm4_modules 1 - -scoreboard objectives add gm4_mountaineering_y1 dummy -scoreboard objectives add gm4_mountaineering_y2 dummy -scoreboard objectives add gm4_mountaineering_vy dummy -scoreboard objectives add gm4_mountaineering_x1 dummy -scoreboard objectives add gm4_mountaineering_x2 dummy -scoreboard objectives add gm4_mountaineering_vx dummy -scoreboard objectives add gm4_mountaineering_z1 dummy -scoreboard objectives add gm4_mountaineering_z2 dummy -scoreboard objectives add gm4_mountaineering_vz dummy -scoreboard objectives add gm4_mountaineering_ski_downhill dummy -scoreboard objectives add gm4_mountaineering_ski_steep_downhill dummy -scoreboard objectives add gm4_mountaineering_poles_jump_boost dummy -scoreboard objectives add gm4_mountaineering_jump_counter minecraft.custom:minecraft.jump -scoreboard objectives add gm4_mountaineering_climbing_shulker_countdown dummy -scoreboard objectives add gm4_mountaineering_init_climbing_effects dummy - -schedule function gm4_mountaineering:main 1t -schedule function gm4_mountaineering:fast_main 1t diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/main.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/main.mcfunction deleted file mode 100644 index a58ed71c27..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/main.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -execute as @a[gamemode=!spectator] at @s run function gm4_mountaineering:player_main - -# Initiate crampons when they are first equipped with a tag -tag @a[tag=!gm4_mountaineering_using_crampons,predicate=gm4_mountaineering:wearing_crampons] add gm4_mountaineering_using_crampons - -# Clear crampon tag when crampons are removed -tag @a[predicate=!gm4_mountaineering:wearing_crampons,tag=gm4_mountaineering_using_crampons] remove gm4_mountaineering_using_crampons - -# Reset the jump counter for use in the poles jump boost cooldown -scoreboard players reset @a gm4_mountaineering_jump_counter - -# Apply damage to any climbing shulkers -execute as @e[type=minecraft:shulker,tag=gm4_mountaineering_climb_assist] at @s run function gm4_mountaineering:climbing_effects/damage_shulkers - -schedule function gm4_mountaineering:main 16t diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/new_crampons.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/new_crampons.mcfunction deleted file mode 100644 index 8c795b9b33..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/new_crampons.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Creates new crampons upon correct recipe detection -# @s = custom crafter with correct recipe -# run from check_recipes - -scoreboard players set $crafted gm4_crafting 1 - -# Check in which slots the recipe is -execute if items block ~ ~ ~ container.1 minecraft:chainmail_boots run item modify block ~ ~ ~ container.1 gm4_mountaineering:crampons -execute if items block ~ ~ ~ container.1 minecraft:chainmail_boots run item replace block ~ ~ ~ container.3 with minecraft:air -execute if items block ~ ~ ~ container.1 minecraft:chainmail_boots run item replace block ~ ~ ~ container.4 with minecraft:air -execute if items block ~ ~ ~ container.1 minecraft:chainmail_boots run item replace block ~ ~ ~ container.5 with minecraft:air - -execute if items block ~ ~ ~ container.4 minecraft:chainmail_boots run item modify block ~ ~ ~ container.4 gm4_mountaineering:crampons -execute if items block ~ ~ ~ container.4 minecraft:chainmail_boots run item replace block ~ ~ ~ container.6 with minecraft:air -execute if items block ~ ~ ~ container.4 minecraft:chainmail_boots run item replace block ~ ~ ~ container.7 with minecraft:air -execute if items block ~ ~ ~ container.4 minecraft:chainmail_boots run item replace block ~ ~ ~ container.8 with minecraft:air diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/new_skis.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/new_skis.mcfunction deleted file mode 100644 index 906d5d9407..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/new_skis.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# Creates new skis upon correct recipe detection -# @s = custom crafter with correct recipe -# run from check_recipes - -scoreboard players set $crafted gm4_crafting 1 - -# Create skis in custom crafter -item modify block ~ ~ ~ container.4 gm4_mountaineering:skis -item replace block ~ ~ ~ container.0 with minecraft:air -item replace block ~ ~ ~ container.2 with minecraft:air -item replace block ~ ~ ~ container.3 with minecraft:air -item replace block ~ ~ ~ container.5 with minecraft:air -item replace block ~ ~ ~ container.6 with minecraft:air -item replace block ~ ~ ~ container.8 with minecraft:air diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/player_fast_main.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/player_fast_main.mcfunction deleted file mode 100644 index edd63de670..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/player_fast_main.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# Submain function to limit `as @a` calls in fast_main -# @s = player not in spectator -# at @s -# run from fast_main - -# Adds vertical climbing abilities when wearing crampons and not holding anything -scoreboard players set @s gm4_mountaineering_init_climbing_effects 0 -execute if entity @s[gamemode=!spectator,tag=gm4_mountaineering_using_crampons,predicate=gm4_mountaineering:hands_empty] anchored eyes if block ^ ^ ^1 #gm4_mountaineering:climbable_blocks run scoreboard players set @s gm4_mountaineering_init_climbing_effects 1 -execute if entity @s[gamemode=!spectator,tag=gm4_mountaineering_using_crampons,predicate=gm4_mountaineering:hands_empty,scores={gm4_mountaineering_init_climbing_effects=0}] anchored eyes if block ^ ^-1 ^1 #gm4_mountaineering:climbable_blocks run scoreboard players set @s gm4_mountaineering_init_climbing_effects 1 -execute if entity @s[scores={gm4_mountaineering_init_climbing_effects=1}] run function gm4_mountaineering:climbing_effects/add_climb_effects - -# Give resistance before landing to reduce fall damage when holding poles in both hands -execute if entity @s[gamemode=!spectator,predicate=gm4_mountaineering:holding_poles] if block ~ ~-2 ~ minecraft:air run effect give @s resistance 1 1 true diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/player_main.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/player_main.mcfunction deleted file mode 100644 index 866730cc33..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/player_main.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# Submain function to limit `as @a` calls in main -# @s = player not in spectator -# at @s -# run from main - -# Run ski-related functions -execute if entity @s[predicate=gm4_mountaineering:wearing_skis] run function gm4_mountaineering:ski_effects/skis_equipped - -# Clear ski-related functions when skis are removed -execute if entity @s[predicate=!gm4_mountaineering:wearing_skis,tag=gm4_mountaineering_using_skis] run function gm4_mountaineering:ski_effects/skis_removed - -# Adds jump boost effects when holding poles -execute if entity @s[predicate=gm4_mountaineering:holding_poles] run function gm4_mountaineering:pole_effects/poles_equipped diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/pole_effects/poles_equipped.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/pole_effects/poles_equipped.mcfunction deleted file mode 100644 index d180b0f906..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/pole_effects/poles_equipped.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -# Give pole-related effects - jump boost on a cooldown and reduced fall damage -# @s = player holding poles -# at @s -# run from player_main - -# Records the player's velocities in scoreboards if it wasn't already done (as would be the case if wearing skis) -execute unless entity @s[predicate=gm4_mountaineering:wearing_skis] run function gm4_mountaineering:get_velocity - -# Add jump boost effect (1 with skis, 2 without skis, 3 if having an upwards velocity) -effect give @s[scores={gm4_mountaineering_poles_jump_boost=..0,gm4_mountaineering_vy=2..}] jump_boost 1 2 true -effect give @s[predicate=!gm4_mountaineering:wearing_skis,scores={gm4_mountaineering_poles_jump_boost=..0,gm4_mountaineering_vy=..0}] jump_boost 1 1 true -effect give @s[predicate=gm4_mountaineering:wearing_skis,scores={gm4_mountaineering_poles_jump_boost=..0,gm4_mountaineering_vy=..0}] jump_boost 1 0 true - -# Reduce jump cooldown -scoreboard players remove @s[scores={gm4_mountaineering_poles_jump_boost=1..}] gm4_mountaineering_poles_jump_boost 1 - -# If jump, reset cooldown and jump counter -scoreboard players set @s[scores={gm4_mountaineering_jump_counter=1..}] gm4_mountaineering_poles_jump_boost 3 diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/check_snowy_block.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/check_snowy_block.mcfunction deleted file mode 100644 index 108a20dc05..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/check_snowy_block.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# clear existing tags, check if the player is on a snowy block and wearing skis, add the skiing tag back if yes, and add ski_off_snow tag if not on snowy block -# @s = player wearing skis -# at @s -# run from skis_equipped - -# Remove skiing tags and slowness effects unless the player is in the air -execute if entity @s[tag=gm4_mountaineering_ski_slowness] unless block ~ ~-0.1 ~ minecraft:air run function gm4_mountaineering:ski_effects/ski_off_snow_slowness/remove_off_snow_slowness -execute unless block ~ ~-0.1 ~ minecraft:air run tag @s remove gm4_mountaineering_skiing - -# Add skiing tag if on snow layer or any other snowy block (contained within the predicate) with skis -execute if block ~ ~ ~ minecraft:snow run tag @s add gm4_mountaineering_skiing -tag @s[predicate=gm4_mountaineering:on_snowy_block] add gm4_mountaineering_skiing - -# Add slowness if wearing skis on a non-snowy block -execute if entity @s[tag=!gm4_mountaineering_ski_slowness] unless block ~ ~ ~ minecraft:snow unless predicate gm4_mountaineering:on_snowy_block_or_air run function gm4_mountaineering:ski_effects/ski_off_snow_slowness/add_off_snow_slowness - diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/downhill_ski_speed/add_downhill_ski_speed.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/downhill_ski_speed/add_downhill_ski_speed.mcfunction deleted file mode 100644 index d7a9a91828..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/downhill_ski_speed/add_downhill_ski_speed.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# Add increased speed when player is on snowy block, wearing skis, and travelling downhill (>=2 blocks descended) -# @s = player without skiing tag and having fallen >=2 blocks -# at @s -# run from skis_equipped - -tag @s add gm4_mountaineering_skiing_downhill -scoreboard players set @s gm4_mountaineering_ski_downhill 10 -attribute @s minecraft:movement_speed modifier add minecraft:42a046eb-1425-4efe-831b-f891d8ede18f 0.175 add_multiplied_base diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/downhill_ski_speed/check_downhill_ski_speed.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/downhill_ski_speed/check_downhill_ski_speed.mcfunction deleted file mode 100644 index af3ebdea6c..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/downhill_ski_speed/check_downhill_ski_speed.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Checks that the player still travels downhill (>=1 blocks) -# @s = player with skiing tag and having initially fallen >=2 blocks -# at @s -# run from skis_equipped - -# remove a second of speed if the player has not fallen >=1 block, and an additional second if travelling uphill -scoreboard players remove @s[scores={gm4_mountaineering_ski_downhill=1..,gm4_mountaineering_vy=0..}] gm4_mountaineering_ski_downhill 1 -scoreboard players remove @s[scores={gm4_mountaineering_ski_downhill=1..,gm4_mountaineering_vy=1..}] gm4_mountaineering_ski_downhill 1 -scoreboard players set @s[tag=gm4_mountaineering_skiing,scores={gm4_mountaineering_vy=..-1}] gm4_mountaineering_ski_downhill 10 - -# set scoreboard to 0 if player is not moving -scoreboard players set @s[scores={gm4_mountaineering_vx=0,gm4_mountaineering_vy=0,gm4_mountaineering_vz=0}] gm4_mountaineering_ski_downhill 0 - -# Remove speed if no longer travelling downhill or removed skis -execute if entity @s[scores={gm4_mountaineering_ski_downhill=..0}] run function gm4_mountaineering:ski_effects/downhill_ski_speed/remove_downhill_ski_speed -execute if entity @s[tag=!gm4_mountaineering_skiing] run function gm4_mountaineering:ski_effects/downhill_ski_speed/remove_downhill_ski_speed diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/downhill_ski_speed/remove_downhill_ski_speed.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/downhill_ski_speed/remove_downhill_ski_speed.mcfunction deleted file mode 100644 index f7b4b7ce43..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/downhill_ski_speed/remove_downhill_ski_speed.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# Remove increased speed when player is no longer on snowy block, wearing skis, and travelling downhill (>=2 blocks descended) -# @s = player with skiing tag and downhill skiing tag but not having recently fallen >= 2 blocks -# at @s -# run from check_downhill_ski_speed - -scoreboard players set @s gm4_mountaineering_ski_downhill 0 -attribute @s minecraft:movement_speed modifier remove minecraft:42a046eb-1425-4efe-831b-f891d8ede18f -tag @s remove gm4_mountaineering_skiing_downhill diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/flat_ski_speed/add_flat_ski_speed.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/flat_ski_speed/add_flat_ski_speed.mcfunction deleted file mode 100644 index d4f7279456..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/flat_ski_speed/add_flat_ski_speed.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# Add some speed when player is on snowy block and wearing skis -# @s = player with skiing tag, without speed skiing tag -# at @s -# run from skis_equipped - -attribute @s minecraft:movement_speed modifier add minecraft:f2781530-676b-401d-b2e3-12de37f9b82a 0.3 add_multiplied_base -tag @s add gm4_mountaineering_ski_speed diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/flat_ski_speed/remove_flat_ski_speed.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/flat_ski_speed/remove_flat_ski_speed.mcfunction deleted file mode 100644 index ee0190490c..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/flat_ski_speed/remove_flat_ski_speed.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# Remove speed when player is no longer on snowy block or wearing skis -# @s = player without skiing tag, with speed skiing tag -# at @s -# run from skis_equipped - -attribute @s minecraft:movement_speed modifier remove minecraft:f2781530-676b-401d-b2e3-12de37f9b82a -tag @s remove gm4_mountaineering_ski_speed diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/ski_off_snow_slowness/add_off_snow_slowness.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/ski_off_snow_slowness/add_off_snow_slowness.mcfunction deleted file mode 100644 index 8e3a06a407..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/ski_off_snow_slowness/add_off_snow_slowness.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# Add slowness when a player wears skis on a non-snowy block -# @s = player wearing skis on a non-snowy block, without ski_slowness tag -# at @s -# run from check_snowy_block - -attribute @s minecraft:movement_speed modifier add minecraft:bd5e1dd5-58e8-40fc-9028-cc0d390e7902 -0.2 add_multiplied_base -tag @s add gm4_mountaineering_ski_slowness diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/ski_off_snow_slowness/remove_off_snow_slowness.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/ski_off_snow_slowness/remove_off_snow_slowness.mcfunction deleted file mode 100644 index afb9db7531..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/ski_off_snow_slowness/remove_off_snow_slowness.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# Remove slowness when player stops wearing skis on a non-snowy block -# @s = player not wearing skis on non-snowy block, with ski_slowness tag -# at @s -# run from check_snowy_block - -attribute @s minecraft:movement_speed modifier remove minecraft:bd5e1dd5-58e8-40fc-9028-cc0d390e7902 -tag @s remove gm4_mountaineering_ski_slowness diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/skis_equipped.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/skis_equipped.mcfunction deleted file mode 100644 index 717009c473..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/skis_equipped.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -# Run all ski-related functions -# @s = player wearing skis -# at @s -# run from player_main - -tag @s add gm4_mountaineering_using_skis - -# Adds tags for whether the player is skiing normally or skiing on a non-snowy block -function gm4_mountaineering:ski_effects/check_snowy_block - -# Adds particles at the player's feet when skiing on a snowy bock and without air below -execute if entity @s[tag=gm4_mountaineering_skiing] unless block ~ ~-2 ~ minecraft:air run particle minecraft:cloud ~ ~ ~ 0.1 0.1 0.1 0.001 2 normal - -# Records the player's velocities in scoreboards -function gm4_mountaineering:get_velocity - -# Adds speed effects for skiing on a flat surface -execute if entity @s[tag=gm4_mountaineering_skiing,tag=!gm4_mountaineering_ski_speed] run function gm4_mountaineering:ski_effects/flat_ski_speed/add_flat_ski_speed -execute if entity @s[tag=!gm4_mountaineering_skiing,tag=gm4_mountaineering_ski_speed] run function gm4_mountaineering:ski_effects/flat_ski_speed/remove_flat_ski_speed - -# Adds increased speed effects for skiing on a downhill surface -execute if entity @s[tag=gm4_mountaineering_skiing,tag=!gm4_mountaineering_skiing_downhill,scores={gm4_mountaineering_vy=..-2}] run function gm4_mountaineering:ski_effects/downhill_ski_speed/add_downhill_ski_speed -execute if entity @s[tag=gm4_mountaineering_skiing_downhill] run function gm4_mountaineering:ski_effects/downhill_ski_speed/check_downhill_ski_speed - -# Adds greater increased speed effects for skiing on a steep downhill surface, with a lower vertical velocity threshold if poles are used -execute if entity @s[tag=gm4_mountaineering_skiing,tag=!gm4_mountaineering_skiing_steep_downhill,scores={gm4_mountaineering_vy=..-7}] run function gm4_mountaineering:ski_effects/steep_downhill_ski_speed/add_steep_downhill_ski_speed -execute if entity @s[tag=gm4_mountaineering_skiing,tag=!gm4_mountaineering_skiing_steep_downhill,scores={gm4_mountaineering_vy=..-5},predicate=gm4_mountaineering:holding_poles] run function gm4_mountaineering:ski_effects/steep_downhill_ski_speed/add_steep_downhill_ski_speed -execute if entity @s[tag=gm4_mountaineering_skiing_steep_downhill] run function gm4_mountaineering:ski_effects/steep_downhill_ski_speed/check_steep_downhill_ski_speed diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/skis_removed.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/skis_removed.mcfunction deleted file mode 100644 index 847847574f..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/skis_removed.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Remove all ski-related effects -# @s = player that removed skis -# at @s -# run from player_main - -tag @s remove gm4_mountaineering_using_skis -tag @s remove gm4_mountaineering_skiing -execute if entity @s[tag=gm4_mountaineering_ski_speed] run function gm4_mountaineering:ski_effects/flat_ski_speed/remove_flat_ski_speed -execute if entity @s[tag=gm4_mountaineering_skiing_downhill] run function gm4_mountaineering:ski_effects/downhill_ski_speed/remove_downhill_ski_speed -execute if entity @s[tag=gm4_mountaineering_skiing_steep_downhill] run function gm4_mountaineering:ski_effects/steep_downhill_ski_speed/remove_steep_downhill_ski_speed -execute if entity @s[tag=gm4_mountaineering_ski_slowness] run function gm4_mountaineering:ski_effects/ski_off_snow_slowness/remove_off_snow_slowness diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/steep_downhill_ski_speed/add_steep_downhill_ski_speed.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/steep_downhill_ski_speed/add_steep_downhill_ski_speed.mcfunction deleted file mode 100644 index cb9d673746..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/steep_downhill_ski_speed/add_steep_downhill_ski_speed.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Add further increased speed when player is on snowy block, wearing skis, and travelling steep downhill (>=7 blocks descended, or >=5 blocks with poles) -# @s = player without skiing tag and having fallen >=7 blocks, or >=5 blocks with poles -# at @s -# run from skis_equipped - -tag @s add gm4_mountaineering_skiing_steep_downhill -scoreboard players set @s gm4_mountaineering_ski_steep_downhill 10 -attribute @s minecraft:movement_speed modifier add minecraft:8aed075d-afeb-4943-af9d-6b7e1d31e0de 0.175 add_multiplied_base - -# Give an advancement if not yet achieved -advancement grant @s only gm4:ski_fast diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/steep_downhill_ski_speed/check_steep_downhill_ski_speed.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/steep_downhill_ski_speed/check_steep_downhill_ski_speed.mcfunction deleted file mode 100644 index 23b7192ed5..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/steep_downhill_ski_speed/check_steep_downhill_ski_speed.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -# Checks that the player still travels steep downhill (>=5 blocks, or >=3 blocks with poles) -# @s = player with skiing tag and having initially fallen >=7 blocks, or >=5 blocks with poles -# at @s -# run from skis_equipped - -# vertical speed threshold for speed effect removal is 2 lower than for adding speed effect, to enable longer periods of speed -# also, remove an additional second of speed if travelling uphill -scoreboard players remove @s[scores={gm4_mountaineering_ski_steep_downhill=1..,gm4_mountaineering_vy=-4..},predicate=!gm4_mountaineering:holding_poles] gm4_mountaineering_ski_steep_downhill 1 -scoreboard players remove @s[scores={gm4_mountaineering_ski_steep_downhill=1..,gm4_mountaineering_vy=-2..},predicate=gm4_mountaineering:holding_poles] gm4_mountaineering_ski_steep_downhill 1 -scoreboard players remove @s[scores={gm4_mountaineering_ski_steep_downhill=1..,gm4_mountaineering_vy=1..}] gm4_mountaineering_ski_steep_downhill 1 -scoreboard players set @s[tag=gm4_mountaineering_skiing,scores={gm4_mountaineering_vy=..-4}] gm4_mountaineering_ski_steep_downhill 10 -scoreboard players set @s[tag=gm4_mountaineering_skiing,predicate=gm4_mountaineering:holding_poles,scores={gm4_mountaineering_vy=..-2}] gm4_mountaineering_ski_steep_downhill 10 - -# set scoreboard to 0 if player is not moving -scoreboard players set @s[scores={gm4_mountaineering_vx=0,gm4_mountaineering_vy=0,gm4_mountaineering_vz=0}] gm4_mountaineering_ski_steep_downhill 0 - -# Remove speed if no longer travelling downhill or removed skis -execute if entity @s[scores={gm4_mountaineering_ski_steep_downhill=..0}] run function gm4_mountaineering:ski_effects/steep_downhill_ski_speed/remove_steep_downhill_ski_speed -execute if entity @s[tag=!gm4_mountaineering_skiing] run function gm4_mountaineering:ski_effects/steep_downhill_ski_speed/remove_steep_downhill_ski_speed diff --git a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/steep_downhill_ski_speed/remove_steep_downhill_ski_speed.mcfunction b/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/steep_downhill_ski_speed/remove_steep_downhill_ski_speed.mcfunction deleted file mode 100644 index 0f0a83b025..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/function/ski_effects/steep_downhill_ski_speed/remove_steep_downhill_ski_speed.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# Remove increased speed when player is no longer on snowy block, wearing skis, and travelling steep downhill (>=7 blocks descended, or >=5 blocks with poles) -# @s = player with skiing tag and steep downhill skiing tag but not jhaving recently fallen >=7 blocks, or >=5 blocks with poles -# at @s -# run from check_steep_downhill_ski_speed - -scoreboard players set @s gm4_mountaineering_ski_steep_downhill 0 -attribute @s minecraft:movement_speed modifier remove minecraft:8aed075d-afeb-4943-af9d-6b7e1d31e0de -tag @s remove gm4_mountaineering_skiing_steep_downhill diff --git a/gm4_mountaineering/data/gm4_mountaineering/gm4_recipes/crampons.json b/gm4_mountaineering/data/gm4_mountaineering/gm4_recipes/crampons.json deleted file mode 100644 index 99bff9a69e..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/gm4_recipes/crampons.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - " B ", - "III" - ], - "key": { - "B": { - "item": "minecraft:chainmail_boots" - }, - "I": { - "item": "minecraft:iron_nugget" - } - } - }, - "output": { - "type": "special", - "function": "gm4_mountaineering:new_crampons", - "guidebook": { - "type": "loot_table", - "name": "gm4_mountaineering:items/crampons", - "count": 1 - } - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/gm4_recipes/poles.json b/gm4_mountaineering/data/gm4_mountaineering/gm4_recipes/poles.json deleted file mode 100644 index 3f7d143c41..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/gm4_recipes/poles.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "T", - "I", - "I" - ], - "key": { - "T": { - "item": "minecraft:tripwire_hook" - }, - "I": { - "item": "minecraft:iron_ingot" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_mountaineering:items/poles", - "count": 1 - } - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/gm4_recipes/skis.json b/gm4_mountaineering/data/gm4_mountaineering/gm4_recipes/skis.json deleted file mode 100644 index 69f3b90cbc..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/gm4_recipes/skis.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "I I", - "IBI", - "I I" - ], - "key": { - "B": { - "item": "minecraft:iron_boots" - }, - "I": { - "item": "minecraft:iron_ingot" - } - } - }, - "output": { - "type": "special", - "function": "gm4_mountaineering:new_skis", - "guidebook": { - "type": "loot_table", - "name": "gm4_mountaineering:items/skis", - "count": 1 - } - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/guidebook/mountaineering.json b/gm4_mountaineering/data/gm4_mountaineering/guidebook/mountaineering.json deleted file mode 100644 index 3dccc7b0e6..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/guidebook/mountaineering.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "id": "mountaineering", - "name": "Mountaineering", - "module_type": "module", - "icon": { - "id": "minecraft:chainmail_boots" - }, - "criteria": { - "obtain_iron_ingot": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_ingot" - ] - } - ] - } - }, - "obtain_crampons": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:chainmail_boots" - ], - "predicates": { - "minecraft:custom_data": "{gm4_mountaineering:{item:\"crampons\"}}" - } - } - ] - } - }, - "obtain_skis": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_boots" - ], - "predicates": { - "minecraft:custom_data": "{gm4_mountaineering:{item:\"skis\"}}" - } - } - ] - } - }, - "obtain_ski_pole": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:stick" - ], - "predicates": { - "minecraft:custom_data": "{gm4_mountaineering:{item:\"poles\"}}" - } - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.mountaineering.description", - "fallback": "Several items can be crafted in a Custom Crafter to ease snowy mountain traversal." - } - ] - ] - }, - { - "name": "crafting", - "enable": [], - "requirements": [ - [ - "obtain_iron_ingot" - ] - ], - "pages": [ - [ - "\n", - { - "insert": "recipe", - "recipe": "gm4_mountaineering:crampons" - } - ], - [ - "\n", - { - "insert": "recipe", - "recipe": "gm4_mountaineering:skis" - } - ], - [ - "\n", - { - "insert": "recipe", - "recipe": "gm4_mountaineering:poles" - } - ] - ] - }, - { - "name": "usage_crampons", - "enable": [], - "requirements": [ - [ - "obtain_crampons" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.mountaineering.crampons", - "fallback": "Wearing crampons allows users to scale rocky cliffs. Having empty hands helps with scaling.\n\nUsers can continuously climb rocky cliffs, but staying still will result in falling." - } - ] - ] - }, - { - "name": "usage_skis", - "enable": [], - "requirements": [ - [ - "obtain_skis" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.mountaineering.skis", - "fallback": "Wearing skis allows users to move quickly over snowy surfaces.\n\nContinuously traveling downwards on snowy terrain increases speed, but traveling on non-snowy areas reduces the speed." - } - ] - ] - }, - { - "name": "usage_poles", - "enable": [], - "requirements": [ - [ - "obtain_ski_pole" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.mountaineering.poles", - "fallback": "Holding a Ski Pole in each hand can help when jumping. This is best paired with Skis.\n\nWhen using poles while skiing, a jump enhancement is given if going up a short ramp. Poles also make it easier to gain speed while skiing." - } - ] - ] - } - ] -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/item_modifier/crampons.json b/gm4_mountaineering/data/gm4_mountaineering/item_modifier/crampons.json deleted file mode 100644 index c5c53ba8ac..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/item_modifier/crampons.json +++ /dev/null @@ -1,39 +0,0 @@ -[ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "item/crampons" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_mountaineering:{item:'crampons'}}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.crampons", - "fallback": "Crampons", - "italic": false - } - }, - { - "function": "minecraft:set_attributes", - "modifiers": [ - { - "attribute": "minecraft:movement_speed", - "id": "gm4_mountaineering:crampon_slowness", - "amount": -0.2, - "operation": "add_multiplied_base", - "slot": "feet" - }, - { - "attribute": "minecraft:armor", - "id": "gm4_mountaineering:crampon_armor", - "amount": 1, - "operation": "add_value", - "slot": "feet" - } - ] - } -] diff --git a/gm4_mountaineering/data/gm4_mountaineering/item_modifier/skis.json b/gm4_mountaineering/data/gm4_mountaineering/item_modifier/skis.json deleted file mode 100644 index 2a42146576..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/item_modifier/skis.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "item/skis" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_mountaineering:{item:'skis'}}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.skis", - "fallback": "Skis", - "italic": false - } - } -] diff --git a/gm4_mountaineering/data/gm4_mountaineering/loot_table/crafting/poles.json b/gm4_mountaineering/data/gm4_mountaineering/loot_table/crafting/poles.json deleted file mode 100644 index e4f7845e09..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/loot_table/crafting/poles.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_mountaineering:items/poles", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] - } diff --git a/gm4_mountaineering/data/gm4_mountaineering/loot_table/items/crampons.json b/gm4_mountaineering/data/gm4_mountaineering/loot_table/items/crampons.json deleted file mode 100644 index 1ab5b5b973..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/loot_table/items/crampons.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:chainmail_boots", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "item/crampons" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_mountaineering:{item:'crampons'}}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.crampons", - "fallback": "Crampons", - "italic": false - } - }, - { - "function": "minecraft:set_attributes", - "modifiers": [ - { - "attribute": "minecraft:movement_speed", - "id": "gm4_mountaineering:crampon_slowness", - "amount": -0.2, - "operation": "add_multiplied_base", - "slot": "feet" - }, - { - "attribute": "minecraft:armor", - "id": "gm4_mountaineering:crampon_armor", - "amount": 1, - "operation": "add_value", - "slot": "feet" - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/loot_table/items/poles.json b/gm4_mountaineering/data/gm4_mountaineering/loot_table/items/poles.json deleted file mode 100644 index d46ca641c4..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/loot_table/items/poles.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:stick", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "item/poles", - "minecraft:max_stack_size": 1 - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_mountaineering:{item:'poles'}}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.poles", - "fallback": "Ski Pole", - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/loot_table/items/skis.json b/gm4_mountaineering/data/gm4_mountaineering/loot_table/items/skis.json deleted file mode 100644 index cf18ad8894..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/loot_table/items/skis.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:iron_boots", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "item/skis" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_mountaineering:{item:'skis'}}" - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.skis", - "fallback": "Skis", - "italic": false - } - } - ] - } - ] - } - ] -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/predicate/hands_empty.json b/gm4_mountaineering/data/gm4_mountaineering/predicate/hands_empty.json deleted file mode 100644 index 2454b01d05..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/predicate/hands_empty.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "count": 0 - }, - "offhand": { - "count": 0 - } - } - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/predicate/high_entity.json b/gm4_mountaineering/data/gm4_mountaineering/predicate/high_entity.json deleted file mode 100644 index 18605025fe..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/predicate/high_entity.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "location": { - "position": { - "y": { - "min": 500, - "max": 1500 - } - } - } - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/predicate/holding_poles.json b/gm4_mountaineering/data/gm4_mountaineering/predicate/holding_poles.json deleted file mode 100644 index a4085743ed..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/predicate/holding_poles.json +++ /dev/null @@ -1,34 +0,0 @@ -[ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "offhand": { - "items": [ - "minecraft:stick" - ], - "predicates": { - "minecraft:custom_data": "{gm4_mountaineering:{item:\"poles\"}}" - } - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "items": [ - "minecraft:stick" - ], - "predicates": { - "minecraft:custom_data": "{gm4_mountaineering:{item:\"poles\"}}" - } - } - } - } - } -] diff --git a/gm4_mountaineering/data/gm4_mountaineering/predicate/on_snowy_block.json b/gm4_mountaineering/data/gm4_mountaineering/predicate/on_snowy_block.json deleted file mode 100644 index 8dff532f24..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/predicate/on_snowy_block.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "stepping_on": { - "block": { - "blocks": [ - "minecraft:grass_block" - ], - "state": { - "snowy": "true" - } - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "stepping_on": { - "block": { - "blocks": "#gm4_mountaineering:snowy_blocks" - } - } - } - } - ] -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/predicate/on_snowy_block_or_air.json b/gm4_mountaineering/data/gm4_mountaineering/predicate/on_snowy_block_or_air.json deleted file mode 100644 index 06a754fe03..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/predicate/on_snowy_block_or_air.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "stepping_on": { - "block": { - "blocks": [ - "minecraft:air" - ] - } - } - } - }, - { - "condition": "minecraft:reference", - "name": "gm4_mountaineering:on_snowy_block" - } - ] -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/predicate/wearing_crampons.json b/gm4_mountaineering/data/gm4_mountaineering/predicate/wearing_crampons.json deleted file mode 100644 index 7299b72069..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/predicate/wearing_crampons.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "feet": { - "items": [ - "minecraft:chainmail_boots" - ], - "predicates": { - "minecraft:custom_data": "{gm4_mountaineering:{item:\"crampons\"}}" - } - } - } - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/predicate/wearing_skis.json b/gm4_mountaineering/data/gm4_mountaineering/predicate/wearing_skis.json deleted file mode 100644 index 0141a7ba11..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/predicate/wearing_skis.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "feet": { - "items": [ - "minecraft:iron_boots" - ], - "predicates": { - "minecraft:custom_data": "{gm4_mountaineering:{item:\"skis\"}}" - } - } - } - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/recipe/crampons.json b/gm4_mountaineering/data/gm4_mountaineering/recipe/crampons.json deleted file mode 100644 index 30f83c6b31..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/recipe/crampons.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - " B ", - "NNN" - ], - "key": { - "B": "minecraft:chainmail_boots", - "N": "minecraft:iron_nugget" - }, - "result": { - "id": "minecraft:chainmail_boots", - "components": { - "minecraft:custom_model_data": "item/crampons", - "minecraft:custom_data": "{gm4_mountaineering:{item:'crampons'}}", - "minecraft:custom_name": {"translate":"item.gm4.crampons","fallback":"Crampons","italic":false}, - "minecraft:attribute_modifiers": [ - { - "type": "minecraft:movement_speed", - "id": "gm4_mountaineering:crampon_slowness", - "amount": -0.2, - "operation": "add_multiplied_base", - "slot": "feet" - }, - { - "type": "minecraft:armor", - "id": "gm4_mountaineering:crampon_armor", - "amount": 1, - "operation": "add_value", - "slot": "feet" - } - ] - } - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/recipe/ski_pole.json b/gm4_mountaineering/data/gm4_mountaineering/recipe/ski_pole.json deleted file mode 100644 index 9262be7062..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/recipe/ski_pole.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "T", - "S", - "S" - ], - "key": { - "T": "minecraft:tripwire_hook", - "S": "minecraft:stick" - }, - "result": { - "id": "minecraft:stick", - "components": { - "minecraft:custom_model_data": "item/poles", - "minecraft:max_stack_size": 1, - "minecraft:custom_data": "{gm4_mountaineering:{item:'poles'}}", - "minecraft:custom_name": {"translate":"item.gm4.poles","fallback":"Ski Pole","italic":false} - } - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/recipe/skis.json b/gm4_mountaineering/data/gm4_mountaineering/recipe/skis.json deleted file mode 100644 index 99cb87e8d2..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/recipe/skis.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - "I I", - "IBI", - "I I" - ], - "key": { - "I": "minecraft:iron_ingot", - "B": "minecraft:iron_boots" - }, - "result": { - "id": "minecraft:iron_boots", - "components": { - "minecraft:custom_model_data": "item/skis", - "minecraft:custom_data": "{gm4_mountaineering:{item:'skis'}}", - "minecraft:custom_name": {"translate":"item.gm4.skis","fallback":"Skis","italic":false} - } - } -} diff --git a/gm4_mountaineering/data/gm4_mountaineering/tags/block/climbable_blocks.json b/gm4_mountaineering/data/gm4_mountaineering/tags/block/climbable_blocks.json deleted file mode 100644 index 8a7b1563b7..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/tags/block/climbable_blocks.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "values":[ - "#minecraft:base_stone_overworld", - "#minecraft:coal_ores", - "#minecraft:copper_ores", - "#minecraft:diamond_ores", - "#minecraft:emerald_ores", - "#minecraft:iron_ores", - "#minecraft:lapis_ores", - "#minecraft:redstone_ores", - "minecraft:blue_ice", - "minecraft:cobbled_deepslate", - "minecraft:cobblestone", - "minecraft:deepslate_bricks", - "minecraft:deepslate_gold_ore", - "minecraft:dirt", - "minecraft:gold_ore", - "minecraft:grass_block", - "minecraft:packed_ice", - "minecraft:polished_andesite", - "minecraft:polished_diorite", - "minecraft:polished_granite", - "minecraft:stone_bricks" - ] - } diff --git a/gm4_mountaineering/data/gm4_mountaineering/tags/block/snowy_blocks.json b/gm4_mountaineering/data/gm4_mountaineering/tags/block/snowy_blocks.json deleted file mode 100644 index 89a943b5c8..0000000000 --- a/gm4_mountaineering/data/gm4_mountaineering/tags/block/snowy_blocks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values":[ - "#minecraft:ice", - "minecraft:snow", - "minecraft:snow_block" - ] - } diff --git a/gm4_mountaineering/images/mountaineering.webp b/gm4_mountaineering/images/mountaineering.webp deleted file mode 100644 index 27146af4a5..0000000000 Binary files a/gm4_mountaineering/images/mountaineering.webp and /dev/null differ diff --git a/gm4_mountaineering/pack.png b/gm4_mountaineering/pack.png deleted file mode 100644 index a6d4975dbe..0000000000 Binary files a/gm4_mountaineering/pack.png and /dev/null differ diff --git a/gm4_mountaineering/translations.csv b/gm4_mountaineering/translations.csv deleted file mode 100644 index a50488784d..0000000000 --- a/gm4_mountaineering/translations.csv +++ /dev/null @@ -1,13 +0,0 @@ -key,en_us -advancement.gm4.mountaineering.ski.title,Piste de R\u00e9sistance -advancement.gm4.mountaineering.ski.description,Get yourself a pair of skis -advancement.gm4.mountaineering.ski_fast.title,Ski ya Later! -advancement.gm4.mountaineering.ski_fast.description,Reach the highest speed boost while skiing -item.gm4.crampons,Crampons -item.gm4.poles,Ski Pole -item.gm4.skis,Skis -text.gm4.guidebook.module_desc.mountaineering,A mezze of mountaineering means! Glide down slopes and scale cliffs. -text.gm4.guidebook.mountaineering.description,Several items can be crafted in a Custom Crafter to ease snowy mountain traversal. -text.gm4.guidebook.mountaineering.crampons,"Wearing crampons allows users to scale rocky cliffs. Having empty hands helps with scaling.\n\nUsers can continuously climb rocky cliffs, but staying still will result in falling." -text.gm4.guidebook.mountaineering.skis,"Wearing skis allows users to move quickly over snowy surfaces.\n\nContinuously traveling downwards on snowy terrain increases speed, but traveling on non-snowy areas reduces the speed." -text.gm4.guidebook.mountaineering.poles,"Holding a Ski Pole in each hand can help when jumping. This is best paired with Skis.\n\nWhen using poles while skiing, a jump enhancement is given if going up a short ramp. Poles also make it easier to gain speed while skiing." diff --git a/gm4_mysterious_midnights/beet.yaml b/gm4_mysterious_midnights/beet.yaml index a894d73d35..27ab5d6049 100644 --- a/gm4_mysterious_midnights/beet.yaml +++ b/gm4_mysterious_midnights/beet.yaml @@ -9,6 +9,9 @@ pipeline: - gm4.plugins.extend.module - gm4.plugins.include.lib_forceload +require: + - bolt + meta: gm4: versioning: diff --git a/gm4_mysterious_midnights/data/gm4_falling_stars/function/falling_star/spawn.mcfunction b/gm4_mysterious_midnights/data/gm4_falling_stars/function/falling_star/spawn.mcfunction index cd93377095..4ad49d88eb 100644 --- a/gm4_mysterious_midnights/data/gm4_falling_stars/function/falling_star/spawn.mcfunction +++ b/gm4_mysterious_midnights/data/gm4_falling_stars/function/falling_star/spawn.mcfunction @@ -6,10 +6,9 @@ summon shulker_bullet ~ ~ ~ {Motion:[0.0d,0.0d,0.0d],Tags:["gm4_falling_star","gm4_new_falling_star"],CustomName:{"translate":"entity.gm4.falling_star","fallback":"Falling Star"},Steps:0,Passengers:[{id:"splash_potion",Tags:["gm4_falling_star"],CustomName:"Falling Star",Item:{count:1,id:"splash_potion",components:{"minecraft:potion_contents":{potion:"thick",custom_color:16777215,custom_effects:[{id:"minecraft:levitation",amplifier:0,duration:300}]}}}},{id:"area_effect_cloud",Tags:["gm4_falling_star"],Duration:600,CustomName:"gm4_falling_star_particle",Radius:0.5f,custom_particle:{type:"minecraft:end_rod"}},{id:"item",Age:3600,Tags:["gm4_falling_star","gm4_falling_stars_item"],Item:{count:1,id:"minecraft:end_stone"}}]} # set random motion vector -data modify storage gm4_falling_stars:motion temp.uuid set from entity @e[type=shulker_bullet,tag=gm4_new_falling_star,limit=1] UUID data modify storage gm4_falling_stars:motion temp.motion set value [0.0d,0.0d,0.0d] -execute store result storage gm4_falling_stars:motion temp.motion[0] double 0.0000000003 run data get storage gm4_falling_stars:motion temp.uuid[0] 1 -execute store result storage gm4_falling_stars:motion temp.motion[2] double 0.0000000003 run data get storage gm4_falling_stars:motion temp.uuid[1] 1 +execute store result storage gm4_falling_stars:motion temp.motion[0] double 0.001 run random value -644..644 +execute store result storage gm4_falling_stars:motion temp.motion[2] double 0.001 run random value -644..644 execute as @e[type=shulker_bullet,tag=gm4_new_falling_star,limit=1] run function gm4_falling_stars:falling_star/initilize data remove storage gm4_falling_stars:motion temp diff --git a/gm4_mysterious_midnights/data/gm4_falling_stars/loot_table/endermite_egg.json b/gm4_mysterious_midnights/data/gm4_falling_stars/loot_table/endermite_egg.json index 3951538a25..8911ba0bcd 100644 --- a/gm4_mysterious_midnights/data/gm4_falling_stars/loot_table/endermite_egg.json +++ b/gm4_mysterious_midnights/data/gm4_falling_stars/loot_table/endermite_egg.json @@ -9,10 +9,10 @@ "functions": [ { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.endermite_egg", - "fallback": "Endermite Egg", - "italic": false + "fallback": "Endermite Egg" } }, { @@ -30,7 +30,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/endermite_egg" + "minecraft:custom_model_data": {"strings":["gm4_mysterious_midnights:item/endermite_egg"]} } }, { diff --git a/gm4_mysterious_midnights/data/gm4_mysterious_midnights/function/calculate_difficulty.mcfunction b/gm4_mysterious_midnights/data/gm4_mysterious_midnights/function/calculate_difficulty.mcfunction index 1753765156..dc564d9602 100644 --- a/gm4_mysterious_midnights/data/gm4_mysterious_midnights/function/calculate_difficulty.mcfunction +++ b/gm4_mysterious_midnights/data/gm4_mysterious_midnights/function/calculate_difficulty.mcfunction @@ -2,8 +2,9 @@ # at 29999998 1 7134 (forceloaded chunk) # run from gm4_mysterious_midnights:start_midnight +# TODO: remove raw and bolt require later # generate random number from 0 to 15 -execute store result storage gm4_mysterious_midnights:temp day int 1 run time query day +raw execute store result storage gm4_mysterious_midnights:temp day int 1 run time query day repetition function gm4_mysterious_midnights:roll_difficulty with storage gm4_mysterious_midnights:temp scoreboard players set 16 gm4_mm_data 16 scoreboard players operation difficulty gm4_mm_data %= 16 gm4_mm_data diff --git a/gm4_mysterious_midnights/data/gm4_mysterious_midnights/predicate/is_full_moon_night.json b/gm4_mysterious_midnights/data/gm4_mysterious_midnights/predicate/is_full_moon_night.json index 9b37ce3002..28cd068397 100644 --- a/gm4_mysterious_midnights/data/gm4_mysterious_midnights/predicate/is_full_moon_night.json +++ b/gm4_mysterious_midnights/data/gm4_mysterious_midnights/predicate/is_full_moon_night.json @@ -1,5 +1,6 @@ { "condition": "minecraft:time_check", + "clock": "minecraft:overworld", "value": { "min": 13000, "max": 24000 diff --git a/gm4_mysterious_midnights/mod.mcdoc b/gm4_mysterious_midnights/mod.mcdoc new file mode 100644 index 0000000000..ba4322bd94 --- /dev/null +++ b/gm4_mysterious_midnights/mod.mcdoc @@ -0,0 +1,9 @@ +dispatch minecraft:storage[gm4_mysterious_midnights:temp] to struct { + day?: int, +} + +dispatch minecraft:storage[gm4_falling_stars:motion] to struct { + temp?: struct { + motion: [double] @ 3, + }, +} diff --git a/gm4_orb_of_ankou/backport_71/data/gm4_corripio_shamir/advancement/kill_entity/happy_ghast.json b/gm4_orb_of_ankou/backport_71/data/gm4_corripio_shamir/advancement/kill_entity/happy_ghast.json deleted file mode 100644 index ae831cc903..0000000000 --- a/gm4_orb_of_ankou/backport_71/data/gm4_corripio_shamir/advancement/kill_entity/happy_ghast.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/camel_husk.json b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/camel_husk.json deleted file mode 100644 index ae831cc903..0000000000 --- a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/camel_husk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/nautilus.json b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/nautilus.json deleted file mode 100644 index ae831cc903..0000000000 --- a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/nautilus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/parched.json b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/parched.json deleted file mode 100644 index ae831cc903..0000000000 --- a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/parched.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/zombie_nautilus.json b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/zombie_nautilus.json deleted file mode 100644 index ae831cc903..0000000000 --- a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/zombie_nautilus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_orb_of_ankou/beet.yaml b/gm4_orb_of_ankou/beet.yaml index a3ad147961..4d6a2f4e8f 100644 --- a/gm4_orb_of_ankou/beet.yaml +++ b/gm4_orb_of_ankou/beet.yaml @@ -4,19 +4,6 @@ version: 1.8.X data_pack: load: . - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 71 - min_format: 1 - max_format: 71 - directory: backport_71 - - formats: - min_inclusive: 1 - max_inclusive: 88 - min_format: 1 - max_format: 88 - directory: backport_88 resource_pack: load: @@ -28,7 +15,6 @@ pipeline: - gm4_orb_of_ankou.pneuma_model_template - gm4_metallurgy.shamir_model_template - gm4.plugins.extend.module - - gm4.plugins.include.lib_custom_crafters - gm4.plugins.include.lib_player_motion meta: @@ -36,7 +22,6 @@ meta: versioning: required: gm4_metallurgy: 1.5.0 - lib_custom_crafters: 3.4.0 lib_player_motion: 1.0.0 schedule_loops: - main diff --git a/gm4_orb_of_ankou/data/gm4/advancement/all_pneumas.json b/gm4_orb_of_ankou/data/gm4/advancement/all_pneumas.json index e6ae8e865c..82fe3301b1 100644 --- a/gm4_orb_of_ankou/data/gm4/advancement/all_pneumas.json +++ b/gm4_orb_of_ankou/data/gm4/advancement/all_pneumas.json @@ -3,7 +3,7 @@ "icon": { "id": "nether_star", "components": { - "minecraft:custom_model_data": "gui/advancement/orb_of_ankou_all_pneumas" + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:gui/advancement/orb_of_ankou_all_pneumas"]} } }, "title": { diff --git a/gm4_orb_of_ankou/data/gm4/advancement/create_soul_forge.json b/gm4_orb_of_ankou/data/gm4/advancement/create_soul_forge.json index 8c2986734b..01fe6a6296 100644 --- a/gm4_orb_of_ankou/data/gm4/advancement/create_soul_forge.json +++ b/gm4_orb_of_ankou/data/gm4/advancement/create_soul_forge.json @@ -3,7 +3,7 @@ "icon": { "id": "flint_and_steel", "components": { - "minecraft:custom_model_data": "gui/advancement/orb_of_ankou_soul_forge" + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:gui/advancement/orb_of_ankou_soul_forge"]} } }, "title": { diff --git a/gm4_orb_of_ankou/data/gm4/advancement/create_soul_shard.json b/gm4_orb_of_ankou/data/gm4/advancement/create_soul_shard.json index 8ee3e0dda4..f1c3d71de0 100644 --- a/gm4_orb_of_ankou/data/gm4/advancement/create_soul_shard.json +++ b/gm4_orb_of_ankou/data/gm4/advancement/create_soul_shard.json @@ -4,7 +4,7 @@ "id": "flint", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "gui/advancement/orb_of_ankou_soul_shard" + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:gui/advancement/orb_of_ankou_soul_shard"]} } }, "title": { diff --git a/gm4_orb_of_ankou/data/gm4/advancement/max_orb_of_ankou.json b/gm4_orb_of_ankou/data/gm4/advancement/max_orb_of_ankou.json index 70e3dd35ab..cd04c2dfd1 100644 --- a/gm4_orb_of_ankou/data/gm4/advancement/max_orb_of_ankou.json +++ b/gm4_orb_of_ankou/data/gm4/advancement/max_orb_of_ankou.json @@ -4,7 +4,7 @@ "id": "firework_star", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "gui/advancement/orb_of_ankou_max_orb", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:gui/advancement/orb_of_ankou_max_orb"]}, "minecraft:firework_explosion": { "shape": "small_ball", "colors": [ diff --git a/gm4_orb_of_ankou/data/gm4/advancement/obtain_soul_essence.json b/gm4_orb_of_ankou/data/gm4/advancement/obtain_soul_essence.json index df676d7c11..657a53e1d3 100644 --- a/gm4_orb_of_ankou/data/gm4/advancement/obtain_soul_essence.json +++ b/gm4_orb_of_ankou/data/gm4/advancement/obtain_soul_essence.json @@ -4,7 +4,7 @@ "id": "black_dye", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "gui/advancement/orb_of_ankou_soul_essence" + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:gui/advancement/orb_of_ankou_soul_essence"]} } }, "title": { diff --git a/gm4_orb_of_ankou/data/gm4/advancement/soaring_pneuma.json b/gm4_orb_of_ankou/data/gm4/advancement/soaring_pneuma.json index ce77d58410..a8d81688bc 100644 --- a/gm4_orb_of_ankou/data/gm4/advancement/soaring_pneuma.json +++ b/gm4_orb_of_ankou/data/gm4/advancement/soaring_pneuma.json @@ -4,7 +4,7 @@ "id": "elytra", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "gui/advancement/orb_of_ankou_soaring_pneuma" + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:gui/advancement/orb_of_ankou_soaring_pneuma"]} } }, "title": { diff --git a/gm4_orb_of_ankou/data/gm4/tags/entity_type/undead.json b/gm4_orb_of_ankou/data/gm4/tags/entity_type/undead.json deleted file mode 100644 index eaae205e89..0000000000 --- a/gm4_orb_of_ankou/data/gm4/tags/entity_type/undead.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "values": [ - "minecraft:bogged", - {"id": "minecraft:camel_husk", "required": false}, - "minecraft:drowned", - "minecraft:husk", - {"id": "minecraft:parched", "required": false}, - "minecraft:phantom", - "minecraft:skeleton", - "minecraft:skeleton_horse", - "minecraft:stray", - "minecraft:wither", - "minecraft:wither_skeleton", - "minecraft:zoglin", - "minecraft:zombie", - "minecraft:zombie_horse", - "minecraft:zombie_villager", - {"id": "minecraft:zombie_nautilus", "required": false}, - "minecraft:zombified_piglin" - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_corripio_shamir/loot_table/band.json b/gm4_orb_of_ankou/data/gm4_corripio_shamir/loot_table/band.json index fb5f403783..3067007014 100644 --- a/gm4_orb_of_ankou/data/gm4_corripio_shamir/loot_table/band.json +++ b/gm4_orb_of_ankou/data/gm4_corripio_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/corripio" + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:shamir/corripio"]} } }, { diff --git a/gm4_orb_of_ankou/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_orb_of_ankou/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 3b6850bf76..0000000000 --- a/gm4_orb_of_ankou/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_orb_of_ankou:check_recipes" - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/check_recipes.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/check_recipes.mcfunction deleted file mode 100644 index 29187f0e20..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/check_recipes.mcfunction +++ /dev/null @@ -1 +0,0 @@ -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches ..64 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:netherite_scrap"},{Slot:1b,id:"minecraft:clay_ball"},{Slot:2b,id:"minecraft:netherite_scrap"},{Slot:3b,id:"minecraft:clay_ball"},{Slot:4b,id:"minecraft:nether_star"},{Slot:5b,id:"minecraft:clay_ball"},{Slot:6b,id:"minecraft:netherite_scrap"},{Slot:7b,id:"minecraft:clay_ball"},{Slot:8b,id:"minecraft:netherite_scrap"}]} run loot replace block ~ ~ ~ container.0 loot gm4_orb_of_ankou:crafting/orb_of_ankou diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/shrieking/boom_mob.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/shrieking/boom_mob.mcfunction index f8a735aa92..01da0ade8b 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/shrieking/boom_mob.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/shrieking/boom_mob.mcfunction @@ -31,5 +31,5 @@ data remove storage gm4_oa_shrieking:temp Pos # visuals effect give @s resistance 1 4 true -effect give @s[type=#gm4:undead] instant_health -effect give @s[type=!#gm4:undead] instant_damage +effect give @s[type=#minecraft:undead] instant_health +effect give @s[type=!#minecraft:undead] instant_damage diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/shrieking/find_target.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/shrieking/find_target.mcfunction index b07eb8019d..7978e74457 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/shrieking/find_target.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/shrieking/find_target.mcfunction @@ -3,7 +3,7 @@ particle minecraft:sonic_boom ~ ~ ~ 0 0 0 1 1 scoreboard players set $target_found gm4_pneuma_data 0 -execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[team=!gm4_invalid_team,tag=!gm4_oa_shrieker,dx=0.5,dy=0.5,dz=0.5] run function gm4_orb_of_ankou:pneumas/shrieking/boom +execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=!#gm4:non_living,tag=!gm4_oa_shrieker,dx=0.5,dy=0.5,dz=0.5] run function gm4_orb_of_ankou:pneumas/shrieking/boom scoreboard players add $ray gm4_pneuma_data 1 execute unless score $ray gm4_pneuma_data matches 15.. unless score $target_found gm4_pneuma_data matches 1.. positioned ^ ^ ^1 run function gm4_orb_of_ankou:pneumas/shrieking/find_target diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/fire_sprite.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/fire_sprite.mcfunction index 8a6a95c726..7da7c190af 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/fire_sprite.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/fire_sprite.mcfunction @@ -2,7 +2,7 @@ # run from both soul_forge/entities/summon_powder_sprite and soul_forge/entities/summon_glowstone_sprite # spawn zombie -summon minecraft:zombie ~ ~0.2 ~ {Fire:1000000,Motion:[0.0,0.6,0.0],Silent:1b,CustomNameVisible:0b,DeathLootTable:"gm4:empty",Health:10.0f,IsBaby:1b,CanBreakDoors:0b,CanPickUpLoot:0b,Tags:["gm4_oa_unset","gm4_oa_ignore","gm4_oa_fire_sprite"],CustomName:{"translate":"entity.gm4.fire_sprite","fallback":"Fire Sprite§"},Team:"gm4_hide_name",equipment:{head:{id:"minecraft:golden_helmet",count:1,components:{"minecraft:custom_model_data":"entity/fire_sprite","minecraft:enchantment_glint_override":true}}},drop_chances:{head:0F},active_effects:[{id:"minecraft:invisibility",amplifier:0b,duration:1000000,show_particles:0b}],attributes:[{id:"minecraft:follow_range",base:8},{id:"minecraft:attack_damage",base:1},{id:"minecraft:attack_knockback",base:0},{id:"minecraft:spawn_reinforcements",base:0}]} +summon minecraft:zombie ~ ~0.2 ~ {Fire:1000000,Motion:[0.0,0.6,0.0],Silent:1b,CustomNameVisible:0b,DeathLootTable:"gm4:empty",Health:10.0f,IsBaby:1b,CanBreakDoors:0b,CanPickUpLoot:0b,Tags:["gm4_oa_unset","gm4_oa_ignore","gm4_oa_fire_sprite"],CustomName:{"translate":"entity.gm4.fire_sprite","fallback":"Fire Sprite§"},Team:"gm4_hide_name",equipment:{head:{id:"minecraft:golden_helmet",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_orb_of_ankou:entity/fire_sprite"]},"minecraft:enchantment_glint_override":true}}},drop_chances:{head:0F},active_effects:[{id:"minecraft:invisibility",amplifier:0b,duration:1000000,show_particles:0b}],attributes:[{id:"minecraft:follow_range",base:8},{id:"minecraft:attack_damage",base:1},{id:"minecraft:attack_knockback",base:0},{id:"minecraft:spawn_reinforcements",base:0}]} # randomize motion in x and z execute as @e[type=zombie,tag=gm4_oa_unset,limit=1] run function gm4_orb_of_ankou:soul_forge/entities/set_data/randomize_motion diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/gm4_recipes/orb_of_ankou.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/gm4_recipes/orb_of_ankou.json deleted file mode 100644 index 9c90d256bd..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/gm4_recipes/orb_of_ankou.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "SCS", - "CNC", - "SCS" - ], - "key": { - "S": { - "item": "minecraft:netherite_scrap" - }, - "C": { - "item": "minecraft:clay_ball" - }, - "N": { - "item": "minecraft:nether_star" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_orb_of_ankou:items/orb_of_ankou", - "count": 1, - "guidebook": { - "overlay_color": 13092807 - } - } - } -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/crafting/orb_of_ankou.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/crafting/orb_of_ankou.json deleted file mode 100644 index 8eb8ba981e..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/crafting/orb_of_ankou.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_orb_of_ankou:items/orb_of_ankou", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/orb_of_ankou.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/orb_of_ankou.json index 8c8d846ac6..d90a043e06 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/orb_of_ankou.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/orb_of_ankou.json @@ -11,7 +11,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "item/orb_of_ankou", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:item/orb_of_ankou"]}, "minecraft:firework_explosion": { "shape": "small_ball", "colors": [ @@ -23,6 +23,7 @@ "minecraft:firework_explosion" ] }, + "minecraft:rarity": "rare", "minecraft:damage_resistant": { "types": "#minecraft:is_fire" }, @@ -38,11 +39,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.orb_of_ankou", - "fallback": "Orb of Ankou", - "italic": false, - "color": "aqua" + "fallback": "Orb of Ankou" } }, { diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/aggressive.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/aggressive.json index e7860212a5..4287497937 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/aggressive.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/aggressive.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/aggressive", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/aggressive"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/agile.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/agile.json index 6c24b598a7..fbcbab1984 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/agile.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/agile.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/agile", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/agile"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/anchoring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/anchoring.json index 1a0fe9dd41..4b9e92a69a 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/anchoring.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/anchoring.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/anchoring", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/anchoring"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bargaining.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bargaining.json index 04ce1304ca..318e7933f1 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bargaining.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bargaining.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/bargaining", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/bargaining"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bashing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bashing.json index 66930ed804..5ef31272f0 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bashing.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bashing.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/bashing", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/bashing"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blasting.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blasting.json index 8219613beb..e75e89b332 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blasting.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blasting.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/blasting", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/blasting"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blinding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blinding.json index 93c285450e..152a82a002 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blinding.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blinding.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/blinding", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/blinding"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bounding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bounding.json index 32551b14ad..0d04dc5c15 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bounding.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bounding.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/bounding", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/bounding"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bubbly.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bubbly.json index e6dc3592fa..12877c4c0e 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bubbly.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bubbly.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/bubbly", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/bubbly"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/conjuring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/conjuring.json index 9d388d7f81..79a93a31b6 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/conjuring.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/conjuring.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/conjuring", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/conjuring"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/dashing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/dashing.json index 5b7b64f659..24aaa7af35 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/dashing.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/dashing.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/dashing", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/dashing"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/debilitate.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/debilitate.json index 378e706168..4185d3d24d 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/debilitate.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/debilitate.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/debilitate", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/debilitate"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/depriving.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/depriving.json index 7de107380a..4effd4afb8 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/depriving.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/depriving.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/depriving", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/depriving"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/draining.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/draining.json index 6b4df7deb8..961bf2f1df 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/draining.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/draining.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/draining", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/draining"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/enduring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/enduring.json index 622bd43f61..da8f4c0532 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/enduring.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/enduring.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/enduring", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/enduring"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/expeditious.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/expeditious.json index a64b7ffb3c..15eade6631 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/expeditious.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/expeditious.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/expeditious", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/expeditious"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feathery.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feathery.json index d7d02d234f..b64aca3484 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feathery.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feathery.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/feathery", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/feathery"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feigning.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feigning.json index 0de9487579..fdf51b234e 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feigning.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feigning.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/feigning", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/feigning"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/freezing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/freezing.json index 7406325ad3..04274558f5 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/freezing.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/freezing.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/freezing", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/freezing"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gazing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gazing.json index 7d8aea9414..f549d4cf03 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gazing.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gazing.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/gazing", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/gazing"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gliding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gliding.json index d8b9df16c2..c7b7199ffc 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gliding.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gliding.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/gliding", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/gliding"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/hawkeye.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/hawkeye.json index fd38dd353b..ea5d9e182b 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/hawkeye.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/hawkeye.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/hawkeye", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/hawkeye"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/incombustible.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/incombustible.json index 87eb182028..43939c9ebf 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/incombustible.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/incombustible.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/incombustible", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/incombustible"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/lifeless.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/lifeless.json index 74e02fd279..fdddab8957 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/lifeless.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/lifeless.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/lifeless", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/lifeless"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/neutralizing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/neutralizing.json index a0f88d545f..dbb713c713 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/neutralizing.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/neutralizing.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/neutralizing", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/neutralizing"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/phasing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/phasing.json index cea78ee131..69f296e94e 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/phasing.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/phasing.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/phasing", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/phasing"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/pricking.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/pricking.json index cb5fff089a..52e5d27372 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/pricking.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/pricking.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/pricking", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/pricking"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/retreating.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/retreating.json index 80eb2c200d..134fa45e54 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/retreating.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/retreating.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/retreating", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/retreating"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/rushing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/rushing.json index 96ba835266..9787622725 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/rushing.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/rushing.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/rushing", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/rushing"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/scaling.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/scaling.json index 3e978020d1..ec27d26ce8 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/scaling.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/scaling.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/scaling", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/scaling"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/shrieking.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/shrieking.json index 49b1d3c7db..984d80ad0c 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/shrieking.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/shrieking.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/shrieking", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/shrieking"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/sniffing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/sniffing.json index bb194acdcb..433a013860 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/sniffing.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/sniffing.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/sniffing", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/sniffing"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/soaring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/soaring.json index 0283683bd8..ea9b39913c 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/soaring.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/soaring.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/soaring", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/soaring"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/striding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/striding.json index 0334c624c6..3c2f74b75d 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/striding.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/striding.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/striding", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/striding"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/synergetic.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/synergetic.json index e4ed835286..e88a3bca9f 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/synergetic.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/synergetic.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/synergetic", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/synergetic"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/tranquilizing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/tranquilizing.json index f18d74f2cc..a69a366745 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/tranquilizing.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/tranquilizing.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/tranquilizing", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/tranquilizing"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/vanishing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/vanishing.json index ddd627aedf..f625ea9a5b 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/vanishing.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/vanishing.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/vanishing", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/vanishing"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/venomous.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/venomous.json index 7186b61f71..9a20d05c04 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/venomous.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/venomous.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/venomous", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/venomous"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/volatile.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/volatile.json index 8a0677bf49..8cd57726e5 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/volatile.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/volatile.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/volatile", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/volatile"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/withering.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/withering.json index 162042e31e..3d5adcf48b 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/withering.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/withering.json @@ -24,7 +24,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/withering", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:pneuma/withering"]}, "minecraft:item_name": { "translate": "item.gm4.soul_shard", "fallback": "Soul Shard" diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/recipe/orb_of_ankou.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/recipe/orb_of_ankou.json index 9d4b8685f8..8a277e997a 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/recipe/orb_of_ankou.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/recipe/orb_of_ankou.json @@ -15,7 +15,7 @@ "id": "minecraft:firework_star", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "item/orb_of_ankou", + "minecraft:custom_model_data": {"strings":["gm4_orb_of_ankou:item/orb_of_ankou"]}, "minecraft:firework_explosion": { "shape": "small_ball", "colors": [ @@ -27,8 +27,16 @@ "minecraft:firework_explosion" ] }, + "minecraft:rarity": "rare", + "minecraft:damage_resistant": { + "types": "#minecraft:is_fire" + }, + "minecraft:equippable": { + "slot": "offhand" + }, + "minecraft:max_stack_size": 1, "minecraft:custom_data": "{gm4_orb_of_ankou:{item:'orb'}}", - "minecraft:custom_name": {"translate":"item.gm4.orb_of_ankou","fallback":"Orb of Ankou","color":"aqua","italic":false}, + "minecraft:item_name": {"translate":"item.gm4.orb_of_ankou","fallback":"Orb of Ankou"}, "minecraft:lore": [ {"translate":"text.gm4.orb_of_ankou.empty","fallback":"Empty","color":"gray"} ] diff --git a/gm4_orb_of_ankou/generate_pneumas.py b/gm4_orb_of_ankou/generate_pneumas.py index 4e8b9912de..e920762916 100644 --- a/gm4_orb_of_ankou/generate_pneumas.py +++ b/gm4_orb_of_ankou/generate_pneumas.py @@ -144,18 +144,19 @@ def generate_soul_essence_loot_tables(ctx: Context): }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": False, - "color": "white" + "fallback": "Soul Essence" } }, { "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": True, - "minecraft:custom_model_data": f"pneuma/{pneuma}", + "minecraft:custom_model_data": { + "strings": [f"gm4_orb_of_ankou:pneuma/{pneuma}"] + }, "minecraft:damage_resistant": { "types": "#minecraft:is_fire" }, diff --git a/gm4_orb_of_ankou/mod.mcdoc b/gm4_orb_of_ankou/mod.mcdoc index 86801cd295..860a6ffc06 100644 --- a/gm4_orb_of_ankou/mod.mcdoc +++ b/gm4_orb_of_ankou/mod.mcdoc @@ -1,7 +1,7 @@ use ::java::world::entity::mob::EntityEquipment use ::java::world::item::ItemStack -dispatch minecraft:storage[gm4_orb_of_ankou:temp] to struct OrbOfAnkouTemp { +dispatch minecraft:storage[gm4_orb_of_ankou:temp] to struct { equipment?: EntityEquipment, Item?: ItemStack, Orb?: ItemStack, diff --git a/gm4_percurro_shamir/data/gm4_percurro_shamir/loot_table/band.json b/gm4_percurro_shamir/data/gm4_percurro_shamir/loot_table/band.json index 2b3cf6ad8a..b4b1f9ad55 100644 --- a/gm4_percurro_shamir/data/gm4_percurro_shamir/loot_table/band.json +++ b/gm4_percurro_shamir/data/gm4_percurro_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/percurro" + "minecraft:custom_model_data": {"strings":["gm4_percurro_shamir:shamir/percurro"]} } }, { diff --git a/gm4_phantom_scarecrows/data/gm4/advancement/phantom_scarecrows.json b/gm4_phantom_scarecrows/data/gm4/advancement/phantom_scarecrows.json index de71ee5b8a..f0b3eb81f7 100644 --- a/gm4_phantom_scarecrows/data/gm4/advancement/phantom_scarecrows.json +++ b/gm4_phantom_scarecrows/data/gm4/advancement/phantom_scarecrows.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:firework_rocket", "components": { - "minecraft:custom_model_data": "gui/advancement/phantom_scarecrows" + "minecraft:custom_model_data": {"strings":["gm4_phantom_scarecrows:gui/advancement/phantom_scarecrows"]} } }, "title": { diff --git a/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/function/explode.mcfunction b/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/function/explode.mcfunction index c1b4435571..f9495f35e6 100644 --- a/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/function/explode.mcfunction +++ b/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/function/explode.mcfunction @@ -3,15 +3,14 @@ # ran from propulsion #generate random color -execute store result score color gm4_ps_time run data get entity @s UUID[0] -scoreboard players operation color gm4_ps_time %= modulo gm4_ps_time +execute store result score color gm4_ps_time run random value 0..2 #explosion -execute if score color gm4_ps_time matches 0 run summon minecraft:firework_rocket ~ ~ ~ {Silent:1b,LifeTime:0,FireworksItem:{id:"minecraft:firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:"small_ball",has_twinkle:1b,has_trail:0b,colors:[I;7211016],fade_colors:[I;3671815]}]}}}} +execute if score color gm4_ps_time matches 0 run summon minecraft:firework_rocket ~ ~ ~ {Silent:1b,LifeTime:0,FireworksItem:{id:"minecraft:firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:"small_ball",has_twinkle:1b,has_trail:0b,colors:[7211016],fade_colors:[3671815]}]}}}} -execute if score color gm4_ps_time matches 1 run summon minecraft:firework_rocket ~ ~ ~ {Silent:1b,LifeTime:0,FireworksItem:{id:"minecraft:firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:"small_ball",has_twinkle:1b,has_trail:0b,colors:[I;4018687],fade_colors:[I;7382527]}]}}}} +execute if score color gm4_ps_time matches 1 run summon minecraft:firework_rocket ~ ~ ~ {Silent:1b,LifeTime:0,FireworksItem:{id:"minecraft:firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:"small_ball",has_twinkle:1b,has_trail:0b,colors:[4018687],fade_colors:[7382527]}]}}}} -execute if score color gm4_ps_time matches 2 run summon minecraft:firework_rocket ~ ~ ~ {Silent:1b,LifeTime:0,FireworksItem:{id:"minecraft:firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:"small_ball",has_twinkle:1b,has_trail:0b,colors:[I;16773153],fade_colors:[I;15531886]}]}}}} +execute if score color gm4_ps_time matches 2 run summon minecraft:firework_rocket ~ ~ ~ {Silent:1b,LifeTime:0,FireworksItem:{id:"minecraft:firework_rocket",count:1,components:{"minecraft:fireworks":{explosions:[{shape:"small_ball",has_twinkle:1b,has_trail:0b,colors:[16773153],fade_colors:[15531886]}]}}}} #advancement advancement grant @a[distance=..3,gamemode=!spectator] only gm4:phantom_scarecrows diff --git a/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/function/init.mcfunction b/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/function/init.mcfunction index 226f282ea0..0e5098442a 100644 --- a/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/function/init.mcfunction +++ b/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/function/init.mcfunction @@ -1,5 +1,4 @@ scoreboard objectives add gm4_ps_time dummy -scoreboard players set modulo gm4_ps_time 3 scoreboard objectives add gm4_entity_version dummy execute unless score phantom_scarecrows gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Phantom Scarecrows"} diff --git a/gm4_pig_tractors/data/gm4/advancement/pig_tractors.json b/gm4_pig_tractors/data/gm4/advancement/pig_tractors.json index 9b9a6ffdae..23900a4e8f 100644 --- a/gm4_pig_tractors/data/gm4/advancement/pig_tractors.json +++ b/gm4_pig_tractors/data/gm4/advancement/pig_tractors.json @@ -3,7 +3,7 @@ "icon": { "id": "saddle", "components": { - "minecraft:custom_model_data": "gui/advancement/pig_tractors" + "minecraft:custom_model_data": {"strings":["gm4_pig_tractors:gui/advancement/pig_tractors"]} } }, "title": { diff --git a/gm4_poses_pack/README.md b/gm4_poses_pack/README.md deleted file mode 100644 index 700bc96c25..0000000000 --- a/gm4_poses_pack/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Poses Pack - -Customize your armour stands within an inch of their life. Make every part of them posed to your desire. - -Example posing of armour stands with pre-defined poses - -### Features -- Requires the base [Better Armour Stands]($dynamicLink:gm4_better_armour_stands) data pack -- Adds some default poses to armour stands to get your started -- Adds ability to pose arms, legs and head to some default positions - -Read more options for poses on the [Wiki](https://wiki.gm4.co/Better_Armour_Stands/Poses_Pack). diff --git a/gm4_poses_pack/assets/translations.csv b/gm4_poses_pack/assets/translations.csv deleted file mode 100644 index b8a240c1db..0000000000 --- a/gm4_poses_pack/assets/translations.csv +++ /dev/null @@ -1,10 +0,0 @@ -key,en_us -advancement.gm4.poses_pack.title,Plenty O' Posing -advancement.gm4.poses_pack.description,Apply a preset pose to your armour stand -text.gm4.guidebook.module_desc.poses_pack,Adds a bunch of preset poses to the Better Armour Stands Module. This can be really hand for applying common poses like 'walking' or raised arms! -text.gm4.guidebook.poses_pack.description,The following codes can be used to put a preset pose onto an armour stand: -text.gm4.guidebook.poses_pack.head,Head -text.gm4.guidebook.poses_pack.body_part,%1$s: -text.gm4.guidebook.better_armour_stands.copy_code,Click to copy -text.gm4.guidebook.poses_pack.arms,Arms -text.gm4.guidebook.poses_pack.legs,Legs diff --git a/gm4_poses_pack/beet.yaml b/gm4_poses_pack/beet.yaml deleted file mode 100644 index ca212a08f5..0000000000 --- a/gm4_poses_pack/beet.yaml +++ /dev/null @@ -1,36 +0,0 @@ -id: gm4_poses_pack -name: Poses Pack -version: 1.7.X - -data_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - -meta: - gm4: - versioning: - required: - gm4_better_armour_stands: 2.5.0 - model_data: - - item: armor_stand - reference: gui/advancement/poses_pack - template: advancement - website: - description: Adds a bunch of preset poses to the Better Armour Stands Module. This can be really hand for applying common poses like 'walking' or raised arms! - recommended: - - gm4_particles_pack - notes: [] - modrinth: - project_id: vE5iK9HJ - video: https://www.youtube.com/watch?v=ZBqmGpAXqmw&t=217s - wiki: https://wiki.gm4.co/wiki/Poses_Pack - credits: - Creators: - - Sparks - Updated by: - - Misode - - Denniss - Icon Design: - - DuckJr diff --git a/gm4_poses_pack/data/gm4/advancement/poses_pack.json b/gm4_poses_pack/data/gm4/advancement/poses_pack.json deleted file mode 100644 index 2328ef2275..0000000000 --- a/gm4_poses_pack/data/gm4/advancement/poses_pack.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "display": { - "icon": { - "id": "armor_stand", - "components": { - "minecraft:custom_model_data": "gui/advancement/poses_pack" - } - }, - "title": { - "translate": "advancement.gm4.poses_pack.title", - "fallback": "Plenty O' Posing" - }, - "description": { - "translate": "advancement.gm4.poses_pack.description", - "fallback": "Apply a preset pose to your armour stand", - "color": "gray" - } - }, - "parent": "gm4:better_armour_stands", - "criteria": { - "pose_stand": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_poses_pack/data/gm4_better_armour_stands/tags/function/apply_book.json b/gm4_poses_pack/data/gm4_better_armour_stands/tags/function/apply_book.json deleted file mode 100644 index 22c7b8862a..0000000000 --- a/gm4_poses_pack/data/gm4_better_armour_stands/tags/function/apply_book.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_poses_pack:apply_book" - ] -} diff --git a/gm4_poses_pack/data/gm4_poses_pack/function/apply_book.mcfunction b/gm4_poses_pack/data/gm4_poses_pack/function/apply_book.mcfunction deleted file mode 100644 index cdc463b59b..0000000000 --- a/gm4_poses_pack/data/gm4_poses_pack/function/apply_book.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -# @s = armor_stand to be modified -# at @s -# run from gm4_better_armour_stands:book/process - -# Check presets -scoreboard players set $success gm4_bas_data 0 -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"legs down"}]} store success score $success gm4_bas_data run data merge entity @s {Pose:{LeftLeg:[0.01f,0f,0f],RightLeg:[0.01f,0f,0f]}} -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"legs sitting"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {Pose:{LeftLeg:[278f,347f,0f],RightLeg:[278f,11f,0f]}} -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"legs walking"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {Pose:{LeftLeg:[39f,0f,0f],RightLeg:[317f,0f,0f]}} -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"legs flying"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {Pose:{LeftLeg:[108f,0f,0f],RightLeg:[90f,0f,0f]}} - -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"arms reaching"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {ShowArms:1b,Pose:{LeftArm:[254f,0f,0f],RightArm:[254f,0f,0f]}} -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"arms swinging"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {ShowArms:1b,Pose:{LeftArm:[304f,0f,0f],RightArm:[40f,0f,0f]}} -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"arms resting"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {ShowArms:1b,Pose:{LeftArm:[263f,340f,188f],RightArm:[263f,25f,188f]}} -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"arms raised"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {ShowArms:1b,Pose:{LeftArm:[179f,0f,24f],RightArm:[179f,0f,344f]}} -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"arms down"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {ShowArms:1b,Pose:{LeftArm:[0.01f,0f,0f],RightArm:[0.01f,0f,0f]}} - -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"head up"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {Pose:{Head:[325f,0f,0f]}} -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"head down"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {Pose:{Head:[35f,0f,0f]}} -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"head left"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {Pose:{Head:[0f,325f,0f]}} -execute if data storage gm4_better_armour_stands:temp {pages:[{raw:"head right"}]} unless score $success gm4_bas_data matches 1.. store success score $success gm4_bas_data run data merge entity @s {Pose:{Head:[0f,35f,0f]}} - -# Grant advancement if any poses were changed. -execute if score $success gm4_bas_data matches 1.. run function gm4_poses_pack:pose_changed diff --git a/gm4_poses_pack/data/gm4_poses_pack/function/init.mcfunction b/gm4_poses_pack/data/gm4_poses_pack/function/init.mcfunction deleted file mode 100644 index 435b4039f7..0000000000 --- a/gm4_poses_pack/data/gm4_poses_pack/function/init.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -execute unless score poses_pack gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Poses Pack"} -execute unless score poses_pack gm4_earliest_version < poses_pack gm4_modules run scoreboard players operation poses_pack gm4_earliest_version = poses_pack gm4_modules -scoreboard players set poses_pack gm4_modules 1 - - - -#$moduleUpdateList diff --git a/gm4_poses_pack/data/gm4_poses_pack/function/pose_changed.mcfunction b/gm4_poses_pack/data/gm4_poses_pack/function/pose_changed.mcfunction deleted file mode 100644 index 38f802ff2b..0000000000 --- a/gm4_poses_pack/data/gm4_poses_pack/function/pose_changed.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @s = modified armor_stand -# at @s -# run from apply_pose - -advancement grant @a[tag=gm4_bas_active,limit=1] only gm4:poses_pack - -playsound minecraft:entity.armor_stand.fall block @a[distance=..6] ~ ~ ~ 0.5 1 - -scoreboard players set $valid_code gm4_bas_data 1 diff --git a/gm4_poses_pack/data/gm4_poses_pack/guidebook/poses_pack.json b/gm4_poses_pack/data/gm4_poses_pack/guidebook/poses_pack.json deleted file mode 100644 index a21605f39a..0000000000 --- a/gm4_poses_pack/data/gm4_poses_pack/guidebook/poses_pack.json +++ /dev/null @@ -1,363 +0,0 @@ -{ - "id": "poses_pack", - "name": "Poses Pack", - "module_type": "expansion", - "base_module": "better_armour_stands", - "icon": { - "id": "minecraft:armor_stand" - }, - "criteria": { - "modify_armor_stand": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type_specific": { - "type": "player", - "advancements": { - "gm4:better_armour_stands": true - } - } - } - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [ - [ - "modify_armor_stand" - ] - ], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.poses_pack.description", - "fallback": "The following codes can be used to put a preset pose onto an armour stand:" - }, - { - "text": "\n\n" - }, - { - "translate": "text.gm4.guidebook.poses_pack.body_part", - "fallback": "%1$s:", - "with": [ - { - "translate": "text.gm4.guidebook.poses_pack.head", - "fallback": "Head" - } - ] - }, - { - "text": "\n- " - }, - { - "text": "head up", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "head up" - } - }, - { - "text": "\n- " - }, - { - "text": "head down", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "head down" - } - }, - { - "text": "\n- " - }, - { - "text": "head left", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "head left" - } - }, - { - "text": "\n- " - }, - { - "text": "head right", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "head right" - } - } - ], - [ - { - "translate": "text.gm4.guidebook.poses_pack.body_part", - "fallback": "%1$s:", - "with": [ - { - "translate": "text.gm4.guidebook.poses_pack.arms", - "fallback": "Arms" - } - ] - }, - { - "text": "\n- " - }, - { - "text": "arms reaching", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "arms reaching" - } - }, - { - "text": "\n- " - }, - { - "text": "arms swinging", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "arms swinging" - } - }, - { - "text": "\n- " - }, - { - "text": "arms resting", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "arms resting" - } - }, - { - "text": "\n- " - }, - { - "text": "arms raised", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "arms raised" - } - }, - { - "text": "\n- " - }, - { - "text": "arms down", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "arms down" - } - }, - { - "text": "\n\n" - }, - { - "translate": "text.gm4.guidebook.poses_pack.body_part", - "fallback": "%1$s:", - "with": [ - { - "translate": "text.gm4.guidebook.poses_pack.legs", - "fallback": "Legs" - } - ] - }, - { - "text": "\n- " - }, - { - "text": "legs sitting", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "legs sitting" - } - }, - { - "text": "\n- " - }, - { - "text": "legs walking", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "legs walking" - } - }, - { - "text": "\n- " - }, - { - "text": "legs flying", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "legs flying" - } - }, - { - "text": "\n- " - }, - { - "text": "legs down", - "hover_event": { - "action": "show_text", - "value": [ - { - "translate": "text.gm4.guidebook.better_armour_stands.copy_code", - "fallback": "Click to copy", - "color": "dark_gray", - "italic": true - } - ] - }, - "click_event": { - "action": "copy_to_clipboard", - "value": "legs down" - } - } - ] - ] - } - ] -} diff --git a/gm4_poses_pack/images/poses_pack.webp b/gm4_poses_pack/images/poses_pack.webp deleted file mode 100644 index dd91106f48..0000000000 Binary files a/gm4_poses_pack/images/poses_pack.webp and /dev/null differ diff --git a/gm4_poses_pack/pack.png b/gm4_poses_pack/pack.png deleted file mode 100644 index 18dcd13009..0000000000 Binary files a/gm4_poses_pack/pack.png and /dev/null differ diff --git a/gm4_poses_pack/pack.svg b/gm4_poses_pack/pack.svg deleted file mode 100644 index 6a2dfd7f03..0000000000 --- a/gm4_poses_pack/pack.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gm4_potion_liquids/data/gm4/advancement/potion_liquids.json b/gm4_potion_liquids/data/gm4/advancement/potion_liquids.json index e58fabfa8c..68e90d1c2a 100644 --- a/gm4_potion_liquids/data/gm4/advancement/potion_liquids.json +++ b/gm4_potion_liquids/data/gm4/advancement/potion_liquids.json @@ -3,7 +3,7 @@ "icon": { "id": "potion", "components": { - "minecraft:custom_model_data": "gui/advancement/potion_liquids", + "minecraft:custom_model_data": {"strings":["gm4_potion_liquids:gui/advancement/potion_liquids"]}, "minecraft:potion_contents": { "custom_color": 13631487 } diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/floating_potion.json b/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/floating_potion.json index 3912309868..5a6f00530c 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/floating_potion.json +++ b/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/floating_potion.json @@ -29,11 +29,12 @@ }, { "function": "set_name", + "target": "custom_name", "name": { "translate": "item.gm4.floating_potion", - "fallback": "Potion of Floating" - }, - "target": "item_name" + "fallback": "Potion of Floating", + "italic": false + } } ] } diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/lingering_floating_potion.json b/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/lingering_floating_potion.json index e3757ba24d..e284a8b6f3 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/lingering_floating_potion.json +++ b/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/lingering_floating_potion.json @@ -34,11 +34,12 @@ }, { "function": "set_name", + "target": "custom_name", "name": { "translate": "item.gm4.lingering_floating_potion", - "fallback": "Lingering Potion of Floating" - }, - "target": "item_name" + "fallback": "Lingering Potion of Floating", + "italic": false + } }, { "function": "minecraft:set_lore", diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/splash_floating_potion.json b/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/splash_floating_potion.json index 2a8a31cb9d..4a8f00be67 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/splash_floating_potion.json +++ b/gm4_potion_liquids/data/gm4_potion_liquids/loot_table/splash_floating_potion.json @@ -29,11 +29,12 @@ }, { "function": "set_name", + "target": "custom_name", "name": { "translate": "item.gm4.splash_floating_potion", - "fallback": "Splash Potion of Floating" - }, - "target": "item_name" + "fallback": "Splash Potion of Floating", + "italic": false + } } ] } diff --git a/gm4_potion_liquids/data/gm4_potion_liquids/modules/main.bolt b/gm4_potion_liquids/data/gm4_potion_liquids/modules/main.bolt index 36fe7e74d5..689214e254 100644 --- a/gm4_potion_liquids/data/gm4_potion_liquids/modules/main.bolt +++ b/gm4_potion_liquids/data/gm4_potion_liquids/modules/main.bolt @@ -71,7 +71,7 @@ with open("gm4_potion_liquids/potion_definitions.csv", "r") as csvfile: m, s = row["effect_duration"].split(":") duration = max(int(m)*60 + round(float(s)), 1) - execute as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] + execute as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] unless predicate inline_predicate run function f"gm4_potion_liquids:util/dispense/{row["potion_id"]}": @@ -115,7 +115,7 @@ class FloatingPotion: @potion_liquid.util_below def dispense_float_potion(): - execute as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] + execute as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] unless predicate { "condition":"minecraft:entity_properties", diff --git a/gm4_potion_swords/README.md b/gm4_potion_swords/README.md deleted file mode 100644 index 5ff31ec024..0000000000 --- a/gm4_potion_swords/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Potion Swords - -Cover your blade in the power of a potion and use it when you attack. - -### Features -- When attacking with a golden sword, certain potions from your offhand will apply to the mob -- The potion is never consumed when attacking a mob -- Attacking a skeleton while holding a Poison Potion will cause the skeleton to convert to a Wither Skeleton, but not drop any loot. diff --git a/gm4_potion_swords/assets/translations.csv b/gm4_potion_swords/assets/translations.csv deleted file mode 100644 index a3d2d2a486..0000000000 --- a/gm4_potion_swords/assets/translations.csv +++ /dev/null @@ -1,7 +0,0 @@ -key,en_us -advancement.gm4.potion_swords.title,Instant Regret -advancement.gm4.potion_swords.description,Wither-ize a skeleton with potion swords -text.gm4.guidebook.module_desc.potion_swords,"As if getting stabbed isn't enough... support your friends, terrify your enemies, make gold great again using Golden Swords and potions!" -text.gm4.guidebook.potion_swords.description,"Attacking with a golden sword whilst a potion is in the inventory will cause an effect based on the potion.\n\nThe potions are never consumed, but only certain potions work." -text.gm4.guidebook.potion_swords.defensive_potions,The following potions can be used with Potion Swords:\n\nExtended Invisibility applies invisibility for 8 seconds to allies.\n\nInstant Health II applies Absorption I for 8 seconds to allies. -text.gm4.guidebook.potion_swords.offensive_potions,Poison II withers nearby mobs for 4 seconds and transforms skeletons into wither skeletons without loot.\n\nExtended Slowness causes nearby mobs to be unable to move for 4 seconds. diff --git a/gm4_potion_swords/beet.yaml b/gm4_potion_swords/beet.yaml deleted file mode 100644 index 4570649cc8..0000000000 --- a/gm4_potion_swords/beet.yaml +++ /dev/null @@ -1,36 +0,0 @@ -id: gm4_potion_swords -name: Potion Swords -version: 1.7.X - -data_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - -meta: - gm4: - versioning: - schedule_loops: [tick] - model_data: - - item: golden_sword - reference: gui/advancement/potion_swords - template: advancement - website: - description: As if getting stabbed isn't enough... support your friends, terrify your enemies, make gold great again using Golden Swords and potions! - recommended: [] - notes: [] - modrinth: - project_id: ZmYNpwdj - planetminecraft: - uid: 4578144 - video: https://www.youtube.com/watch?v=9xI3CQ1z5cg - wiki: https://wiki.gm4.co/wiki/Potion_Swords - credits: - Creator: - - Bloo - Updated by: - - Bloo - - SpecialBuilder32 - Icon Design: - - DuckJr diff --git a/gm4_potion_swords/data/gm4/advancement/potion_swords.json b/gm4_potion_swords/data/gm4/advancement/potion_swords.json deleted file mode 100644 index 76049e85fa..0000000000 --- a/gm4_potion_swords/data/gm4/advancement/potion_swords.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "display": { - "icon": { - "id": "golden_sword", - "components": { - "minecraft:custom_model_data": "gui/advancement/potion_swords" - } - }, - "title": { - "translate": "advancement.gm4.potion_swords.title", - "fallback": "Instant Regret" - }, - "description": { - "translate": "advancement.gm4.potion_swords.description", - "fallback": "Wither-ize a skeleton with potion swords", - "color": "gray" - } - }, - "parent": "gm4:root", - "criteria": { - "witherize_skeleton": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_potion_swords/data/gm4_potion_swords/function/assign_potion.mcfunction b/gm4_potion_swords/data/gm4_potion_swords/function/assign_potion.mcfunction deleted file mode 100644 index c0a38e6baf..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/function/assign_potion.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#@s = @a[score={gm4_gold_sword=1..}] -tag @s add gm4_gold_user -execute if predicate gm4_potion_swords:holding/strong_healing at @s anchored eyes positioned ^ ^ ^2 run effect give @a[distance=..2.5,tag=!gm4_gold_user] absorption 8 1 -execute if predicate gm4_potion_swords:holding/strong_poison at @s anchored eyes positioned ^ ^ ^2 run function gm4_potion_swords:wither_potion -execute if predicate gm4_potion_swords:holding/long_invisibility at @s anchored eyes positioned ^ ^ ^2 run effect give @a[distance=..2.5,tag=!gm4_gold_user] invisibility 8 0 -execute if predicate gm4_potion_swords:holding/long_slowness at @s anchored eyes positioned ^ ^ ^2 run effect give @e[distance=..2.5,tag=!smithed.strict,tag=!gm4_gold_user] slowness 4 10 -tag @s remove gm4_gold_user -scoreboard players reset @a[scores={gm4_gold_sword=1..}] gm4_gold_sword diff --git a/gm4_potion_swords/data/gm4_potion_swords/function/init.mcfunction b/gm4_potion_swords/data/gm4_potion_swords/function/init.mcfunction deleted file mode 100644 index 0e7e3599f3..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/function/init.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -scoreboard objectives add gm4_gold_sword minecraft.used:minecraft.golden_sword - -execute unless score potion_swords gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Potion Swords"} -execute unless score potion_swords gm4_earliest_version < potion_swords gm4_modules run scoreboard players operation potion_swords gm4_earliest_version = potion_swords gm4_modules -scoreboard players set potion_swords gm4_modules 1 - -schedule function gm4_potion_swords:tick 1t - - - -#$moduleUpdateList diff --git a/gm4_potion_swords/data/gm4_potion_swords/function/tick.mcfunction b/gm4_potion_swords/data/gm4_potion_swords/function/tick.mcfunction deleted file mode 100644 index a2bd78e731..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/function/tick.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -execute as @a[scores={gm4_gold_sword=1..}] run function gm4_potion_swords:assign_potion - -schedule function gm4_potion_swords:tick 1t diff --git a/gm4_potion_swords/data/gm4_potion_swords/function/wither_potion.mcfunction b/gm4_potion_swords/data/gm4_potion_swords/function/wither_potion.mcfunction deleted file mode 100644 index 332ddc5a46..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/function/wither_potion.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#@s = @s[scores={gm4_gold_sword=109} = @a[score_GM4_useGSword_min=1] -effect give @e[distance=..2.5,tag=!smithed.strict,tag=!gm4_gold_user] wither 4 1 -execute as @e[type=skeleton,tag=!smithed.entity,nbt={active_effects:[{id:'minecraft:wither'}],HurtTime:10s},distance=..5] at @s run function gm4_potion_swords:wither_transform diff --git a/gm4_potion_swords/data/gm4_potion_swords/function/wither_transform.mcfunction b/gm4_potion_swords/data/gm4_potion_swords/function/wither_transform.mcfunction deleted file mode 100644 index 501ffb025e..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/function/wither_transform.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#@s = @e[type=skeleton,nbt={active_effects:[{id:'minecraft:wither'}]}] -summon wither_skeleton ~ ~ ~ {active_effects:[{id:'minecraft:wither',amplifier:1,duration:20}],DeathLootTable:"gm4:empty"} -data modify entity @e[type=wither_skeleton,limit=1,distance=0] equipment set from entity @s equipment -teleport @e[type=wither_skeleton,limit=1,distance=0] @s -data merge entity @s {DeathTime:19s,Health:0f,DeathLootTable:"gm4:empty"} -advancement grant @p[scores={gm4_gold_sword=1..}] only gm4:potion_swords diff --git a/gm4_potion_swords/data/gm4_potion_swords/guidebook/potion_swords.json b/gm4_potion_swords/data/gm4_potion_swords/guidebook/potion_swords.json deleted file mode 100644 index d10992babf..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/guidebook/potion_swords.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "id": "potion_swords", - "name": "Potion Swords", - "module_type": "module", - "icon": { - "id": "minecraft:golden_sword" - }, - "criteria": { - "obtain_potion": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:potion" - ] - } - ] - } - }, - "obtain_golden_sword": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:golden_sword" - ] - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.potion_swords.description", - "fallback": "Attacking with a golden sword whilst a potion is in the inventory will cause an effect based on the potion.\n\nThe potions are never consumed, but only certain potions work." - } - ] - ] - }, - { - "name": "usage", - "enable": [], - "requirements": [ - [ - "obtain_potion" - ], - [ - "obtain_golden_sword" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.potion_swords.defensive_potions", - "fallback": "The following potions can be used with Potion Swords:\n\nExtended Invisibility applies invisibility for 8 seconds to allies.\n\nInstant Health II applies Absorption I for 8 seconds to allies." - } - ], - [ - { - "translate": "text.gm4.guidebook.potion_swords.offensive_potions", - "fallback": "Poison II withers nearby mobs for 4 seconds and transforms skeletons into wither skeletons without loot.\n\nExtended Slowness causes nearby mobs to be unable to move for 4 seconds." - } - ] - ] - } - ] -} diff --git a/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/long_invisibility.json b/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/long_invisibility.json deleted file mode 100644 index 56113d1d3a..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/long_invisibility.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "weapon.*": { - "items": "minecraft:potion", - "predicates": { - "minecraft:potion_contents": "minecraft:long_invisibility" - } - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "inventory.*": { - "items": "minecraft:potion", - "predicates": { - "minecraft:potion_contents": "minecraft:long_invisibility" - } - } - } - } - } - ] -} diff --git a/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/long_slowness.json b/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/long_slowness.json deleted file mode 100644 index f5e2c92e70..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/long_slowness.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "weapon.*": { - "items": "minecraft:potion", - "predicates": { - "minecraft:potion_contents": "minecraft:long_slowness" - } - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "inventory.*": { - "items": "minecraft:potion", - "predicates": { - "minecraft:potion_contents": "minecraft:long_slowness" - } - } - } - } - } - ] -} diff --git a/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/strong_healing.json b/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/strong_healing.json deleted file mode 100644 index 1f33dd0381..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/strong_healing.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "weapon.*": { - "items": "minecraft:potion", - "predicates": { - "minecraft:potion_contents": "minecraft:strong_healing" - } - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "inventory.*": { - "items": "minecraft:potion", - "predicates": { - "minecraft:potion_contents": "minecraft:strong_healing" - } - } - } - } - } - ] -} diff --git a/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/strong_poison.json b/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/strong_poison.json deleted file mode 100644 index 9205aed374..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/predicate/holding/strong_poison.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "weapon.*": { - "items": "minecraft:potion", - "predicates": { - "minecraft:potion_contents": "minecraft:strong_poison" - } - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "slots": { - "inventory.*": { - "items": "minecraft:potion", - "predicates": { - "minecraft:potion_contents": "minecraft:strong_poison" - } - } - } - } - } - ] -} diff --git a/gm4_potion_swords/data/gm4_potion_swords/test/convert_wither_skeleton.mcfunction b/gm4_potion_swords/data/gm4_potion_swords/test/convert_wither_skeleton.mcfunction deleted file mode 100644 index a0cfe1a738..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/test/convert_wither_skeleton.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# @template gm4:test_platform -# @dummy ~1.5 ~1 ~0.5 - -setblock ~1 ~3 ~1 gray_concrete -summon skeleton ~1.5 ~1 ~2.5 -item replace entity @s weapon.mainhand with minecraft:golden_sword -item replace entity @s weapon.offhand with minecraft:potion[potion_contents="minecraft:strong_poison"] -dummy @s attack @e[type=skeleton,distance=..4,limit=1] - -await entity @e[type=wither_skeleton,distance=..4] -assert not entity @e[type=skeleton,distance=..4] diff --git a/gm4_potion_swords/data/gm4_potion_swords/test/inflict_absorption.mcfunction b/gm4_potion_swords/data/gm4_potion_swords/test/inflict_absorption.mcfunction deleted file mode 100644 index 7463c881a6..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/test/inflict_absorption.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# @template gm4:test_platform -# @dummy ~1.5 ~1 ~0.5 -# @optional - -execute positioned ~1.5 ~1 ~2.5 run dummy potionswords1 spawn -await delay 3s - -item replace entity @s weapon.mainhand with minecraft:golden_sword -item replace entity @s weapon.offhand with minecraft:potion[potion_contents="minecraft:strong_healing"] -dummy @s attack @e[type=player,name=potionswords1,distance=..4,limit=1] - -await entity @e[type=player,name=potionswords1,distance=..4,nbt={active_effects:[{id:"minecraft:absorption"}]}] diff --git a/gm4_potion_swords/data/gm4_potion_swords/test/inflict_invisibility.mcfunction b/gm4_potion_swords/data/gm4_potion_swords/test/inflict_invisibility.mcfunction deleted file mode 100644 index f61dfacb58..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/test/inflict_invisibility.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# @template gm4:test_platform -# @dummy ~1.5 ~1 ~0.5 -# @optional - -execute positioned ~1.5 ~1 ~2.5 run dummy potionswords2 spawn -await delay 3s - -item replace entity @s weapon.mainhand with minecraft:golden_sword -item replace entity @s weapon.offhand with minecraft:potion[potion_contents="minecraft:long_invisibility"] -dummy @s attack @e[type=player,name=potionswords2,distance=..4,limit=1] - -await entity @e[type=player,name=potionswords2,distance=..4,nbt={active_effects:[{id:"minecraft:invisibility"}]}] diff --git a/gm4_potion_swords/data/gm4_potion_swords/test/inflict_slowness.mcfunction b/gm4_potion_swords/data/gm4_potion_swords/test/inflict_slowness.mcfunction deleted file mode 100644 index 96303fe8e6..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/test/inflict_slowness.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @template gm4:test_platform -# @dummy ~1.5 ~1 ~0.5 - -summon zombie ~1.5 ~1 ~2.5 -item replace entity @s weapon.mainhand with minecraft:golden_sword -item replace entity @s weapon.offhand with minecraft:potion[potion_contents="minecraft:long_slowness"] -dummy @s attack @e[type=zombie,distance=..4,limit=1] - -await entity @e[type=zombie,distance=..4,nbt={active_effects:[{id:"minecraft:slowness"}]}] diff --git a/gm4_potion_swords/data/gm4_potion_swords/test/inflict_wither.mcfunction b/gm4_potion_swords/data/gm4_potion_swords/test/inflict_wither.mcfunction deleted file mode 100644 index b0e4cd6ead..0000000000 --- a/gm4_potion_swords/data/gm4_potion_swords/test/inflict_wither.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @template gm4:test_platform -# @dummy ~1.5 ~1 ~0.5 - -summon zombie ~1.5 ~1 ~2.5 -item replace entity @s weapon.mainhand with minecraft:golden_sword -item replace entity @s weapon.offhand with minecraft:potion[potion_contents="minecraft:strong_poison"] -dummy @s attack @e[type=zombie,distance=..4,limit=1] - -await entity @e[type=zombie,distance=..4,nbt={active_effects:[{id:"minecraft:wither"}]}] diff --git a/gm4_potion_swords/pack.png b/gm4_potion_swords/pack.png deleted file mode 100644 index c39ee03f7a..0000000000 Binary files a/gm4_potion_swords/pack.png and /dev/null differ diff --git a/gm4_potion_swords/pack.svg b/gm4_potion_swords/pack.svg deleted file mode 100644 index ce9d853877..0000000000 --- a/gm4_potion_swords/pack.svg +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gm4_reeling_rods/backport_71/data/gm4_reeling_rods/function/hooked_entity/leash_knot/action.mcfunction b/gm4_reeling_rods/backport_71/data/gm4_reeling_rods/function/hooked_entity/leash_knot/action.mcfunction deleted file mode 100644 index b32d05023f..0000000000 --- a/gm4_reeling_rods/backport_71/data/gm4_reeling_rods/function/hooked_entity/leash_knot/action.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -# Action for hooked leash knot -# @s = leash knot -# at bobber in @s -# run from hooked_entity/select_type - -tag @s add gm4_reeling_rods.leash_knot - -# distance=..12 is leash distance -execute at @s as @e[type=#gm4_reeling_rods:leashable,distance=..12] \ - if function gm4_reeling_rods:hooked_entity/leash_knot/leaded_by_knot \ - run function gm4_reeling_rods:hooked_entity/leash_knot/change_leader - -kill @s - -execute at @p[tag=gm4_reeling_rods.player] run playsound minecraft:entity.leash_knot.place neutral @a[distance=..16] ~ ~ ~ diff --git a/gm4_reeling_rods/backport_88/data/gm4_reeling_rods/function/reeling/bee.mcfunction b/gm4_reeling_rods/backport_88/data/gm4_reeling_rods/function/reeling/bee.mcfunction deleted file mode 100644 index 7f714d28ac..0000000000 --- a/gm4_reeling_rods/backport_88/data/gm4_reeling_rods/function/reeling/bee.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# Action for reeled bee -# @s = bee -# at bobber in @s -# run from hooked_entity/select_type - -# fail if no nectar -execute unless data entity @s {HasNectar:1b} run return fail - -# Steal -data modify storage gm4_reeling_rods:temp item_data set value {} -data merge entity @s {HasNectar:0b,AngerTime:300} -data modify entity @s AngryAt set from entity @p[tag=gm4_reeling_rods.player] UUID -data modify storage gm4_reeling_rods:temp item_data.Item set value {id:"minecraft:honeycomb",count:1} -function gm4_reeling_rods:pull_items - -playsound entity.bee.hurt neutral @a[distance=..16] ~ ~ ~ diff --git a/gm4_reeling_rods/beet.yaml b/gm4_reeling_rods/beet.yaml index 193bc2f5d7..eb23cedbfe 100644 --- a/gm4_reeling_rods/beet.yaml +++ b/gm4_reeling_rods/beet.yaml @@ -4,19 +4,6 @@ version: 1.0.X data_pack: load: . - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 71 - min_format: 1 - max_format: 71 - directory: backport_71 - - formats: - min_inclusive: 1 - max_inclusive: 88 - min_format: 1 - max_format: 88 - directory: backport_88 pipeline: - generate_files diff --git a/gm4_reeling_rods/data/gm4_reeling_rods/function/reeling/chest_boat/passenger_transfer.mcfunction b/gm4_reeling_rods/data/gm4_reeling_rods/function/reeling/chest_boat/passenger_transfer.mcfunction index 6ea64eff5f..c233d1064f 100644 --- a/gm4_reeling_rods/data/gm4_reeling_rods/function/reeling/chest_boat/passenger_transfer.mcfunction +++ b/gm4_reeling_rods/data/gm4_reeling_rods/function/reeling/chest_boat/passenger_transfer.mcfunction @@ -4,4 +4,4 @@ # run from reeling/chest_boat/action ride @s dismount -ride @s mount @e[type=#gm4:boats,distance=..0.00001,limit=1] +ride @s mount @e[type=#minecraft:boat,distance=..0.00001,limit=1] diff --git a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/leashable.json b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/leashable.json index 68f6e24b7a..09df42c03c 100644 --- a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/leashable.json +++ b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/leashable.json @@ -1,6 +1,6 @@ { "values": [ - "#gm4:boats", + "#minecraft:boat", "#gm4:chest_boats", "#gm4_reeling_rods:llamas", "#gm4_reeling_rods:steal_saddle", @@ -9,10 +9,10 @@ "minecraft:axolotl", "minecraft:bee", "minecraft:camel", - {"id": "minecraft:camel_husk", "required": false}, + "minecraft:camel_husk", "minecraft:cat", "minecraft:chicken", - {"id": "minecraft:copper_golem", "required": false}, + "minecraft:copper_golem", "minecraft:cow", "minecraft:dolphin", "minecraft:donkey", @@ -20,13 +20,13 @@ "minecraft:frog", "minecraft:glow_squid", "minecraft:goat", - {"id": "minecraft:happy_ghast", "required": false}, + "minecraft:happy_ghast", "minecraft:hoglin", "minecraft:horse", "minecraft:iron_golem", "minecraft:mooshroom", "minecraft:mule", - {"id": "minecraft:nautilus", "required": false}, + "minecraft:nautilus", "minecraft:ocelot", "minecraft:parrot", "minecraft:polar_bear", @@ -37,6 +37,6 @@ "minecraft:squid", "minecraft:wolf", "minecraft:zoglin", - {"id": "minecraft:zombie_nautilus", "required": false} + "minecraft:zombie_nautilus" ] } diff --git a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_body.json b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_body.json index b6bdf88134..91cf341141 100644 --- a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_body.json +++ b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_body.json @@ -1,6 +1,6 @@ { "values": [ - { "id": "minecraft:happy_ghast", "required": false }, + "minecraft:happy_ghast", "minecraft:wolf" ] } diff --git a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_body_and_saddle.json b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_body_and_saddle.json index 878d912402..dba379aee4 100644 --- a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_body_and_saddle.json +++ b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_body_and_saddle.json @@ -1,8 +1,8 @@ { "values": [ "minecraft:horse", - {"id": "minecraft:nautilus", "required": false}, + "minecraft:nautilus", "minecraft:zombie_horse", - {"id": "minecraft:zombie_nautilus", "required": false} + "minecraft:zombie_nautilus" ] } diff --git a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_equipment.json b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_equipment.json index ccf44a32a0..e42b8a4059 100644 --- a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_equipment.json +++ b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_equipment.json @@ -4,8 +4,8 @@ "minecraft:bogged", "minecraft:drowned", "minecraft:husk", - {"id": "minecraft:mannequin", "required": false}, - {"id": "minecraft:parched", "required": false}, + "minecraft:mannequin", + "minecraft:parched", "minecraft:piglin", "minecraft:piglin_brute", "minecraft:player", diff --git a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_hand.json b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_hand.json index f70540837f..f0bc34a864 100644 --- a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_hand.json +++ b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_hand.json @@ -1,7 +1,7 @@ { "values": [ "minecraft:allay", - {"id": "minecraft:copper_golem", "required": false}, + "minecraft:copper_golem", "minecraft:fox", "minecraft:illusioner", "minecraft:panda", diff --git a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_saddle.json b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_saddle.json index 41fc6ee697..2534d055fb 100644 --- a/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_saddle.json +++ b/gm4_reeling_rods/data/gm4_reeling_rods/tags/entity_type/steal_saddle.json @@ -1,7 +1,7 @@ { "values": [ "minecraft:camel", - {"id": "minecraft:camel_husk", "required": false}, + "minecraft:camel_husk", "minecraft:pig", "minecraft:skeleton_horse", "minecraft:strider", diff --git a/gm4_reeling_rods/mod.mcdoc b/gm4_reeling_rods/mod.mcdoc new file mode 100644 index 0000000000..8b5d2370cc --- /dev/null +++ b/gm4_reeling_rods/mod.mcdoc @@ -0,0 +1,53 @@ +use ::java::util::BlockState +use ::java::world::item::ItemStack +use ::java::world::entity::AnyEntity +use ::java::world::entity::mob::breedable::villager::ReputationPart + +dispatch minecraft:storage[gm4_reeling_rods:temp] to struct { + bit_data?: struct { + bit_score: string, + bit: string, + UUID?: #[uuid] int[] @ 4, + }, + position?: [double] @ 3, + item_data?: struct { + Item?: (ItemStack | struct {}), + Motion?: [double] @ 3, + PickupDelay?: short, + }, + lookup_key?: int, + motion_vector?: [double] @ 3, + barbed_attacker_uuid?: #[uuid] int[] @ 4, + enchanted?: struct { + barbed?: struct { + attacker_uuid?: #[uuid] int[] @ 4, + period?: int, + damage?: int, + }, + reeling?: int, + }, + player_data?: struct { + Pos: [double] @ 3, + }, + entity_data?: struct { + Items?: [ItemStack], + UUID?: #[uuid] int[] @ 4, + Passengers?: [AnyEntity], + Motion?: [double] @ 3, + BlockState?: BlockState, + mainhand?: ItemStack, + gossip?: struct { + Target?: #[uuid] int[] @ 4, + Type?: ReputationPart, + Value?: int, + }, + }, + entity_type?: #[id="entity_type"] string, + displacement?: float, +} + +dispatch minecraft:storage[gm4_reeling_rods:players] to struct { + [string]: struct { + [#[match_regex="bit_\\d+"] string]: string, + }, +} diff --git a/gm4_relocators/README.md b/gm4_relocators/README.md deleted file mode 100644 index 6e683c1e5c..0000000000 --- a/gm4_relocators/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Relocators - -Moving containers and Gamemode 4 related blocks is now a breeze. - -### Features -- Relocators can be placed on-top of containers and Gamemode 4 mechanical blocks -- Chests and Droppers can be moved, but if the container contains a Shulker Box, it will not be moved -- Gamemode 4 blocks are moved using a Relocator instead of breaking and re-creating them. -- All data about the block is retained when moved using a Relocator diff --git a/gm4_relocators/assets/gm4_relocators/models/item/relocator_base.json b/gm4_relocators/assets/gm4_relocators/models/item/relocator_base.json deleted file mode 100644 index ee1e4abccc..0000000000 --- a/gm4_relocators/assets/gm4_relocators/models/item/relocator_base.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "elements": [ - { - "name": "outer", - "from": [2, 2, 2], - "to": [14, 14, 14], - "faces": { - "north": {"uv": [2, 2, 14, 14], "texture": "#outer", "cullface": "north"}, - "east": {"uv": [2, 2, 14, 14], "texture": "#outer", "cullface": "east"}, - "south": {"uv": [2, 2, 14, 14], "texture": "#outer", "cullface": "south"}, - "west": {"uv": [2, 2, 14, 14], "texture": "#outer", "cullface": "west"}, - "up": {"uv": [2, 2, 14, 14], "texture": "#outer", "cullface": "up"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#outer", "cullface": "down"} - } - }, - { - "name": "core", - "from": [4, 4, 4], - "to": [12, 12, 12], - "faces": { - "north": {"uv": [4, 4, 12, 12], "texture": "#core", "cullface": "north"}, - "east": {"uv": [4, 4, 12, 12], "texture": "#core", "cullface": "east"}, - "south": {"uv": [4, 4, 12, 12], "texture": "#core", "cullface": "south"}, - "west": {"uv": [4, 4, 12, 12], "texture": "#core", "cullface": "west"}, - "up": {"uv": [4, 4, 12, 12], "texture": "#core", "cullface": "up"}, - "down": {"uv": [4, 4, 12, 12], "texture": "#core", "cullface": "down"} - } - } - ] -} diff --git a/gm4_relocators/assets/gm4_relocators/models/item/relocator_empty.json b/gm4_relocators/assets/gm4_relocators/models/item/relocator_empty.json deleted file mode 100644 index 12e0204448..0000000000 --- a/gm4_relocators/assets/gm4_relocators/models/item/relocator_empty.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "gm4_relocators:item/relocator_base", - "textures": { - "outer": "gm4_relocators:item/relocator_outer", - "core": "gm4_relocators:item/relocator_core", - "particle": "gm4_relocators:item/relocator_outer" - } -} diff --git a/gm4_relocators/assets/gm4_relocators/models/item/relocator_full.json b/gm4_relocators/assets/gm4_relocators/models/item/relocator_full.json deleted file mode 100644 index 1f8467bb1d..0000000000 --- a/gm4_relocators/assets/gm4_relocators/models/item/relocator_full.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "gm4_relocators:item/relocator_base", - "textures": { - "outer": "gm4_relocators:item/relocator_outer", - "core": "gm4_relocators:item/relocator_core_full", - "particle": "gm4_relocators:item/relocator_outer" - } -} diff --git a/gm4_relocators/assets/gm4_relocators/textures/item/relocator_core.png b/gm4_relocators/assets/gm4_relocators/textures/item/relocator_core.png deleted file mode 100644 index bd3022cd0a..0000000000 Binary files a/gm4_relocators/assets/gm4_relocators/textures/item/relocator_core.png and /dev/null differ diff --git a/gm4_relocators/assets/gm4_relocators/textures/item/relocator_core_full.png b/gm4_relocators/assets/gm4_relocators/textures/item/relocator_core_full.png deleted file mode 100644 index d1956231fb..0000000000 Binary files a/gm4_relocators/assets/gm4_relocators/textures/item/relocator_core_full.png and /dev/null differ diff --git a/gm4_relocators/assets/gm4_relocators/textures/item/relocator_outer.png b/gm4_relocators/assets/gm4_relocators/textures/item/relocator_outer.png deleted file mode 100644 index e606e12826..0000000000 Binary files a/gm4_relocators/assets/gm4_relocators/textures/item/relocator_outer.png and /dev/null differ diff --git a/gm4_relocators/assets/translations.csv b/gm4_relocators/assets/translations.csv deleted file mode 100644 index 0cd2ea0129..0000000000 --- a/gm4_relocators/assets/translations.csv +++ /dev/null @@ -1,10 +0,0 @@ -key,en_us -item.gm4.relocator,Relocator -advancement.gm4.relocators.title,It's Moving Day! -advancement.gm4.relocators.description,Pick up a container with the relocator -text.gm4.guidebook.module_desc.relocators,Craft Relocators to pick up and move containers such as chests and Custom Crafters. -text.gm4.guidebook.relocators.description,Relocators can be used to move machine blocks. They can be crafted in a Custom Crafter with end game materials. -text.gm4.guidebook.relocators.crafting,Relocators can be crafted with the following recipe: -text.gm4.guidebook.relocators.crafting_with_silk_page,A silk touch page can be used instead of a book. -text.gm4.guidebook.relocators.usage_pick_up,"Placing an empty relocator on a container will pick up it up, along with all of its contents.\n\nMachines such as custom crafters can also be picked up with no loss of items." -text.gm4.guidebook.relocators.usage_place_down,Placing a filled relocator on the ground will empty the relocator and place the block there.\n\nThe empty relocator will be returned. diff --git a/gm4_relocators/beet.yaml b/gm4_relocators/beet.yaml deleted file mode 100644 index 70a8209493..0000000000 --- a/gm4_relocators/beet.yaml +++ /dev/null @@ -1,53 +0,0 @@ -id: gm4_relocators -name: Relocators -version: 2.5.X - -data_pack: - load: . - -resource_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters - -meta: - gm4: - versioning: - required: - lib_machines: 1.4.0 - lib_custom_crafters: 3.4.0 - model_data: - - item: player_head - reference: item/relocator_empty - - item: player_head - reference: item/relocator_full - - item: player_head - reference: gui/advancement/relocators - template: - name: advancement - forward: item/relocator_empty - website: - description: Craft Relocators to pick up and move containers such as chests and Custom Crafters. - recommended: - - gm4_block_compressors - - gm4_book_binders - - gm4_forming_press - - gm4_disassemblers - - gm4_enchantment_extractors - - gm4_ender_hoppers - - gm4_liquid_tanks - - gm4_smelteries - notes: [] - modrinth: - project_id: FdwwppEn - wiki: https://wiki.gm4.co/wiki/Relocators - credits: - Creator: - - BPR - Icon Design: - - Hozz - Textures By: - - Kyrius diff --git a/gm4_relocators/data/gm4/advancement/relocators.json b/gm4_relocators/data/gm4/advancement/relocators.json deleted file mode 100644 index a1187d5337..0000000000 --- a/gm4_relocators/data/gm4/advancement/relocators.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "minecraft:player_head", - "components": { - "minecraft:custom_model_data": "gui/advancement/relocators", - "minecraft:profile": "$gm4_relocators:relocator_empty" - } - }, - "title": { - "translate": "advancement.gm4.relocators.title", - "fallback": "It's Moving Day!" - }, - "description": { - "translate": "advancement.gm4.relocators.description", - "fallback": "Pick up a container with the relocator", - "color": "gray" - } - }, - "parent": "gm4:custom_crafters", - "criteria": { - "use_relocator": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/gm4_relocators/data/gm4_custom_crafters/function/relocate/place_down.mcfunction b/gm4_relocators/data/gm4_custom_crafters/function/relocate/place_down.mcfunction deleted file mode 100644 index 84eab3133b..0000000000 --- a/gm4_relocators/data/gm4_custom_crafters/function/relocate/place_down.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# @s = command block placed by "gm4_relocators:place_down/replace_head" -# located at the command block (where the player head was) - -execute if block ~ ~ ~ command_block[facing=east] run setblock ~ ~ ~ dropper[facing=west] -execute if block ~ ~ ~ command_block[facing=west] run setblock ~ ~ ~ dropper[facing=east] -execute if block ~ ~ ~ command_block[facing=south] run setblock ~ ~ ~ dropper[facing=north] -execute if block ~ ~ ~ command_block[facing=north] run setblock ~ ~ ~ dropper[facing=south] -execute if block ~ ~ ~ command_block[facing=down] run setblock ~ ~ ~ dropper[facing=up] - -data merge block ~ ~ ~ {CustomName:{"translate":"block.gm4.custom_crafter","fallback":"Custom Crafter"}} -summon armor_stand ~ ~-.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,DisabledSlots:2039552,Tags:["gm4_no_edit","gm4_custom_crafter"],HasVisualFire:1b,CustomName:"gm4_custom_crafter",equipment:{head:{id:"crafting_table",count:1,components:{"mninecraft:custom_model_data":"gm4_custom_crafters:block/custom_crafter"}}}} diff --git a/gm4_relocators/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_relocators/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 1ef4adb6eb..0000000000 --- a/gm4_relocators/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_relocators:check_recipes" - ] -} diff --git a/gm4_relocators/data/gm4_machines/tags/function/place_down.json b/gm4_relocators/data/gm4_machines/tags/function/place_down.json deleted file mode 100644 index 782082217d..0000000000 --- a/gm4_relocators/data/gm4_machines/tags/function/place_down.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_relocators:machine/verify_place_down" - ] -} diff --git a/gm4_relocators/data/gm4_relocators/advancement/backwards_compatibility/place_relocated_block.json b/gm4_relocators/data/gm4_relocators/advancement/backwards_compatibility/place_relocated_block.json deleted file mode 100644 index 57317e12d1..0000000000 --- a/gm4_relocators/data/gm4_relocators/advancement/backwards_compatibility/place_relocated_block.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "criteria": { - "placed_relocated_block": { - "trigger": "minecraft:placed_block", - "conditions": { - "location": [ - { - "condition": "minecraft:block_state_property", - "block": "minecraft:player_head" - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:custom_data": "{gm4_relocation_data:{}}" - } - } - } - ] - } - }, - "placed_wall_relocated_block": { - "trigger": "minecraft:placed_block", - "conditions": { - "location": [ - { - "condition": "minecraft:block_state_property", - "block": "minecraft:player_wall_head" - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:custom_data": "{gm4_relocation_data:{}}" - } - } - } - ] - } - } - }, - "rewards": { - "function": "gm4_relocators:backwards_compatibility/place_down/place_relocated_block" - }, - "requirements": [ - [ - "placed_relocated_block", - "placed_wall_relocated_block" - ] - ] -} diff --git a/gm4_relocators/data/gm4_relocators/advancement/backwards_compatibility/place_relocator.json b/gm4_relocators/data/gm4_relocators/advancement/backwards_compatibility/place_relocator.json deleted file mode 100644 index 02c0d099c1..0000000000 --- a/gm4_relocators/data/gm4_relocators/advancement/backwards_compatibility/place_relocator.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "criteria": { - "placed_relocator": { - "trigger": "minecraft:placed_block", - "conditions": { - "location": [ - { - "condition": "minecraft:block_state_property", - "block": "minecraft:player_head" - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:custom_data": "{gm4_relocator:1b}" - } - } - } - ] - } - }, - "placed_wall_relocator": { - "trigger": "minecraft:placed_block", - "conditions": { - "location": [ - { - "condition": "minecraft:block_state_property", - "block": "minecraft:player_wall_head" - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:custom_data": "{gm4_relocator:1b}" - } - } - } - ] - } - } - }, - "rewards": { - "function": "gm4_relocators:backwards_compatibility/pick_up/place_relocator" - }, - "requirements": [ - [ - "placed_relocator", - "placed_wall_relocator" - ] - ] -} diff --git a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/pick_up/check_layer.mcfunction b/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/pick_up/check_layer.mcfunction deleted file mode 100644 index 7b6ad385c3..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/pick_up/check_layer.mcfunction +++ /dev/null @@ -1,68 +0,0 @@ -# replaces any machine player heads with their corresponding block -# @s = player that just placed a machine block player head -# located at @s rotated positioned ^-4 ^X ^-1, X = layer number - 4 -# run from gm4_relocators:backwards_compatibility/pick_up/place_machine_block - -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^ ^ ^ if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^1 ^ ^ if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^2 ^ ^ if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^3 ^ ^ if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^4 ^ ^ if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^5 ^ ^ if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^6 ^ ^ if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^7 ^ ^ if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^8 ^ ^ if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place - -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^ ^ ^1 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^1 ^ ^1 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^2 ^ ^1 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^3 ^ ^1 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^4 ^ ^1 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^5 ^ ^1 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^6 ^ ^1 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^7 ^ ^1 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^8 ^ ^1 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place - -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^ ^ ^2 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^1 ^ ^2 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^2 ^ ^2 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^3 ^ ^2 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^4 ^ ^2 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^5 ^ ^2 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^6 ^ ^2 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^7 ^ ^2 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^8 ^ ^2 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place - -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^ ^ ^3 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^1 ^ ^3 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^2 ^ ^3 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^3 ^ ^3 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^4 ^ ^3 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^5 ^ ^3 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^6 ^ ^3 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^7 ^ ^3 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^8 ^ ^3 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place - -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^ ^ ^4 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^1 ^ ^4 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^2 ^ ^4 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^3 ^ ^4 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^4 ^ ^4 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^5 ^ ^4 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^6 ^ ^4 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^7 ^ ^4 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^8 ^ ^4 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place - -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^ ^ ^5 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^1 ^ ^5 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^2 ^ ^5 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^3 ^ ^5 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^4 ^ ^5 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^5 ^ ^5 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^6 ^ ^5 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^7 ^ ^5 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place -execute if score $player_head_count gm4_machine_data matches 1.. positioned ^8 ^ ^5 if block ~ ~ ~ #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} run function gm4_relocators:backwards_compatibility/pick_up/prep_place - - -scoreboard players add $layer_count gm4_machine_data 1 -execute if score $player_head_count gm4_machine_data matches 1.. if score $layer_count gm4_machine_data matches ..10 positioned ~ ~1 ~ run function gm4_relocators:backwards_compatibility/pick_up/check_layer diff --git a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/pick_up/place_relocator.mcfunction b/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/pick_up/place_relocator.mcfunction deleted file mode 100644 index fc06d53f56..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/pick_up/place_relocator.mcfunction +++ /dev/null @@ -1,34 +0,0 @@ -# finds the player head that was placed by the player -# @s = player that just placed a machine block player head -# located at @s -# run from gm4_machines:resolve_load/place_machine_block - -advancement revoke @s only gm4_relocators:backwards_compatibility/place_relocator - -# get rotation of player -# key: direction of player -# 3: north, 4: east, 5: south, 6: west -execute store result score $y_rotation gm4_machine_data run data get entity @s Rotation[0] -scoreboard players set $rotation gm4_machine_data 0 - -execute if score $y_rotation gm4_machine_data matches 45..135 run scoreboard players set $rotation gm4_machine_data 6 -execute if score $rotation gm4_machine_data matches 0 if score $y_rotation gm4_machine_data matches -45..45 run scoreboard players set $rotation gm4_machine_data 5 -execute if score $rotation gm4_machine_data matches 0 if score $y_rotation gm4_machine_data matches -135..-45 run scoreboard players set $rotation gm4_machine_data 4 -execute if score $rotation gm4_machine_data matches 0 run scoreboard players set $rotation gm4_machine_data 3 - -# store cardinal y_rotation -scoreboard players operation $single_rotation gm4_machine_data = $rotation gm4_machine_data -scoreboard players remove $single_rotation gm4_machine_data 2 - -# find player heads in the specific region -execute if score $rotation gm4_machine_data matches 3 store result score $player_head_count gm4_machine_data run clone ~-4 ~-4 ~-4 ~4 ~6 ~1 ~-4 ~-4 ~-4 filtered #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} force -execute if score $rotation gm4_machine_data matches 4 store result score $player_head_count gm4_machine_data run clone ~-1 ~-4 ~-4 ~4 ~6 ~4 ~-1 ~-4 ~-4 filtered #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} force -execute if score $rotation gm4_machine_data matches 5 store result score $player_head_count gm4_machine_data run clone ~-4 ~-4 ~-1 ~4 ~6 ~4 ~-4 ~-4 ~-1 filtered #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} force -execute if score $rotation gm4_machine_data matches 6 store result score $player_head_count gm4_machine_data run clone ~-4 ~-4 ~-4 ~1 ~6 ~4 ~-4 ~-4 ~-4 filtered #gm4_machines:player_heads{profile:{id:[I;739224026,-1192800770,-2115274619,-970102126]}} force - -# replace player heads with the corresponding block -scoreboard players set $layer_count gm4_machine_data 0 -execute if score $rotation gm4_machine_data matches 3 align xyz positioned ~0.5 ~0.5 ~0.5 rotated 180 0 positioned ^-4 ^-4 ^-1 run function gm4_relocators:backwards_compatibility/pick_up/check_layer -execute if score $rotation gm4_machine_data matches 4 align xyz positioned ~0.5 ~0.5 ~0.5 rotated -90 0 positioned ^-4 ^-4 ^-1 run function gm4_relocators:backwards_compatibility/pick_up/check_layer -execute if score $rotation gm4_machine_data matches 5 align xyz positioned ~0.5 ~0.5 ~0.5 rotated 0 0 positioned ^-4 ^-4 ^-1 run function gm4_relocators:backwards_compatibility/pick_up/check_layer -execute if score $rotation gm4_machine_data matches 6 align xyz positioned ~0.5 ~0.5 ~0.5 rotated 90 0 positioned ^-4 ^-4 ^-1 run function gm4_relocators:backwards_compatibility/pick_up/check_layer diff --git a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/pick_up/prep_place.mcfunction b/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/pick_up/prep_place.mcfunction deleted file mode 100644 index d4ba5e141e..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/pick_up/prep_place.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -# prepares the storage and scores for block placement -# @s = player that just placed a machine block player head -# located at the center of the block that was placed -# run from gm4_machines:resolve_load/place_machine_block - -# overwrite rotation if player is looking highly up or down -# key: direction of player -# 1: up, 2: down -execute store result score $x_rotation gm4_machine_data run data get entity @s Rotation[1] -execute if score $x_rotation gm4_machine_data matches -90..-45 run scoreboard players set $rotation gm4_machine_data 1 -execute if score $x_rotation gm4_machine_data matches 45..90 run scoreboard players set $rotation gm4_machine_data 2 - -# store face placed on -# key: block face -# 1: up, 2: down, 3: north, 4: east, 5: south, 6: west -scoreboard players set $face_placement gm4_machine_data 1 -execute if block ~ ~ ~ player_head if score $x_rotation gm4_machine_data matches -90..0 run scoreboard players set $face_placement gm4_machine_data 2 -execute if block ~ ~ ~ player_wall_head[facing=north] run scoreboard players set $face_placement gm4_machine_data 3 -execute if block ~ ~ ~ player_wall_head[facing=east] run scoreboard players set $face_placement gm4_machine_data 4 -execute if block ~ ~ ~ player_wall_head[facing=south] run scoreboard players set $face_placement gm4_machine_data 5 -execute if block ~ ~ ~ player_wall_head[facing=west] run scoreboard players set $face_placement gm4_machine_data 6 - -data modify storage gm4_machines:temp id set value "gm4_relocator_empty" - -scoreboard players set $placed_block gm4_machine_data 0 -scoreboard players remove $player_head_count gm4_machine_data 1 - -function gm4_relocators:machine/verify_place_down -data remove storage gm4_machines:temp id diff --git a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/find_command_block.mcfunction b/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/find_command_block.mcfunction deleted file mode 100644 index c0e0e3bd49..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/find_command_block.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# @s = fill replacing armor stand -# run from self and place_down/find_head - -tp @s ^ ^ ^0.01 -scoreboard players add fill_counter gm4_rl_data 1 -execute unless score fill_counter gm4_rl_data matches 500.. unless block ~ ~ ~ command_block{CustomName:{"text":"Relocated Block"}} at @s run function gm4_relocators:backwards_compatibility/place_down/find_command_block diff --git a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/find_head.mcfunction b/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/find_head.mcfunction deleted file mode 100644 index adc3c1eec4..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/find_head.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# @s = fill replacing armor stand -# run from place_down/place_relocated_block - -# replace the head with a command block -scoreboard players set fill_success gm4_rl_data 0 -scoreboard players set fill_counter gm4_rl_data -5 -tp @s ~ ~-5 ~ -execute at @s run function gm4_relocators:backwards_compatibility/place_down/replace_head - -# find the command block with raycasting -scoreboard players set fill_counter gm4_rl_data 0 -execute at @s run tp @s ~ ~-1 ~ -execute at @s run function gm4_relocators:backwards_compatibility/place_down/find_command_block - -# set command block command to the head's command -execute at @s run data merge block ~ ~ ~ {CustomName:{"text":"Marked Relocated Block"}} -execute at @s run data modify block ~ ~ ~ Command set from entity @s equipment.feet.components."minecraft:custom_data".gm4_relocation_data.Command - -execute at @e[type=armor_stand,tag=gm4_relocator_fill] run playsound minecraft:block.beacon.activate block @a[distance=..8] ~ ~ ~ 1 2 -execute at @s if block ~ ~ ~ command_block{CustomName:{"text":"Marked Relocated Block"}} run kill @s diff --git a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/place_relocated_block.mcfunction b/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/place_relocated_block.mcfunction deleted file mode 100644 index 2ca6158e2e..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/place_relocated_block.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -# @s = player who placed a relocated block player head -# run from advancement "place_relocated_block" - -advancement revoke @s only gm4_relocators:backwards_compatibility/place_relocated_block - -# store item into armor stand -execute positioned ~ ~-5 ~ run kill @e[type=armor_stand,tag=gm4_relocator_fill,dy=13] -summon armor_stand ~ ~ ~ {Invisible:1b,Marker:1b,NoGravity:1b,Small:1b,CustomName:"gm4_relocator_fill",Tags:["gm4_relocator_fill"]} -tp @e[type=armor_stand,limit=1,tag=gm4_relocator_fill,distance=..0.001] ~ ~ ~ ~ 0 -execute align y run tp @e[type=armor_stand,limit=1,tag=gm4_relocator_fill,distance=..0.001] ~ ~ ~ -data modify entity @e[type=armor_stand,limit=1,tag=gm4_relocator_fill,distance=..0.001] equipment.feet set from entity @s SelectedItem - -# check for relocated block heads -execute as @e[type=armor_stand,tag=gm4_relocator_fill,limit=1,sort=nearest,distance=..0.001] at @s run function gm4_relocators:backwards_compatibility/place_down/find_head - -# return relocator -loot spawn ~ ~.3 ~ loot gm4_relocators:items/relocator_empty -data merge entity @e[type=item,distance=..1,nbt={Age:0s,Item:{components:{"minecraft:custom_data":{gm4_relocator:1b}}}},limit=1] {PickupDelay:0} diff --git a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/repair.mcfunction b/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/repair.mcfunction deleted file mode 100644 index 49a389c63e..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/repair.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# command block left behind due to lag -# command block placed from place_down/update_command_block -# run when command block is manually powered - -execute unless entity @e[type=armor_stand,tag=gm4_relocator_fill,distance=..16,sort=nearest,limit=1] run setblock ~ ~ ~ air -data modify block ~ ~ ~ Command set from entity @e[type=armor_stand,tag=gm4_relocator_fill,distance=..16,sort=nearest,limit=1] equipment.feet.components."minecraft:custom_data".gm4_relocation_data.Command -kill @e[type=armor_stand,tag=gm4_relocator_fill,distance=..16,sort=nearest,limit=1] -data merge block ~ ~ ~ {auto:0b} -data merge block ~ ~ ~ {auto:1b,powered:0b} diff --git a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/replace_head.mcfunction b/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/replace_head.mcfunction deleted file mode 100644 index b1ffe5833d..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/replace_head.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# @s = fill replacing armor stand -# run from self and place_down/find_head - -# check for heads -execute if score fill_success gm4_rl_data matches 0 store success score fill_success gm4_rl_data run fill ~-6 ~ ~-6 ~6 ~ ~6 command_block[facing=east]{auto:1b,Command:"function gm4_relocators:backwards_compatibility/place_down/update_command_block",CustomName:{"text":"Relocated Block"}} replace player_wall_head[facing=west]{SkullOwner:{Properties:{textures:[{Signature:"gm4_relocated_block"}]}}} -execute if score fill_success gm4_rl_data matches 0 store success score fill_success gm4_rl_data run fill ~-6 ~ ~-6 ~6 ~ ~6 command_block[facing=west]{auto:1b,Command:"function gm4_relocators:backwards_compatibility/place_down/update_command_block",CustomName:{"text":"Relocated Block"}} replace player_wall_head[facing=east]{SkullOwner:{Properties:{textures:[{Signature:"gm4_relocated_block"}]}}} -execute if score fill_success gm4_rl_data matches 0 store success score fill_success gm4_rl_data run fill ~-6 ~ ~-6 ~6 ~ ~6 command_block[facing=south]{auto:1b,Command:"function gm4_relocators:backwards_compatibility/place_down/update_command_block",CustomName:{"text":"Relocated Block"}} replace player_wall_head[facing=north]{SkullOwner:{Properties:{textures:[{Signature:"gm4_relocated_block"}]}}} -execute if score fill_success gm4_rl_data matches 0 store success score fill_success gm4_rl_data run fill ~-6 ~ ~-6 ~6 ~ ~6 command_block[facing=north]{auto:1b,Command:"function gm4_relocators:backwards_compatibility/place_down/update_command_block",CustomName:{"text":"Relocated Block"}} replace player_wall_head[facing=south]{SkullOwner:{Properties:{textures:[{Signature:"gm4_relocated_block"}]}}} -execute if score fill_success gm4_rl_data matches 0 store success score fill_success gm4_rl_data run fill ~-6 ~ ~-6 ~6 ~ ~6 command_block[facing=down]{auto:1b,Command:"function gm4_relocators:backwards_compatibility/place_down/update_command_block",CustomName:{"text":"Relocated Block"}} replace player_head{SkullOwner:{Properties:{textures:[{Signature:"gm4_relocated_block"}]}}} - -tp @s ~ ~1 ~ -scoreboard players add fill_counter gm4_rl_data 1 -execute if score fill_success gm4_rl_data matches 0 unless score fill_counter gm4_rl_data matches 8.. at @s run function gm4_relocators:backwards_compatibility/place_down/replace_head diff --git a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/update_command_block.mcfunction b/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/update_command_block.mcfunction deleted file mode 100644 index a4ed73dada..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/backwards_compatibility/place_down/update_command_block.mcfunction +++ /dev/null @@ -1,34 +0,0 @@ -# command block left behind due to lag -# command block placed from place_down/repair_head - -# store the facing direction of the command block -execute if block ~ ~ ~ command_block[facing=down] run scoreboard players set facing gm4_rl_data 0 -execute if block ~ ~ ~ command_block[facing=north] run scoreboard players set facing gm4_rl_data 1 -execute if block ~ ~ ~ command_block[facing=east] run scoreboard players set facing gm4_rl_data 2 -execute if block ~ ~ ~ command_block[facing=south] run scoreboard players set facing gm4_rl_data 3 -execute if block ~ ~ ~ command_block[facing=west] run scoreboard players set facing gm4_rl_data 4 - -# force adjacent command blocks to activate -setblock ~ ~ ~ redstone_block -execute if block ~1 ~ ~1 command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~1 ~ ~1 {auto:1b} -execute if block ~1 ~ ~-1 command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~1 ~ ~-1 {auto:1b} -execute if block ~-1 ~ ~1 command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~-1 ~ ~1 {auto:1b} -execute if block ~-1 ~ ~-1 command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~-1 ~ ~-1 {auto:1b} - -execute if block ~1 ~1 ~ command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~1 ~1 ~ {auto:1b} -execute if block ~-1 ~1 ~ command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~-1 ~1 ~ {auto:1b} -execute if block ~ ~1 ~1 command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~ ~1 ~1 {auto:1b} -execute if block ~ ~1 ~-1 command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~ ~1 ~-1 {auto:1b} - -execute if block ~1 ~-1 ~ command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~1 ~-1 ~ {auto:1b} -execute if block ~-1 ~-1 ~ command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~-1 ~-1 ~ {auto:1b} -execute if block ~ ~-1 ~1 command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~ ~-1 ~1 {auto:1b} -execute if block ~ ~-1 ~-1 command_block{CustomName:{"text":"Misplaced Relocated Block"}} run data merge block ~ ~-1 ~-1 {auto:1b} - -# place repair command block -execute if score facing gm4_rl_data matches 0 run setblock ~ ~ ~ command_block[facing=down]{auto:1b,Command:"function gm4_relocators:backwards_compatibility/place_down/repair",CustomName:{"text":"Misplaced Relocated Block"}} -execute if score facing gm4_rl_data matches 1 run setblock ~ ~ ~ command_block[facing=north]{auto:1b,Command:"function gm4_relocators:backwards_compatibility/place_down/repair",CustomName:{"text":"Misplaced Relocated Block"}} -execute if score facing gm4_rl_data matches 2 run setblock ~ ~ ~ command_block[facing=south]{auto:1b,Command:"function gm4_relocators:backwards_compatibility/place_down/repair",CustomName:{"text":"Misplaced Relocated Block"}} -execute if score facing gm4_rl_data matches 3 run setblock ~ ~ ~ command_block[facing=east]{auto:1b,Command:"function gm4_relocators:backwards_compatibility/place_down/repair",CustomName:{"text":"Misplaced Relocated Block"}} -execute if score facing gm4_rl_data matches 4 run setblock ~ ~ ~ command_block[facing=west]{auto:1b,Command:"function gm4_relocators:backwards_compatibility/place_down/repair",CustomName:{"text":"Misplaced Relocated Block"}} -scoreboard players reset facing gm4_rl_data diff --git a/gm4_relocators/data/gm4_relocators/function/check_recipes.mcfunction b/gm4_relocators/data/gm4_relocators/function/check_recipes.mcfunction deleted file mode 100644 index 52a521da35..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/check_recipes.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches 1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:crying_obsidian"},{Slot:1b,id:"minecraft:shulker_shell"},{Slot:2b,id:"minecraft:crying_obsidian"},{Slot:3b,id:"minecraft:amethyst_shard"},{Slot:4b,id:"minecraft:enchanted_book",components:{"minecraft:stored_enchantments":{"minecraft:silk_touch":1}}},{Slot:5b,id:"minecraft:amethyst_shard"},{Slot:6b,id:"minecraft:crying_obsidian"},{Slot:7b,id:"minecraft:shulker_shell"},{Slot:8b,id:"minecraft:crying_obsidian"}]} run loot replace block ~ ~ ~ container.0 loot gm4_relocators:crafting/relocator - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches ..64 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:crying_obsidian"},{Slot:1b,id:"minecraft:shulker_shell"},{Slot:2b,id:"minecraft:crying_obsidian"},{Slot:3b,id:"minecraft:amethyst_shard"},{Slot:4b,id:"minecraft:paper",components:{"minecraft:enchantments":{"minecraft:silk_touch":1}}},{Slot:5b,id:"minecraft:amethyst_shard"},{Slot:6b,id:"minecraft:crying_obsidian"},{Slot:7b,id:"minecraft:shulker_shell"},{Slot:8b,id:"minecraft:crying_obsidian"}]} run loot replace block ~ ~ ~ container.0 loot gm4_relocators:crafting/relocator diff --git a/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/pick_up_check.mcfunction b/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/pick_up_check.mcfunction deleted file mode 100644 index 0cd9712cba..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/pick_up_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from #gm4_relocators:pick_up_check - -execute if score gm4_custom_crafters load.status matches 3.. if entity @s[tag=gm4_custom_crafter] run function gm4_relocators:custom_crafter_relocating/set_pick_up_data diff --git a/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/place_down_check.mcfunction b/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/place_down_check.mcfunction deleted file mode 100644 index 12509d9526..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/place_down_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = player who placed the block -# located at the center of the block to be placed -# run from #gm4_relocators:place_down_check - -execute if score $placed_block gm4_rl_data matches 0 if score gm4_custom_crafters load.status matches 3 if data storage gm4_relocators:temp gm4_relocation{custom_block:"gm4_custom_crafter"} run function gm4_relocators:custom_crafter_relocating/summon_block_markers diff --git a/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/set_pick_up_data.mcfunction b/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/set_pick_up_data.mcfunction deleted file mode 100644 index a7ed100f4a..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/set_pick_up_data.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# sets the specific relocator data -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from gm4_relocators:custom_crafter_relocating/pick_up_check - -data modify storage gm4_relocators:temp merge_data set value {custom_block:"gm4_custom_crafter",lore:{"translate":"block.gm4.custom_crafter","fallback":"Custom Crafter","color":"gray","italic":true}} -data modify storage gm4_relocators:temp merge_data.entity_data.Rotation set from entity @s Rotation -data modify storage gm4_relocators:temp merge_data.entity_data.item set from entity @e[type=item_display,tag=gm4_custom_crafter_display,distance=..0.5,limit=1] item - -execute at @s positioned ~ ~0.5 ~ run kill @e[type=item_display,tag=gm4_custom_crafter_display,limit=1,distance=..0.01] -kill @s -scoreboard players set $found_marker gm4_rl_data 1 diff --git a/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/summon_block_markers.mcfunction b/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/summon_block_markers.mcfunction deleted file mode 100644 index f466604f2f..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/custom_crafter_relocating/summon_block_markers.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -# summons the entities for this machine -# @s = player who placed the block -# located at the center of the block to be placed -# run from gm4_relocators:custom_crafter_relocating/place_down_check - -scoreboard players set $placed_block gm4_rl_data 1 - -summon item_display ~ ~0.5 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_display",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"gm4_custom_crafters:block/custom_crafter"}},item_display:head,brightness:{sky:15,block:15},Rotation:[180.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -summon marker ~ ~ ~ {Tags:["gm4_custom_crafter","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter",Rotation:[0.0f,0.0f]} - -execute as @e[tag=gm4_new_machine,distance=..2] run data modify entity @s Rotation set from storage gm4_relocators:temp gm4_relocation.entity_data.Rotation -execute as @e[tag=gm4_new_machine,distance=..2] at @s rotated as @e[type=marker,tag=gm4_new_machine,distance=..2,limit=1] run tp ~ ~ ~ -execute as @e[type=item_display,tag=gm4_new_machine,distance=..2] run data modify entity @s item set from storage gm4_relocators:temp gm4_relocation.entity_data.item -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 2 -tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_relocators/data/gm4_relocators/function/init.mcfunction b/gm4_relocators/data/gm4_relocators/function/init.mcfunction deleted file mode 100644 index 8d39197bd3..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/init.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -scoreboard objectives add gm4_rl_data dummy - -execute unless score relocators gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Relocators"} -execute unless score relocators gm4_earliest_version < relocators gm4_modules run scoreboard players operation relocators gm4_earliest_version = relocators gm4_modules -scoreboard players set relocators gm4_modules 1 - - - -#$moduleUpdateList diff --git a/gm4_relocators/data/gm4_relocators/function/machine/verify_place_down.mcfunction b/gm4_relocators/data/gm4_relocators/function/machine/verify_place_down.mcfunction deleted file mode 100644 index 3f24325b65..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/machine/verify_place_down.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# verifies that the placed down machine was from this module -# @s = player who placed down the machine -# located at the machine block marker (at the center of the placed down block) -# run from #gm4_machines:place_down - -execute if score $placed_block gm4_machine_data matches 0 if score gm4_relocators load.status matches 1.. if data storage gm4_machines:temp {id:"relocator_empty"} run function gm4_relocators:pick_up/find_block -execute if score $placed_block gm4_machine_data matches 0 if score gm4_relocators load.status matches 1.. if data storage gm4_machines:temp {id:"relocator_full"} run function gm4_relocators:place_down/place_block diff --git a/gm4_relocators/data/gm4_relocators/function/pick_up/check_block_validity.mcfunction b/gm4_relocators/data/gm4_relocators/function/pick_up/check_block_validity.mcfunction deleted file mode 100644 index 7ba4490555..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/pick_up/check_block_validity.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -# checks if the block can be picked up -# @s = player who placed the relocator -# located at the center of the block to be picked up -# run from gm4_relocators:pick_up/find_block - -# check if it's a container without any shulker boxes or filled relocators -scoreboard players set $valid_block gm4_rl_data 0 -execute store success score $valid_block gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block unless items block ~ ~ ~ container.* #gm4_relocators:shulker_boxes unless items block ~ ~ ~ container.* minecraft:player_head[custom_data~{gm4_relocation:{}}] - -# check if it's a custom block -execute if score $valid_block gm4_rl_data matches 1 align xyz run tag @e[dx=0,tag=smithed.block] add gm4_relocating_block -execute if score $valid_block gm4_rl_data matches 1 run tag @e[distance=..0.5,tag=smithed.block] add gm4_relocating_block - -scoreboard players set $found_marker gm4_rl_data 0 -execute as @e[tag=gm4_relocating_block,distance=..1] run function #gm4_relocators:pick_up_check - -# check if the custom block is allowed to be relocated -execute if score $found_marker gm4_rl_data matches 0 if entity @e[tag=gm4_relocating_block,distance=..1,limit=1] run scoreboard players set $valid_block gm4_rl_data 0 - -# proceed if the block is allowed to be picked up -execute if score $valid_block gm4_rl_data matches 1 run function gm4_relocators:pick_up/get_data -# else return the empty relocator -execute if score $valid_block gm4_rl_data matches 0 run function gm4_relocators:pick_up/failed - -# clean up -tag @e[distance=..1] remove gm4_relocating_block diff --git a/gm4_relocators/data/gm4_relocators/function/pick_up/failed.mcfunction b/gm4_relocators/data/gm4_relocators/function/pick_up/failed.mcfunction deleted file mode 100644 index e3b6d2b3a5..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/pick_up/failed.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# returns the relocator if the block can't be picked up -# @s = player who placed the relocator -# located at the center of the block to be picked up -# run from gm4_relocators:pick_up/check_block_validity - -execute at @s[gamemode=!creative,gamemode=!spectator] run loot spawn ~ ~.3 ~ loot gm4_relocators:items/relocator_empty -data merge entity @e[type=item,distance=..7,nbt={Age:0s,Item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_data":{gm4_machines:{id:"relocator_empty"}}}}},limit=1] {PickupDelay:0} - -particle minecraft:smoke ~ ~ ~ .3 .3 .3 0 10 -playsound minecraft:block.fire.extinguish block @a[distance=..8] ~ ~ ~ 0.6 1.5 diff --git a/gm4_relocators/data/gm4_relocators/function/pick_up/find_block.mcfunction b/gm4_relocators/data/gm4_relocators/function/pick_up/find_block.mcfunction deleted file mode 100644 index 559159a75d..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/pick_up/find_block.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# finds the block the relocator was placed on -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:machine/verify_place_down - -scoreboard players set $placed_block gm4_machine_data 1 - -# pick up the block the relocator was placed on -execute if score $face_placement gm4_machine_data matches 1..2 positioned ~ ~-1 ~ run function gm4_relocators:pick_up/check_block_validity -execute if score $face_placement gm4_machine_data matches 3 positioned ~ ~ ~1 run function gm4_relocators:pick_up/check_block_validity -execute if score $face_placement gm4_machine_data matches 4 positioned ~-1 ~ ~ run function gm4_relocators:pick_up/check_block_validity -execute if score $face_placement gm4_machine_data matches 5 positioned ~ ~ ~-1 run function gm4_relocators:pick_up/check_block_validity -execute if score $face_placement gm4_machine_data matches 6 positioned ~1 ~ ~ run function gm4_relocators:pick_up/check_block_validity - -# delete relocator skull -setblock ~ ~ ~ air replace diff --git a/gm4_relocators/data/gm4_relocators/function/pick_up/get_data.mcfunction b/gm4_relocators/data/gm4_relocators/function/pick_up/get_data.mcfunction deleted file mode 100644 index a3c9203cad..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/pick_up/get_data.mcfunction +++ /dev/null @@ -1,69 +0,0 @@ -# picks up the block -# @s = player who placed the relocator -# located at the center of the block to be picked up -# run from gm4_relocators:pick_up/check_block_validity - -# get initial block data -data modify storage gm4_relocators:temp gm4_relocation.data set from block ~ ~ ~ -data remove storage gm4_relocators:temp gm4_relocation.data.x -data remove storage gm4_relocators:temp gm4_relocation.data.y -data remove storage gm4_relocators:temp gm4_relocation.data.z -data remove storage gm4_relocators:temp gm4_relocation.data.RecipesUsed - -# get specific block state -scoreboard players set $found_block gm4_rl_data 0 -scoreboard players set $found_rotation gm4_rl_data 0 -function #gm4_relocators:pick_up/get_block_state - -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ dropper run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"dropper"},lore:{"translate":"block.minecraft.dropper","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ hopper run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"hopper"},lore:{"translate":"block.minecraft.hopper","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ chest run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"chest"},lore:{"translate":"block.minecraft.chest","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ crafter run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"crafter"},lore:{"translate":"block.minecraft.crafter","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ barrel run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"barrel"},lore:{"translate":"block.minecraft.barrel","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ dispenser run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"dispenser"},lore:{"translate":"block.minecraft.dispenser","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ furnace run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"furnace",lit:1},lore:{"translate":"block.minecraft.furnace","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ blast_furnace run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"blast_furnace",lit:1},lore:{"translate":"block.minecraft.blast_furnace","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ smoker run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"smoker",lit:1},lore:{"translate":"block.minecraft.smoker","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ trapped_chest run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"trapped_chest"},lore:{"translate":"block.minecraft.trapped_chest","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ brewing_stand run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"brewing_stand"},lore:{"translate":"block.minecraft.brewing_stand","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 if block ~ ~ ~ #minecraft:shulker_boxes run function gm4_relocators:pick_up/get_data_shulker_boxes - -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[facing=up] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 0 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[facing=down] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 1 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[facing=north] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 2 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[facing=south] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 3 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[facing=east] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 4 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[facing=west] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 5 - -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=up_north] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 0 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=up_south] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 1 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=up_east] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 2 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=up_west] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 3 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=down_north] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 4 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=down_south] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 5 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=down_east] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 6 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=down_west] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 7 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=north_up] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 8 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=south_up] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 9 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=east_up] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 10 -execute if score $found_rotation gm4_rl_data matches 0 store success score $found_rotation gm4_rl_data if block ~ ~ ~ #gm4_relocators:relocatable_block[orientation=west_up] run data modify storage gm4_relocators:temp gm4_relocation.block_state.facing set value 11 - -execute if block ~ ~ ~ #gm4_relocators:relocatable_block[waterlogged=true] run data modify storage gm4_relocators:temp gm4_relocation.block_state.waterlogged set value 1 -execute if data block ~ ~ ~ {lit_time_remaining:0s} run data modify storage gm4_relocators:temp gm4_relocation.block_state.lit set value 0 - -# overwrite anything from custom block via entity -data modify storage gm4_relocators:temp gm4_relocation merge from storage gm4_relocators:temp merge_data -data modify storage gm4_relocators:temp lore set from storage gm4_relocators:temp gm4_relocation.lore -data remove storage gm4_relocators:temp gm4_relocation.lore - -# drop full relocator -setblock ~ ~ ~ air replace -playsound minecraft:block.beacon.power_select block @a[distance=..8] ~ ~ ~ 1 1.8 -particle minecraft:explosion ~ ~ ~ 0 0 0 0 0 -loot spawn ~ ~ ~ loot gm4_relocators:items/relocator_full -advancement grant @s only gm4:relocators - -# clean up -data remove storage gm4_relocators:temp gm4_relocation -data remove storage gm4_relocators:temp lore -data remove storage gm4_relocators:temp merge_data diff --git a/gm4_relocators/data/gm4_relocators/function/pick_up/get_data_shulker_boxes.mcfunction b/gm4_relocators/data/gm4_relocators/function/pick_up/get_data_shulker_boxes.mcfunction deleted file mode 100644 index 7c2d5f715e..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/pick_up/get_data_shulker_boxes.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# get block state of the block -# @s = player who placed the relocator -# located at the center of the block to be picked up -# run from gm4_relocators:pick_up/get_data - -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"shulker_box"},lore:{"translate":"block.minecraft.shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ white_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"white_shulker_box"},lore:{"translate":"block.minecraft.white_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ orange_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"orange_shulker_box"},lore:{"translate":"block.minecraft.orange_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ magenta_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"magenta_shulker_box"},lore:{"translate":"block.minecraft.magenta_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ light_blue_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"light_blue_shulker_box"},lore:{"translate":"block.minecraft.light_blue_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ yellow_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"yellow_shulker_box"},lore:{"translate":"block.minecraft.yellow_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ lime_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"lime_shulker_box"},lore:{"translate":"block.minecraft.lime_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ pink_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"pink_shulker_box"},lore:{"translate":"block.minecraft.pink_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ gray_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"gray_shulker_box"},lore:{"translate":"block.minecraft.gray_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ light_gray_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"light_gray_shulker_box"},lore:{"translate":"block.minecraft.light_gray_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ cyan_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"cyan_shulker_box"},lore:{"translate":"block.minecraft.cyan_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ purple_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"purple_shulker_box"},lore:{"translate":"block.minecraft.purple_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ blue_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"blue_shulker_box"},lore:{"translate":"block.minecraft.blue_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ brown_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"brown_shulker_box"},lore:{"translate":"block.minecraft.brown_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ green_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"green_shulker_box"},lore:{"translate":"block.minecraft.green_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ red_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"red_shulker_box"},lore:{"translate":"block.minecraft.red_shulker_box","color":"gray","italic":true}} -execute if score $found_block gm4_rl_data matches 0 store success score $found_block gm4_rl_data if block ~ ~ ~ black_shulker_box run data modify storage gm4_relocators:temp gm4_relocation merge value {block_state:{id:"black_shulker_box"},lore:{"translate":"block.minecraft.black_shulker_box","color":"gray","italic":true}} diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/failed.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/failed.mcfunction deleted file mode 100644 index 5d2d22257a..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/failed.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# returns the full relocator to the player -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:machine/verify_place_down - -data modify storage gm4_relocators:temp lore set from entity @s SelectedItem.components."minecraft:lore"[0] -execute at @s[gamemode=!creative,gamemode=!spectator] run loot spawn ~ ~.3 ~ loot gm4_relocators:items/relocator_full -data merge entity @e[type=item,distance=..7,nbt={Age:0s,Item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_data":{gm4_machines:{id:"relocator_full"}}}}},limit=1] {PickupDelay:0} -data remove storage gm4_relocators:temp lore - -particle minecraft:smoke ~ ~ ~ .3 .3 .3 0 10 -playsound minecraft:block.fire.extinguish block @a[distance=..8] ~ ~ ~ 0.6 1.5 diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block.mcfunction deleted file mode 100644 index 012414ce31..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block.mcfunction +++ /dev/null @@ -1,56 +0,0 @@ -# gets the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:machine/verify_place_down - -# get data from item -data modify storage gm4_relocators:temp gm4_relocation set from entity @s SelectedItem.components."minecraft:custom_data".gm4_relocation - -# place block (with respective block state) -setblock ~ ~ ~ air -execute store result score $facing gm4_rl_data run data get storage gm4_relocators:temp gm4_relocation.block_state.facing -execute store result score $waterlogged gm4_rl_data run data get storage gm4_relocators:temp gm4_relocation.block_state.waterlogged -execute store result score $lit gm4_rl_data run data get storage gm4_relocators:temp gm4_relocation.block_state.lit -function #gm4_relocators:place_down/place_block -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"dropper"} run function gm4_relocators:place_down/place_block/dropper -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"hopper"} run function gm4_relocators:place_down/place_block/hopper -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"chest"} run function gm4_relocators:place_down/place_block/chest -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"crafter"} run function gm4_relocators:place_down/place_block/crafter -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"barrel"} run function gm4_relocators:place_down/place_block/barrel -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"dispenser"} run function gm4_relocators:place_down/place_block/dispenser -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"furnace"} run function gm4_relocators:place_down/place_block/furnace -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"blast_furnace"} run function gm4_relocators:place_down/place_block/blast_furnace -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"smoker"} run function gm4_relocators:place_down/place_block/smoker -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"trapped_chest"} run function gm4_relocators:place_down/place_block/trapped_chest -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"brewing_stand"} run setblock ~ ~ ~ brewing_stand - -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"white_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/white_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"orange_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/orange_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"magenta_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/magenta_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"light_blue_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/light_blue_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"yellow_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/yellow_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"lime_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/lime_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"pink_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/pink_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"gray_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/gray_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"light_gray_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/light_gray_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"cyan_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/cyan_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"purple_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/purple_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"blue_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/blue_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"brown_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/brown_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"green_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/green_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"red_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/red_shulker_box -execute if block ~ ~ ~ air if data storage gm4_relocators:temp gm4_relocation.block_state{id:"black_shulker_box"} run function gm4_relocators:place_down/place_block/shulker_boxes/black_shulker_box - -# copy data into block -data modify block ~ ~ ~ {} merge from storage gm4_relocators:temp gm4_relocation.data -scoreboard players set $placed_block gm4_rl_data 0 -execute if data storage gm4_relocators:temp gm4_relocation.custom_block run function #gm4_relocators:place_down_check -execute if score $placed_block gm4_rl_data matches 0 if data storage gm4_relocators:temp gm4_relocation.custom_block run setblock ~ ~ ~ air - -# return relocator -execute if block ~ ~ ~ air run function gm4_relocators:place_down/failed -execute unless block ~ ~ ~ air run function gm4_relocators:place_down/success - -# clean up -data remove storage gm4_relocators:temp gm4_relocation diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/barrel.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/barrel.mcfunction deleted file mode 100644 index 36546cc579..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/barrel.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ barrel[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ barrel[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ barrel[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ barrel[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ barrel[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ barrel[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/blast_furnace.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/blast_furnace.mcfunction deleted file mode 100644 index b09781cead..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/blast_furnace.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0..2 run setblock ~ ~ ~ blast_furnace[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ blast_furnace[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ blast_furnace[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ blast_furnace[facing=west] - -execute if score $facing gm4_rl_data matches 0..2 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ blast_furnace[facing=north,lit=true] -execute if score $facing gm4_rl_data matches 3 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ blast_furnace[facing=south,lit=true] -execute if score $facing gm4_rl_data matches 4 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ blast_furnace[facing=east,lit=true] -execute if score $facing gm4_rl_data matches 5 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ blast_furnace[facing=west,lit=true] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/chest.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/chest.mcfunction deleted file mode 100644 index 2fef22d45e..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/chest.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0..2 run setblock ~ ~ ~ chest[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ chest[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ chest[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ chest[facing=west] - -execute if score $facing gm4_rl_data matches 0..2 if score $waterlogged gm4_rl_data matches 1 run setblock ~ ~ ~ chest[facing=north,waterlogged=true] -execute if score $facing gm4_rl_data matches 3 if score $waterlogged gm4_rl_data matches 1 run setblock ~ ~ ~ chest[facing=south,waterlogged=true] -execute if score $facing gm4_rl_data matches 4 if score $waterlogged gm4_rl_data matches 1 run setblock ~ ~ ~ chest[facing=east,waterlogged=true] -execute if score $facing gm4_rl_data matches 5 if score $waterlogged gm4_rl_data matches 1 run setblock ~ ~ ~ chest[facing=west,waterlogged=true] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/crafter.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/crafter.mcfunction deleted file mode 100644 index 0def5626d1..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/crafter.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ crafter[orientation=up_north] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ crafter[orientation=up_south] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ crafter[orientation=up_east] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ crafter[orientation=up_west] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ crafter[orientation=down_north] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ crafter[orientation=down_south] -execute if score $facing gm4_rl_data matches 6 run setblock ~ ~ ~ crafter[orientation=down_east] -execute if score $facing gm4_rl_data matches 7 run setblock ~ ~ ~ crafter[orientation=down_west] -execute if score $facing gm4_rl_data matches 8 run setblock ~ ~ ~ crafter[orientation=north_up] -execute if score $facing gm4_rl_data matches 9 run setblock ~ ~ ~ crafter[orientation=south_up] -execute if score $facing gm4_rl_data matches 10 run setblock ~ ~ ~ crafter[orientation=east_up] -execute if score $facing gm4_rl_data matches 11 run setblock ~ ~ ~ crafter[orientation=west_up] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/dispenser.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/dispenser.mcfunction deleted file mode 100644 index a397cbca26..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/dispenser.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ dispenser[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ dispenser[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ dispenser[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ dispenser[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ dispenser[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ dispenser[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/dropper.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/dropper.mcfunction deleted file mode 100644 index 355f32544d..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/dropper.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ dropper[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ dropper[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ dropper[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ dropper[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ dropper[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ dropper[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/furnace.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/furnace.mcfunction deleted file mode 100644 index 0113461c6a..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/furnace.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0..2 run setblock ~ ~ ~ furnace[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ furnace[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ furnace[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ furnace[facing=west] - -execute if score $facing gm4_rl_data matches 0..2 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ furnace[facing=north,lit=true] -execute if score $facing gm4_rl_data matches 3 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ furnace[facing=south,lit=true] -execute if score $facing gm4_rl_data matches 4 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ furnace[facing=east,lit=true] -execute if score $facing gm4_rl_data matches 5 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ furnace[facing=west,lit=true] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/hopper.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/hopper.mcfunction deleted file mode 100644 index 40da7e0a3d..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/hopper.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0..1 run setblock ~ ~ ~ hopper[facing=down,enabled=false] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ hopper[facing=north,enabled=false] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ hopper[facing=south,enabled=false] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ hopper[facing=east,enabled=false] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ hopper[facing=west,enabled=false] -clone ~ ~ ~ ~ ~ ~ ~ ~ ~ replace force diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/black_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/black_shulker_box.mcfunction deleted file mode 100644 index f5548922a9..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/black_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ black_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ black_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ black_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ black_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ black_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ black_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/blue_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/blue_shulker_box.mcfunction deleted file mode 100644 index dedaacaa07..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/blue_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ blue_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ blue_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ blue_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ blue_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ blue_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ blue_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/brown_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/brown_shulker_box.mcfunction deleted file mode 100644 index ba67844305..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/brown_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ brown_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ brown_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ brown_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ brown_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ brown_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ brown_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/cyan_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/cyan_shulker_box.mcfunction deleted file mode 100644 index d9a543fc8e..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/cyan_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ cyan_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ cyan_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ cyan_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ cyan_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ cyan_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ cyan_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/gray_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/gray_shulker_box.mcfunction deleted file mode 100644 index 5202e7da38..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/gray_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ gray_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ gray_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ gray_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ gray_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ gray_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ gray_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/green_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/green_shulker_box.mcfunction deleted file mode 100644 index a9d1a3cf04..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/green_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ green_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ green_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ green_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ green_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ green_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ green_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/light_blue_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/light_blue_shulker_box.mcfunction deleted file mode 100644 index 7dbf490bc4..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/light_blue_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ light_blue_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ light_blue_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ light_blue_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ light_blue_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ light_blue_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ light_blue_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/light_gray_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/light_gray_shulker_box.mcfunction deleted file mode 100644 index b671715ec6..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/light_gray_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ light_gray_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ light_gray_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ light_gray_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ light_gray_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ light_gray_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ light_gray_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/lime_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/lime_shulker_box.mcfunction deleted file mode 100644 index 179947d4cb..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/lime_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ lime_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ lime_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ lime_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ lime_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ lime_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ lime_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/magenta_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/magenta_shulker_box.mcfunction deleted file mode 100644 index acf6fd644b..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/magenta_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ magenta_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ magenta_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ magenta_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ magenta_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ magenta_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ magenta_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/orange_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/orange_shulker_box.mcfunction deleted file mode 100644 index cdde4abe95..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/orange_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ orange_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ orange_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ orange_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ orange_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ orange_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ orange_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/pink_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/pink_shulker_box.mcfunction deleted file mode 100644 index af91ddf185..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/pink_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ pink_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ pink_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ pink_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ pink_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ pink_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ pink_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/purple_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/purple_shulker_box.mcfunction deleted file mode 100644 index 9a7dae9a75..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/purple_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ purple_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ purple_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ purple_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ purple_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ purple_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ purple_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/red_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/red_shulker_box.mcfunction deleted file mode 100644 index c702ab7fd3..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/red_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ red_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ red_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ red_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ red_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ red_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ red_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/shulker_box.mcfunction deleted file mode 100644 index ac99a2fdb2..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/white_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/white_shulker_box.mcfunction deleted file mode 100644 index ccba2a39f7..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/white_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ white_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ white_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ white_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ white_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ white_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ white_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/yellow_shulker_box.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/yellow_shulker_box.mcfunction deleted file mode 100644 index 99c22f6e82..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/shulker_boxes/yellow_shulker_box.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0 run setblock ~ ~ ~ yellow_shulker_box[facing=up] -execute if score $facing gm4_rl_data matches 1 run setblock ~ ~ ~ yellow_shulker_box[facing=down] -execute if score $facing gm4_rl_data matches 2 run setblock ~ ~ ~ yellow_shulker_box[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ yellow_shulker_box[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ yellow_shulker_box[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ yellow_shulker_box[facing=west] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/smoker.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/smoker.mcfunction deleted file mode 100644 index 24cfce7927..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/smoker.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0..2 run setblock ~ ~ ~ smoker[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ smoker[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ smoker[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ smoker[facing=west] - -execute if score $facing gm4_rl_data matches 0..2 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ smoker[facing=north,lit=true] -execute if score $facing gm4_rl_data matches 3 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ smoker[facing=south,lit=true] -execute if score $facing gm4_rl_data matches 4 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ smoker[facing=east,lit=true] -execute if score $facing gm4_rl_data matches 5 if score $lit gm4_rl_data matches 1 run setblock ~ ~ ~ smoker[facing=west,lit=true] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/trapped_chest.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/place_block/trapped_chest.mcfunction deleted file mode 100644 index 189e1f74f2..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/place_block/trapped_chest.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# places the block state/data from the relocator item -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:place_down/check_block - -execute if score $facing gm4_rl_data matches 0..2 run setblock ~ ~ ~ trapped_chest[facing=north] -execute if score $facing gm4_rl_data matches 3 run setblock ~ ~ ~ trapped_chest[facing=south] -execute if score $facing gm4_rl_data matches 4 run setblock ~ ~ ~ trapped_chest[facing=east] -execute if score $facing gm4_rl_data matches 5 run setblock ~ ~ ~ trapped_chest[facing=west] - -execute if score $facing gm4_rl_data matches 0..2 if score $waterlogged gm4_rl_data matches 1 run setblock ~ ~ ~ trapped_chest[facing=north,waterlogged=true] -execute if score $facing gm4_rl_data matches 3 if score $waterlogged gm4_rl_data matches 1 run setblock ~ ~ ~ trapped_chest[facing=south,waterlogged=true] -execute if score $facing gm4_rl_data matches 4 if score $waterlogged gm4_rl_data matches 1 run setblock ~ ~ ~ trapped_chest[facing=east,waterlogged=true] -execute if score $facing gm4_rl_data matches 5 if score $waterlogged gm4_rl_data matches 1 run setblock ~ ~ ~ trapped_chest[facing=west,waterlogged=true] diff --git a/gm4_relocators/data/gm4_relocators/function/place_down/success.mcfunction b/gm4_relocators/data/gm4_relocators/function/place_down/success.mcfunction deleted file mode 100644 index b0ad96440d..0000000000 --- a/gm4_relocators/data/gm4_relocators/function/place_down/success.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# returns the empty relocator to the player -# @s = player who placed the relocator -# located at the center of the placed relocator -# run from gm4_relocators:machine/verify_place_down - -# return relocator -playsound minecraft:block.beacon.activate block @a[distance=..8] ~ ~ ~ 1 2 -execute at @s[gamemode=!creative,gamemode=!spectator] run loot spawn ~ ~.3 ~ loot gm4_relocators:items/relocator_empty -data merge entity @e[type=item,distance=..7,nbt={Age:0s,Item:{id:"minecraft:player_head",count:1,components:{"minecraft:custom_data":{gm4_machines:{id:"relocator_empty"}}}}},limit=1] {PickupDelay:0} diff --git a/gm4_relocators/data/gm4_relocators/gm4_recipes/relocator.json b/gm4_relocators/data/gm4_relocators/gm4_recipes/relocator.json deleted file mode 100644 index 7f566653c9..0000000000 --- a/gm4_relocators/data/gm4_relocators/gm4_recipes/relocator.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "CSC", - "ABA", - "CSC" - ], - "key": { - "C": { - "item": "minecraft:crying_obsidian" - }, - "S": { - "item": "minecraft:shulker_shell" - }, - "A": { - "item": "minecraft:amethyst_shard" - }, - "B": [ - { - "item": "minecraft:enchanted_book", - "components": { - "minecraft:stored_enchantments": { - "minecraft:silk_touch": 1 - } - } - }, - { - "item": "minecraft:paper", - "components": { - "minecraft:enchantments": { - "minecraft:silk_touch": 1 - } - } - } - ] - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_relocators:items/relocator_empty", - "count": 1 - } - } -} diff --git a/gm4_relocators/data/gm4_relocators/guidebook/relocators.json b/gm4_relocators/data/gm4_relocators/guidebook/relocators.json deleted file mode 100644 index a5f066eef9..0000000000 --- a/gm4_relocators/data/gm4_relocators/guidebook/relocators.json +++ /dev/null @@ -1,217 +0,0 @@ -{ - "id": "relocators", - "name": "Relocators", - "module_type": "module", - "icon": { - "id": "minecraft:shulker_box" - }, - "criteria": { - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, - "obtain_shulker_shell": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:shulker_shell" - ] - } - ] - } - }, - "obtain_silk_touch_book": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:enchanted_book" - ], - "predicates": { - "minecraft:stored_enchantments": [ - { - "enchantments": "minecraft:silk_touch" - } - ] - } - } - ] - } - }, - "obtain_empty_relocator": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:player_head" - ], - "predicates": { - "minecraft:custom_data": "{gm4_machines:{id:\"relocator_empty\"}}" - } - } - ] - } - }, - "obtain_filled_relocator": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:player_head" - ], - "predicates": { - "minecraft:custom_data": "{gm4_machines:{id:\"relocator_full\"}}" - } - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [ - [ - "open_custom_crafter" - ] - ], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.relocators.description", - "fallback": "Relocators can be used to move machine blocks. They can be crafted in a Custom Crafter with end game materials." - } - ] - ] - }, - { - "name": "crafting", - "enable": [ - { - "id": "gm4_book_binders", - "load": -1 - } - ], - "requirements": [ - [ - "obtain_shulker_shell" - ], - [ - "obtain_silk_touch_book" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.relocators.crafting", - "fallback": "Relocators can be crafted with the following recipe:" - }, - "\n", - { - "insert": "recipe", - "recipe": "gm4_relocators:relocator" - } - ] - ], - "prerequisites": [ - "description" - ] - }, - { - "name": "crafting_book_binders", - "enable": [ - { - "id": "gm4_book_binders", - "load": 1 - } - ], - "requirements": [ - [ - "obtain_shulker_shell" - ], - [ - "obtain_silk_touch_book" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.relocators.crafting_with_silk_page", - "fallback": "A silk touch page can be used instead of a book. " - }, - "\n", - { - "insert": "recipe", - "recipe": "gm4_relocators:relocator" - } - ] - ], - "prerequisites": [ - "description" - ] - }, - { - "name": "usage_pick_up", - "enable": [], - "requirements": [ - [ - "obtain_empty_relocator" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.relocators.usage_pick_up", - "fallback": "Placing an empty relocator on a container will pick up it up, along with all of its contents.\n\nMachines such as custom crafters can also be picked up with no loss of items." - } - ] - ], - "grants": [ - "description" - ] - }, - { - "name": "usage_place_down", - "enable": [], - "requirements": [ - [ - "obtain_filled_relocator" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.relocators.usage_place_down", - "fallback": "Placing a filled relocator on the ground will empty the relocator and place the block there.\n\nThe empty relocator will be returned." - } - ] - ], - "grants": [ - "usage_pick_up" - ] - } - ] -} diff --git a/gm4_relocators/data/gm4_relocators/loot_table/crafting/relocator.json b/gm4_relocators/data/gm4_relocators/loot_table/crafting/relocator.json deleted file mode 100644 index 48b4079cf0..0000000000 --- a/gm4_relocators/data/gm4_relocators/loot_table/crafting/relocator.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_relocators:items/relocator_empty", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_relocators/data/gm4_relocators/loot_table/items/relocator_empty.json b/gm4_relocators/data/gm4_relocators/loot_table/items/relocator_empty.json deleted file mode 100644 index 732a69c37b..0000000000 --- a/gm4_relocators/data/gm4_relocators/loot_table/items/relocator_empty.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "minecraft:player_head", - "functions": [ - { - "function": "set_components", - "components": { - "minecraft:custom_model_data": "item/relocator_empty", - "minecraft:profile": "$relocator_empty" - } - }, - { - "function": "set_custom_data", - "tag": "{gm4_machines:{id:'relocator_empty'}}" - }, - { - "function": "set_name", - "name": [ - { - "translate": "item.gm4.relocator", - "fallback": "Relocator", - "italic": false - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_relocators/data/gm4_relocators/loot_table/items/relocator_full.json b/gm4_relocators/data/gm4_relocators/loot_table/items/relocator_full.json deleted file mode 100644 index f84cfbd80c..0000000000 --- a/gm4_relocators/data/gm4_relocators/loot_table/items/relocator_full.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:player_head", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "item/relocator_full", - "minecraft:profile": "$relocator_full" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_machines:{id:'relocator_full'}}" - }, - { - "function": "minecraft:set_name", - "name": [ - { - "translate": "item.gm4.relocator", - "fallback": "Relocator", - "italic": false - } - ] - }, - { - "function": "minecraft:copy_custom_data", - "source": { - "type": "minecraft:storage", - "source": "gm4_relocators:temp" - }, - "ops": [ - { - "source": "gm4_relocation", - "target": "gm4_relocation", - "op": "replace" - } - ] - }, - { - "function": "minecraft:set_lore", - "entity": "this", - "lore": [ - { - "nbt": "lore", - "storage": "gm4_relocators:temp", - "interpret": true - } - ], - "mode": "append" - } - ] - } - ] - } - ] -} diff --git a/gm4_relocators/data/gm4_relocators/skins/relocator_empty.png b/gm4_relocators/data/gm4_relocators/skins/relocator_empty.png deleted file mode 100644 index ebd0ee0187..0000000000 Binary files a/gm4_relocators/data/gm4_relocators/skins/relocator_empty.png and /dev/null differ diff --git a/gm4_relocators/data/gm4_relocators/skins/relocator_full.png b/gm4_relocators/data/gm4_relocators/skins/relocator_full.png deleted file mode 100644 index 89049fb74a..0000000000 Binary files a/gm4_relocators/data/gm4_relocators/skins/relocator_full.png and /dev/null differ diff --git a/gm4_relocators/data/gm4_relocators/tags/block/relocatable_block.json b/gm4_relocators/data/gm4_relocators/tags/block/relocatable_block.json deleted file mode 100644 index f87f865f84..0000000000 --- a/gm4_relocators/data/gm4_relocators/tags/block/relocatable_block.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "values": [ - "#minecraft:shulker_boxes", - "minecraft:barrel", - "minecraft:blast_furnace", - "minecraft:brewing_stand", - "minecraft:chest", - "minecraft:crafter", - "minecraft:dispenser", - "minecraft:dropper", - "minecraft:furnace", - "minecraft:hopper", - "minecraft:smoker", - "minecraft:trapped_chest" - ] -} diff --git a/gm4_relocators/data/gm4_relocators/tags/function/pick_up/get_block_state.json b/gm4_relocators/data/gm4_relocators/tags/function/pick_up/get_block_state.json deleted file mode 100644 index 82523888aa..0000000000 --- a/gm4_relocators/data/gm4_relocators/tags/function/pick_up/get_block_state.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "values": [] -} diff --git a/gm4_relocators/data/gm4_relocators/tags/function/pick_up/get_data.json b/gm4_relocators/data/gm4_relocators/tags/function/pick_up/get_data.json deleted file mode 100644 index 82523888aa..0000000000 --- a/gm4_relocators/data/gm4_relocators/tags/function/pick_up/get_data.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "values": [] -} diff --git a/gm4_relocators/data/gm4_relocators/tags/function/pick_up_check.json b/gm4_relocators/data/gm4_relocators/tags/function/pick_up_check.json deleted file mode 100644 index e7c663c5b2..0000000000 --- a/gm4_relocators/data/gm4_relocators/tags/function/pick_up_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_relocators:custom_crafter_relocating/pick_up_check" - ] -} diff --git a/gm4_relocators/data/gm4_relocators/tags/function/place_down/place_block.json b/gm4_relocators/data/gm4_relocators/tags/function/place_down/place_block.json deleted file mode 100644 index 82523888aa..0000000000 --- a/gm4_relocators/data/gm4_relocators/tags/function/place_down/place_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "values": [] -} diff --git a/gm4_relocators/data/gm4_relocators/tags/function/place_down_check.json b/gm4_relocators/data/gm4_relocators/tags/function/place_down_check.json deleted file mode 100644 index d9ab9b25b8..0000000000 --- a/gm4_relocators/data/gm4_relocators/tags/function/place_down_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_relocators:custom_crafter_relocating/place_down_check" - ] -} diff --git a/gm4_relocators/data/gm4_relocators/tags/item/shulker_boxes.json b/gm4_relocators/data/gm4_relocators/tags/item/shulker_boxes.json deleted file mode 100644 index 707702400f..0000000000 --- a/gm4_relocators/data/gm4_relocators/tags/item/shulker_boxes.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "values": [ - "minecraft:shulker_box", - "minecraft:black_shulker_box", - "minecraft:blue_shulker_box", - "minecraft:brown_shulker_box", - "minecraft:cyan_shulker_box", - "minecraft:gray_shulker_box", - "minecraft:green_shulker_box", - "minecraft:light_blue_shulker_box", - "minecraft:light_gray_shulker_box", - "minecraft:lime_shulker_box", - "minecraft:magenta_shulker_box", - "minecraft:orange_shulker_box", - "minecraft:pink_shulker_box", - "minecraft:purple_shulker_box", - "minecraft:red_shulker_box", - "minecraft:white_shulker_box", - "minecraft:yellow_shulker_box" - ] -} diff --git a/gm4_relocators/data/gm4_relocators/test/craft_relocator.mcfunction b/gm4_relocators/data/gm4_relocators/test/craft_relocator.mcfunction deleted file mode 100644 index a5a770f37d..0000000000 --- a/gm4_relocators/data/gm4_relocators/test/craft_relocator.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.0 with crying_obsidian -item replace block ~1 ~1 ~1 container.1 with shulker_shell -item replace block ~1 ~1 ~1 container.2 with crying_obsidian -item replace block ~1 ~1 ~1 container.3 with amethyst_shard -item replace block ~1 ~1 ~1 container.4 with enchanted_book[stored_enchantments={silk_touch:1}] -item replace block ~1 ~1 ~1 container.5 with amethyst_shard -item replace block ~1 ~1 ~1 container.6 with crying_obsidian -item replace block ~1 ~1 ~1 container.7 with shulker_shell -item replace block ~1 ~1 ~1 container.8 with crying_obsidian - -await items block ~1 ~1 ~1 container.* minecraft:player_head[custom_data~{gm4_machines:{id:"relocator_empty"}}] diff --git a/gm4_relocators/data/gm4_relocators/test/move_chest.mcfunction b/gm4_relocators/data/gm4_relocators/test/move_chest.mcfunction deleted file mode 100644 index f1d0a4c07c..0000000000 --- a/gm4_relocators/data/gm4_relocators/test/move_chest.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -# @template gm4:test_platform -# @dummy ~1.5 ~1 ~0.5 -# @optional - -setblock ~1 ~1 ~1 chest -item replace block ~1 ~1 ~1 container.5 with minecraft:apple 4 - -# pick up chest with relocator -loot give @s loot gm4_relocators:items/relocator_empty -execute at @s run tp @s ~ ~ ~ facing ~ ~-0.5 ~1 -dummy @s sneak true - -await delay 1s - -dummy @s use block ~1 ~1 ~1 up - -await block ~1 ~1 ~1 air -assert items entity @e[type=item,distance=..4] contents minecraft:player_head[custom_data~{gm4_machines:{id:"relocator_full"}}] - -clear @s -tp @e[type=item,distance=..4,limit=1] @s - -await items entity @s container.* minecraft:player_head[custom_data~{gm4_machines:{id:"relocator_full"}}] - -# place down chest with relocator -execute at @s run tp @s ~ ~ ~ facing ~0.5 ~-0.8 ~1 -dummy @s use block ~2 ~ ~2 up - -await items block ~2 ~1 ~2 container.5 minecraft:apple[count=4] diff --git a/gm4_relocators/mod.mcdoc b/gm4_relocators/mod.mcdoc deleted file mode 100644 index 40e56f36c4..0000000000 --- a/gm4_relocators/mod.mcdoc +++ /dev/null @@ -1,20 +0,0 @@ -use ::java::util::text::Text -use ::java::world::entity::AnyEntity - -dispatch minecraft:storage[gm4_relocators:temp] to struct RelocatorsTemp { - merge_data?: struct MergeData { - custom_block: string, - lore: Text, - entity_data?: AnyEntity - }, - gm4_relocation?: struct Gm4Relocation { - custom_block?: string, - block_state?: struct { - id: #[id=block] string, - [string]: any, - }, - lore?: Text, - data?: any, - }, - lore?: Text, -} diff --git a/gm4_relocators/pack.png b/gm4_relocators/pack.png deleted file mode 100644 index 946ca82f12..0000000000 Binary files a/gm4_relocators/pack.png and /dev/null differ diff --git a/gm4_relocators/pack.svg b/gm4_relocators/pack.svg deleted file mode 100644 index 50c82e14d8..0000000000 --- a/gm4_relocators/pack.svg +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gm4_rope_ladders/data/gm4/advancement/rope_ladders.json b/gm4_rope_ladders/data/gm4/advancement/rope_ladders.json index 951343ec76..d54c1ad510 100644 --- a/gm4_rope_ladders/data/gm4/advancement/rope_ladders.json +++ b/gm4_rope_ladders/data/gm4/advancement/rope_ladders.json @@ -3,7 +3,7 @@ "icon": { "id": "ladder", "components": { - "minecraft:custom_model_data": "gui/advancement/rope_ladders" + "minecraft:custom_model_data": {"strings":["gm4_rope_ladders:gui/advancement/rope_ladders"]} } }, "title": { diff --git a/gm4_scuba_gear/assets/translations.csv b/gm4_scuba_gear/assets/translations.csv index 4a1251fbe6..8855640481 100644 --- a/gm4_scuba_gear/assets/translations.csv +++ b/gm4_scuba_gear/assets/translations.csv @@ -5,7 +5,7 @@ item.gm4.scuba_tank,SCUBA Tank advancement.gm4.scuba_gear.title,Things Are Going Swimmingly! advancement.gm4.scuba_gear.description,Suit up with a full set of SCUBA gear text.gm4.guidebook.module_desc.scuba_gear,Ease ocean exploration with craftable scuba gear! -text.gm4.guidebook.scuba_gear.description,SCUBA Gear can be crafted in a Custom Crafter to aid in ocean travel.\n\nScutes and gold are main components for each piece. +text.gm4.guidebook.scuba_gear.description,SCUBA Gear can be crafted in a crafting table to aid in ocean travel.\n\nScutes and gold are main components for each piece. text.gm4.guidebook.scuba_gear.crafting_flippers,Flippers can be crafted with the following recipe: text.gm4.guidebook.scuba_gear.crafting_scuba_helmet,The SCUBA Helmet can be crafted with the following recipe: text.gm4.guidebook.scuba_gear.crafting_scuba_tank,The SCUBA Tank can be crafted with the following recipe: diff --git a/gm4_scuba_gear/beet.yaml b/gm4_scuba_gear/beet.yaml index 60157f97c1..716c4e6c09 100644 --- a/gm4_scuba_gear/beet.yaml +++ b/gm4_scuba_gear/beet.yaml @@ -10,13 +10,10 @@ resource_pack: pipeline: - gm4.plugins.extend.module - - gm4.plugins.include.lib_custom_crafters meta: gm4: versioning: - required: - lib_custom_crafters: 3.4.0 schedule_loops: [main] website: description: Ease ocean exploration with craftable scuba gear! diff --git a/gm4_scuba_gear/data/gm4/advancement/scuba_gear.json b/gm4_scuba_gear/data/gm4/advancement/scuba_gear.json index 1498b67dc3..083dcf767f 100644 --- a/gm4_scuba_gear/data/gm4/advancement/scuba_gear.json +++ b/gm4_scuba_gear/data/gm4/advancement/scuba_gear.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:player_head", "components": { - "minecraft:custom_model_data": "gui/advancement/scuba_gear", + "minecraft:custom_model_data": {"strings":["gm4_scuba_gear:gui/advancement/scuba_gear"]}, "minecraft:profile": "$scuba_helmet" } }, @@ -17,7 +17,7 @@ "color": "gray" } }, - "parent": "gm4:custom_crafters", + "parent": "gm4:root", "criteria": { "all_gear_equipped": { "trigger": "minecraft:inventory_changed", diff --git a/gm4_scuba_gear/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_scuba_gear/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 184c190cdc..0000000000 --- a/gm4_scuba_gear/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_scuba_gear:check_recipes" - ] -} diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/function/check_recipes.mcfunction b/gm4_scuba_gear/data/gm4_scuba_gear/function/check_recipes.mcfunction deleted file mode 100644 index 6e1f30d2e4..0000000000 --- a/gm4_scuba_gear/data/gm4_scuba_gear/function/check_recipes.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..64 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:gold_ingot"},{Slot:1b,id:"minecraft:turtle_helmet"},{Slot:2b,id:"minecraft:gold_ingot"},{Slot:3b,id:"minecraft:gold_ingot"},{Slot:4b,id:"minecraft:glass_pane"},{Slot:5b,id:"minecraft:gold_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_scuba_gear:crafting/scuba_helmet -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches 1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:gold_ingot"},{Slot:1b,id:"minecraft:potion",components:{"minecraft:potion_contents":{potion:"minecraft:water_breathing"}}},{Slot:2b,id:"minecraft:gold_ingot"},{Slot:3b,id:"minecraft:turtle_scute"},{Slot:4b,id:"minecraft:gold_ingot"},{Slot:5b,id:"minecraft:turtle_scute"},{Slot:6b,id:"minecraft:gold_ingot"},{Slot:7b,id:"minecraft:gold_ingot"},{Slot:8b,id:"minecraft:gold_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_scuba_gear:crafting/scuba_tank -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches 1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:gold_ingot"},{Slot:1b,id:"minecraft:potion",components:{"minecraft:potion_contents":{potion:"minecraft:long_water_breathing"}}},{Slot:2b,id:"minecraft:gold_ingot"},{Slot:3b,id:"minecraft:turtle_scute"},{Slot:4b,id:"minecraft:gold_ingot"},{Slot:5b,id:"minecraft:turtle_scute"},{Slot:6b,id:"minecraft:gold_ingot"},{Slot:7b,id:"minecraft:gold_ingot"},{Slot:8b,id:"minecraft:gold_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_scuba_gear:crafting/scuba_tank -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches 1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:turtle_scute"},{Slot:2b,id:"minecraft:turtle_scute"},{Slot:3b,id:"minecraft:rabbit_hide"},{Slot:5b,id:"minecraft:rabbit_hide"},{Slot:6b,id:"minecraft:rabbit_hide"},{Slot:8b,id:"minecraft:rabbit_hide"}]} run loot replace block ~ ~ ~ container.0 loot gm4_scuba_gear:crafting/flippers diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/flippers.json b/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/flippers.json deleted file mode 100644 index dee6bfcba2..0000000000 --- a/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/flippers.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "S S", - "R R", - "R R" - ], - "key": { - "S": { - "item": "minecraft:turtle_scute" - }, - "R": { - "item": "minecraft:rabbit_hide" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_scuba_gear:items/flippers", - "count": 1, - "guidebook": { - "display_color": 11009871 - } - } - } -} diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/scuba_helmet.json b/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/scuba_helmet.json deleted file mode 100644 index 7d059cd3e5..0000000000 --- a/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/scuba_helmet.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "GTG", - "GPG" - ], - "key": { - "G": { - "item": "minecraft:gold_ingot" - }, - "T": { - "item": "minecraft:turtle_helmet" - }, - "P": { - "item": "minecraft:glass_pane" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_scuba_gear:items/scuba_helmet", - "count": 1 - } - } -} diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/scuba_tank.json b/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/scuba_tank.json deleted file mode 100644 index cf062071d8..0000000000 --- a/gm4_scuba_gear/data/gm4_scuba_gear/gm4_recipes/scuba_tank.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "GPG", - "SGS", - "GGG" - ], - "key": { - "G": { - "item": "minecraft:gold_ingot" - }, - "P": [ - { - "item": "minecraft:potion", - "components": {"minecraft:potion_contents":{"potion":"minecraft:water_breathing"}}, - "guidebook": { - "overlay_color": 10017472 - } - }, - { - "item": "minecraft:potion", - "components": {"minecraft:potion_contents":{"potion":"minecraft:long_water_breathing"}}, - "guidebook": { - "overlay_color": 10017472 - } - } - ], - "S": { - "item": "minecraft:turtle_scute" - } - } - }, - "output": { - "type": "normal", - "result": { - "type": "loot_table", - "name": "gm4_scuba_gear:items/scuba_tank", - "count": 1 - } - } -} diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/guidebook/scuba_gear.json b/gm4_scuba_gear/data/gm4_scuba_gear/guidebook/scuba_gear.json index 36dd9d602b..40f15f800f 100644 --- a/gm4_scuba_gear/data/gm4_scuba_gear/guidebook/scuba_gear.json +++ b/gm4_scuba_gear/data/gm4_scuba_gear/guidebook/scuba_gear.json @@ -101,7 +101,7 @@ }, { "translate": "text.gm4.guidebook.scuba_gear.description", - "fallback": "SCUBA Gear can be crafted in a Custom Crafter to aid in ocean travel.\n\nScutes and gold are main components for each piece." + "fallback": "SCUBA Gear can be crafted in a crafting table to aid in ocean travel.\n\nScutes and gold are main components for each piece." } ] ] diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/flippers.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/flippers.json deleted file mode 100644 index b617166679..0000000000 --- a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/flippers.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_scuba_gear:items/flippers", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/scuba_helmet.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/scuba_helmet.json deleted file mode 100644 index ce285b5b03..0000000000 --- a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/scuba_helmet.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_scuba_gear:items/scuba_helmet", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/scuba_tank.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/scuba_tank.json deleted file mode 100644 index 2c3968fa39..0000000000 --- a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/crafting/scuba_tank.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_scuba_gear:items/scuba_tank", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/flippers.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/flippers.json index a00523ea6c..5662d434d5 100644 --- a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/flippers.json +++ b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/flippers.json @@ -32,7 +32,7 @@ "operation": "add_multiplied_base" } ], - "minecraft:custom_model_data": "item/flippers" + "minecraft:custom_model_data": {"strings":["gm4_scuba_gear:item/flippers"]} } }, { diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/scuba_helmet.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/scuba_helmet.json index cace400166..139c99dd58 100644 --- a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/scuba_helmet.json +++ b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/scuba_helmet.json @@ -26,7 +26,7 @@ "operation": "add_value" } ], - "minecraft:custom_model_data": "item/scuba_helmet", + "minecraft:custom_model_data": {"strings":["gm4_scuba_gear:item/scuba_helmet"]}, "minecraft:profile": "$scuba_helmet" } }, diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/scuba_tank.json b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/scuba_tank.json index 91b00dc533..a4472b9a73 100644 --- a/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/scuba_tank.json +++ b/gm4_scuba_gear/data/gm4_scuba_gear/loot_table/items/scuba_tank.json @@ -26,7 +26,7 @@ "operation": "add_value" } ], - "minecraft:custom_model_data": "item/scuba_tank" + "minecraft:custom_model_data": {"strings":["gm4_scuba_gear:item/scuba_tank"]} } }, { diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/recipe/flippers.json b/gm4_scuba_gear/data/gm4_scuba_gear/recipe/flippers.json new file mode 100644 index 0000000000..74c6304c1f --- /dev/null +++ b/gm4_scuba_gear/data/gm4_scuba_gear/recipe/flippers.json @@ -0,0 +1,46 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "R R", + "R R" + ], + "key": { + "S": "minecraft:turtle_scute", + "R": "minecraft:rabbit_hide" + }, + "result": { + "id": "minecraft:leather_boots", + "components": { + "minecraft:dyed_color": 11009871, + "minecraft:tooltip_display": { + "hidden_components": [ + "minecraft:dyed_color" + ] + }, + "minecraft:attribute_modifiers": [ + { + "type": "minecraft:armor", + "id": "gm4_scuba_gear:flippers_armor", + "slot": "feet", + "amount": 1, + "operation": "add_value" + }, + { + "type": "minecraft:movement_speed", + "id": "gm4_scuba_gear:flippers_movement_speed", + "slot": "feet", + "amount": -0.4, + "operation": "add_multiplied_base" + } + ], + "minecraft:custom_model_data": {"strings":["gm4_scuba_gear:item/flippers"]}, + "minecraft:custom_data": "{gm4_scuba_gear:{item:'flippers'}}", + "minecraft:custom_name": { + "translate": "item.gm4.flippers", + "fallback": "Flippers", + "italic": false + } + } + } +} diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/recipe/scuba_helmet.json b/gm4_scuba_gear/data/gm4_scuba_gear/recipe/scuba_helmet.json new file mode 100644 index 0000000000..697df037fd --- /dev/null +++ b/gm4_scuba_gear/data/gm4_scuba_gear/recipe/scuba_helmet.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GTG", + "GPG" + ], + "key": { + "G": "minecraft:gold_ingot", + "T": "minecraft:turtle_helmet", + "P": "minecraft:glass_pane" + }, + "result": { + "id": "minecraft:player_head", + "components": { + "minecraft:attribute_modifiers": [ + { + "type": "minecraft:armor", + "id": "gm4_scuba_gear:helmet_armor", + "slot": "head", + "amount": 2, + "operation": "add_value" + }, + { + "type": "minecraft:attack_speed", + "id": "gm4_scuba_gear:helmet_attack_speed", + "slot": "head", + "amount": -0.5, + "operation": "add_value" + } + ], + "minecraft:custom_model_data": {"strings":["gm4_scuba_gear:item/scuba_helmet"]}, + "minecraft:profile": "$scuba_helmet", + "minecraft:custom_data": "{gm4_scuba_gear:{item:'helmet'}}", + "minecraft:custom_name": { + "translate": "item.gm4.scuba_helmet", + "fallback": "SCUBA Helmet", + "italic": false, + "color": "white" + } + } + } +} diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/recipe/scuba_tank.json b/gm4_scuba_gear/data/gm4_scuba_gear/recipe/scuba_tank.json new file mode 100644 index 0000000000..47421616a3 --- /dev/null +++ b/gm4_scuba_gear/data/gm4_scuba_gear/recipe/scuba_tank.json @@ -0,0 +1,41 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GPG", + "SGS", + "GGG" + ], + "key": { + "G": "minecraft:gold_ingot", + "P": "minecraft:potion", + "S": "minecraft:turtle_scute" + }, + "result": { + "id": "minecraft:golden_chestplate", + "components": { + "minecraft:attribute_modifiers": [ + { + "type": "minecraft:movement_speed", + "id": "gm4_scuba_gear:tank_movement_speed", + "slot": "chest", + "amount": -0.1, + "operation": "add_multiplied_base" + }, + { + "type": "minecraft:armor", + "slot": "chest", + "id": "gm4_scuba_gear:tank_armor", + "amount": 4, + "operation": "add_value" + } + ], + "minecraft:custom_model_data": {"strings":["gm4_scuba_gear:item/scuba_tank"]}, + "minecraft:custom_data": "{gm4_scuba_gear:{item:'tank'}}", + "minecraft:custom_name": { + "translate": "item.gm4.scuba_tank", + "fallback": "SCUBA Tank", + "italic": false + } + } + } +} diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/test/craft_flippers.mcfunction b/gm4_scuba_gear/data/gm4_scuba_gear/test/craft_flippers.mcfunction deleted file mode 100644 index dfd10f20c0..0000000000 --- a/gm4_scuba_gear/data/gm4_scuba_gear/test/craft_flippers.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# @template gm4_custom_crafters:test_platform - -item replace block ~1 ~1 ~1 container.0 with turtle_scute -item replace block ~1 ~1 ~1 container.2 with turtle_scute -item replace block ~1 ~1 ~1 container.3 with rabbit_hide -item replace block ~1 ~1 ~1 container.5 with rabbit_hide -item replace block ~1 ~1 ~1 container.6 with rabbit_hide -item replace block ~1 ~1 ~1 container.8 with rabbit_hide - -await items block ~1 ~1 ~1 container.* minecraft:leather_boots[custom_data~{gm4_scuba_gear:{item:"flippers"}}] diff --git a/gm4_shapeless_portals/pack.png b/gm4_shapeless_portals/pack.png new file mode 100644 index 0000000000..bc752277d0 Binary files /dev/null and b/gm4_shapeless_portals/pack.png differ diff --git a/gm4_shroomites/data/gm4_shroomites/tags/block/spore_convertable.json b/gm4_shroomites/data/gm4_shroomites/tags/block/spore_convertable.json index 1ee3ccef2e..656cf92289 100644 --- a/gm4_shroomites/data/gm4_shroomites/tags/block/spore_convertable.json +++ b/gm4_shroomites/data/gm4_shroomites/tags/block/spore_convertable.json @@ -1,6 +1,6 @@ { "values": [ - "#minecraft:dirt", + "#minecraft:substrate_overworld", "minecraft:farmland" ] } diff --git a/gm4_smelteries/assets/translations.csv b/gm4_smelteries/assets/translations.csv index 2507962d50..8d07764494 100644 --- a/gm4_smelteries/assets/translations.csv +++ b/gm4_smelteries/assets/translations.csv @@ -5,7 +5,7 @@ advancement.gm4.smelteries.title,Serious Smelter advancement.gm4.smelteries.description,Construct a Smeltery text.gm4.guidebook.module_desc.smelteries,Build a Smeltery and double your ore output with this multi-block structure. text.gm4.guidebook.smelteries.description,"Smelteries can refine certain furnace recipes.\n\nMetal ores, sand, and chorus fruit can be doubled with Smelteries." -text.gm4.guidebook.smelteries.crafting,A Smeltery can be crafted in a Custom Crafter: +text.gm4.guidebook.smelteries.crafting,A Smeltery can be crafted in a crafting table: text.gm4.guidebook.smelteries.multi_block,"The smeltery requires a multi-block structure to work.\n\nBehind the smeltery must be a cauldron. The rest of the 3x3 grid must be filled with iron blocks, then another layer of iron blocks above the first." text.gm4.guidebook.smelteries.doubling,"Once the multi-block is set up, the smeltery will produce double the normal result.\n\nSmelting metal ores, raw metals, sand, red sand, or chorus fruit will result in doubled outputs." text.gm4.guidebook.smelteries.lava,"When something is smelted in the smeltery there is a chance that the cauldron behind it will fill with lava.\n\nWith a continuous smelting process, it's possible to keep a smeltery fueled with the extra lava." diff --git a/gm4_smelteries/beet.yaml b/gm4_smelteries/beet.yaml index bf140d0fab..626e49044a 100644 --- a/gm4_smelteries/beet.yaml +++ b/gm4_smelteries/beet.yaml @@ -12,13 +12,11 @@ pipeline: - gm4_smelteries.ore_display - gm4.plugins.extend.module - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters meta: gm4: versioning: required: - lib_custom_crafters: 3.4.0 lib_machines: 1.4.0 schedule_loops: [main] @@ -28,8 +26,7 @@ meta: texture: gui/container/smeltery website: description: Build a Smeltery and double your ore output with this multi-block structure. - recommended: - - gm4_relocators + recommended: [] notes: [] modrinth: project_id: AHj8RSHk diff --git a/gm4_smelteries/data/gm4/advancement/smelteries.json b/gm4_smelteries/data/gm4/advancement/smelteries.json index 552f715761..8a2414e2fc 100644 --- a/gm4_smelteries/data/gm4/advancement/smelteries.json +++ b/gm4_smelteries/data/gm4/advancement/smelteries.json @@ -3,7 +3,7 @@ "icon": { "id": "furnace", "components": { - "minecraft:custom_model_data": "gui/advancement/smelteries" + "minecraft:custom_model_data": {"strings":["gm4_smelteries:gui/advancement/smelteries"]} } }, "title": { @@ -16,7 +16,7 @@ "color": "gray" } }, - "parent": "gm4:custom_crafters", + "parent": "gm4:root", "criteria": { "obtain_smeltery": { "trigger": "minecraft:inventory_changed", diff --git a/gm4_smelteries/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_smelteries/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index e85c529aca..0000000000 --- a/gm4_smelteries/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_smelteries:check_recipes" - ] -} diff --git a/gm4_smelteries/data/gm4_relocators/tags/function/pick_up_check.json b/gm4_smelteries/data/gm4_relocators/tags/function/pick_up_check.json deleted file mode 100644 index 56168811f3..0000000000 --- a/gm4_smelteries/data/gm4_relocators/tags/function/pick_up_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_smelteries:relocate/pick_up_check" - ] -} diff --git a/gm4_smelteries/data/gm4_relocators/tags/function/place_down_check.json b/gm4_smelteries/data/gm4_relocators/tags/function/place_down_check.json deleted file mode 100644 index 0242065526..0000000000 --- a/gm4_smelteries/data/gm4_relocators/tags/function/place_down_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_smelteries:relocate/place_down_check" - ] -} diff --git a/gm4_smelteries/data/gm4_smelteries/function/check_ore.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/check_ore.mcfunction deleted file mode 100644 index b9e5148f9a..0000000000 --- a/gm4_smelteries/data/gm4_smelteries/function/check_ore.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# check for doublable ores -# @s = smeltery cauldron linked to a furnace that's smelting items -# located at the smeltery block (furnace) -# run from verify_furnace - -# check if item is double-able by setting the head item of the stand -data modify entity @s equipment.mainhand set from block ~ ~ ~ Items[{Slot:0b}] -item replace entity @s armor.head with air -execute store result score $double gm4_smelt_data run loot replace entity @s armor.head fish gm4_smelteries:technical/smeltable_display ~ ~ ~ mainhand -item replace entity @s weapon with air - -# check if the furnace is close to finish smelting -execute if score $double gm4_smelt_data matches 1.. if score $cook_time gm4_smelt_data matches 184..199 run function gm4_smelteries:limited_tick diff --git a/gm4_smelteries/data/gm4_smelteries/function/check_recipes.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/check_recipes.mcfunction deleted file mode 100644 index 22952cd5af..0000000000 --- a/gm4_smelteries/data/gm4_smelteries/function/check_recipes.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# @s = custom crafter running recipes -# run from #gm4_custom_crafters:check_recipes - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches ..64 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:cobblestone"},{Slot:1b,id:"minecraft:cobblestone"},{Slot:2b,id:"minecraft:cobblestone"},{Slot:3b,id:"minecraft:cobblestone"},{Slot:4b,id:"minecraft:furnace"},{Slot:5b,id:"minecraft:cobblestone"},{Slot:6b,id:"minecraft:iron_ingot"},{Slot:7b,id:"minecraft:comparator"},{Slot:8b,id:"minecraft:iron_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_smelteries:crafting/smeltery diff --git a/gm4_smelteries/data/gm4_smelteries/function/furnace_lit.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/furnace_lit.mcfunction index 9ca7060893..fdd0af5ffc 100644 --- a/gm4_smelteries/data/gm4_smelteries/function/furnace_lit.mcfunction +++ b/gm4_smelteries/data/gm4_smelteries/function/furnace_lit.mcfunction @@ -2,7 +2,7 @@ # @s = smeltery marker # run from process -execute unless entity @s[tag=gm4_smeltery_lit] positioned ~ ~-0.3 ~ run item replace entity @e[type=armor_stand,tag=gm4_smeltery_stand,distance=..0.1,limit=1] armor.head with iron_block[custom_model_data="block/smeltery_lit"] +execute unless entity @s[tag=gm4_smeltery_lit] positioned ~ ~-0.3 ~ run item replace entity @e[type=armor_stand,tag=gm4_smeltery_stand,distance=..0.1,limit=1] armor.head with iron_block[custom_model_data={strings:["gm4_smelteries:block/smeltery_lit"]}] tag @s add gm4_smeltery_lit particle large_smoke ~ ~ ~ 0 0.3 0 0 5 normal @a diff --git a/gm4_smelteries/data/gm4_smelteries/function/furnace_unlit.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/furnace_unlit.mcfunction index 96bd343429..a766534dd0 100644 --- a/gm4_smelteries/data/gm4_smelteries/function/furnace_unlit.mcfunction +++ b/gm4_smelteries/data/gm4_smelteries/function/furnace_unlit.mcfunction @@ -2,6 +2,6 @@ # @s = smeltery marker # run from process -execute positioned ~ ~-0.3 ~ run item replace entity @e[type=armor_stand,tag=gm4_smeltery_stand,distance=..0.1,limit=1] armor.head with iron_block[custom_model_data="block/smeltery_unlit"] +execute positioned ~ ~-0.3 ~ run item replace entity @e[type=armor_stand,tag=gm4_smeltery_stand,distance=..0.1,limit=1] armor.head with iron_block[custom_model_data={strings:["gm4_smelteries:block/smeltery_unlit"]}] execute positioned ^ ^-1.5 ^-1 run item replace entity @e[type=armor_stand,tag=gm4_smeltery_cauldron,distance=..0.1,limit=1] armor.head with air tag @s remove gm4_smeltery_lit diff --git a/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/east.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/east.mcfunction index 9063308375..0b9020dd10 100644 --- a/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/east.mcfunction +++ b/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/east.mcfunction @@ -10,5 +10,5 @@ setblock ~ ~ ~ furnace[facing=east]{CustomName:{"translate":"gm4.second","fallba summon armor_stand ~-1 ~-1.5 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_cauldron","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_cauldron",Rotation:[-90.0f,0.0f]} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.3 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_stand",equipment:{head:{id:"minecraft:iron_block",count:1,components:{"minecraft:custom_model_data":"block/smeltery_unlit"}}},Rotation:[-90.0f,0.0f]} +summon armor_stand ~ ~-0.3 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_stand",equipment:{head:{id:"minecraft:iron_block",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_smelteries:block/smeltery_unlit"]}}}},Rotation:[-90.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_smeltery","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_smeltery",Rotation:[-90.0f,0.0f]} diff --git a/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/north.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/north.mcfunction index 5cbfe40006..ff349b42a7 100644 --- a/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/north.mcfunction +++ b/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/north.mcfunction @@ -10,5 +10,5 @@ setblock ~ ~ ~ furnace[facing=north]{CustomName:{"translate":"gm4.second","fallb summon armor_stand ~ ~-1.5 ~1 {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_cauldron","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_cauldron",Rotation:[180.0f,0.0f]} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.3 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_stand",equipment:{head:{id:"minecraft:iron_block",count:1,components:{"minecraft:custom_model_data":"block/smeltery_unlit"}}},Rotation:[180.0f,0.0f]} +summon armor_stand ~ ~-0.3 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_stand",equipment:{head:{id:"minecraft:iron_block",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_smelteries:block/smeltery_unlit"]}}}},Rotation:[180.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_smeltery","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_smeltery",Rotation:[180.0f,0.0f]} diff --git a/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/south.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/south.mcfunction index 222fe4826c..be24ceb6e6 100644 --- a/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/south.mcfunction +++ b/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/south.mcfunction @@ -10,5 +10,5 @@ setblock ~ ~ ~ furnace[facing=south]{CustomName:{"translate":"gm4.second","fallb summon armor_stand ~ ~-1.5 ~-1 {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_cauldron","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_cauldron",Rotation:[0.0f,0.0f]} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.3 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_stand",equipment:{head:{id:"minecraft:iron_block",count:1,components:{"minecraft:custom_model_data":"block/smeltery_unlit"}}},Rotation:[0.0f,0.0f]} +summon armor_stand ~ ~-0.3 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_stand",equipment:{head:{id:"minecraft:iron_block",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_smelteries:block/smeltery_unlit"]}}}},Rotation:[0.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_smeltery","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_smeltery",Rotation:[0.0f,0.0f]} diff --git a/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/west.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/west.mcfunction index 97fb982fdf..d6d4771672 100644 --- a/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/west.mcfunction +++ b/gm4_smelteries/data/gm4_smelteries/function/machine/rotate/west.mcfunction @@ -10,5 +10,5 @@ setblock ~ ~ ~ furnace[facing=west]{CustomName:{"translate":"gm4.second","fallba summon armor_stand ~1 ~-1.5 ~ {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_cauldron","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_cauldron",Rotation:[90.0f,0.0f]} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.3 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_stand",equipment:{head:{id:"minecraft:iron_block",count:1,components:{"minecraft:custom_model_data":"block/smeltery_unlit"}}},Rotation:[90.0f,0.0f]} +summon armor_stand ~ ~-0.3 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_stand",equipment:{head:{id:"minecraft:iron_block",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_smelteries:block/smeltery_unlit"]}}}},Rotation:[90.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_smeltery","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_smeltery",Rotation:[90.0f,0.0f]} diff --git a/gm4_smelteries/data/gm4_smelteries/function/relocate/pick_up_check.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/relocate/pick_up_check.mcfunction deleted file mode 100644 index 49b406f32c..0000000000 --- a/gm4_smelteries/data/gm4_smelteries/function/relocate/pick_up_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from #gm4_relocators:pick_up_check - -execute if score gm4_smelteries load.status matches 1.. if entity @s[tag=gm4_smeltery] run function gm4_smelteries:relocate/set_pick_up_data diff --git a/gm4_smelteries/data/gm4_smelteries/function/relocate/place_down.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/relocate/place_down.mcfunction deleted file mode 100644 index e4dde5a79d..0000000000 --- a/gm4_smelteries/data/gm4_smelteries/function/relocate/place_down.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# @s = command block placed by "gm4_relocators:backwards_compatibility/place_down/replace_head" -# located at the command block (where the player head was) - -execute if block ~ ~ ~ command_block[facing=east] run setblock ~ ~ ~ hopper[facing=east] -execute if block ~ ~ ~ command_block[facing=west] run setblock ~ ~ ~ hopper[facing=west] -execute if block ~ ~ ~ command_block[facing=south] run setblock ~ ~ ~ hopper[facing=south] -execute if block ~ ~ ~ command_block[facing=north] run setblock ~ ~ ~ hopper[facing=north] -execute if block ~ ~ ~ command_block[facing=down] run setblock ~ ~ ~ hopper[facing=down] - -data merge block ~ ~ ~ {CustomName:{"translate":"container.gm4.smeltery","fallback":"Smeltery"}} -summon armor_stand ~ ~-.4 ~ {Silent:1b,Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,DisabledSlots:2039552,Tags:["gm4_smeltery","gm4_no_edit","gm4_machine"],Rotation:[45f,0f],HasVisualFire:1b,CustomName:"gm4_smeltery",equipment:{head:{id:"minecraft:gray_stained_glass",count:1,components:{"minecraft:custom_model_data":{floats:[3420001]}}},offhand:{id:"minecraft:stone_button",count:1,components:{"minecraft:custom_model_data":{floats:[3420005]}}}},Pose:{LeftArm:[0f, 0f, 0f]}} -playsound block.anvil.use block @a[distance=..4] ~ ~ ~ 1 0.8 1 diff --git a/gm4_smelteries/data/gm4_smelteries/function/relocate/place_down_check.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/relocate/place_down_check.mcfunction deleted file mode 100644 index bcb3a2f9d3..0000000000 --- a/gm4_smelteries/data/gm4_smelteries/function/relocate/place_down_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = player who placed the block -# located at the center of the block to be placed -# run from #gm4_relocators:place_down_check - -execute if score $placed_block gm4_rl_data matches 0 if score gm4_smelteries load.status matches 1 if data storage gm4_relocators:temp gm4_relocation{custom_block:"gm4_smeltery"} run function gm4_smelteries:relocate/summon_block_markers diff --git a/gm4_smelteries/data/gm4_smelteries/function/relocate/set_pick_up_data.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/relocate/set_pick_up_data.mcfunction deleted file mode 100644 index d5bcf746bc..0000000000 --- a/gm4_smelteries/data/gm4_smelteries/function/relocate/set_pick_up_data.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# sets the specific relocator data -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from gm4_smelteries:relocate/pick_up_check - -data modify storage gm4_relocators:temp merge_data set value {custom_block:"gm4_smeltery",lore:{"translate":"block.gm4.smeltery","fallback":"Smeltery","color":"gray","italic":true}} -data modify storage gm4_relocators:temp merge_data.entity_data.Rotation set from entity @s Rotation -data modify storage gm4_relocators:temp merge_data.entity_data.equipment set from entity @e[type=armor_stand,tag=gm4_smeltery_stand,distance=..0.6,limit=1] equipment - -kill @e[type=armor_stand,tag=gm4_smeltery_stand,limit=1,distance=..0.6] -scoreboard players operation $current gm4_smelt_id = @s gm4_smelt_id -execute as @e[type=armor_stand,tag=gm4_smeltery_cauldron,limit=1,distance=..3] if score @s gm4_smelt_id = $current gm4_smelt_id run kill @s -kill @s -scoreboard players set $found_marker gm4_rl_data 1 diff --git a/gm4_smelteries/data/gm4_smelteries/function/relocate/summon_block_markers.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/relocate/summon_block_markers.mcfunction deleted file mode 100644 index c4fb1a6102..0000000000 --- a/gm4_smelteries/data/gm4_smelteries/function/relocate/summon_block_markers.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# summons the entities for this machine -# @s = player who placed the block -# located at the center of the block to be placed -# run from gm4_smelteries:relocate/place_down_check - -scoreboard players set $placed_block gm4_rl_data 1 - -summon armor_stand ~ ~-0.3 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_stand",equipment:{head:{id:"minecraft:iron_block",count:1,components:{"minecraft:custom_model_data":"block/smeltery_unlit"}}},Rotation:[180.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_smeltery","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_smeltery",Rotation:[180.0f,0.0f]} -execute as @e[tag=gm4_new_machine,distance=..2] run data modify entity @s Rotation set from storage gm4_relocators:temp gm4_relocation.entity_data.Rotation -execute as @e[type=armor_stand,tag=gm4_new_machine,distance=..2] run data modify entity @s equipment set from storage gm4_relocators:temp gm4_relocation.entity_data.equipment - -execute rotated as @e[type=marker,tag=gm4_new_machine,distance=..2,limit=1] run summon armor_stand ^ ^-1.5 ^-1 {NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,Silent:1b,DisabledSlots:4144959,Tags:["gm4_no_edit","gm4_smeltery_cauldron","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_smeltery_cauldron",Rotation:[180.0f,0.0f]} - -execute store result score $new gm4_smelt_id run data get entity @e[type=marker,distance=..0.1,tag=gm4_new_machine,limit=1] UUID[3] -scoreboard players operation @e[distance=..3,tag=gm4_new_machine] gm4_smelt_id = $new gm4_smelt_id - -execute as @e[tag=gm4_new_machine,distance=..3] at @s rotated as @e[type=marker,tag=gm4_new_machine,distance=..2,limit=1] run tp ~ ~ ~ -scoreboard players set @e[distance=..3,tag=gm4_new_machine] gm4_entity_version 1 -tag @e[distance=..3] remove gm4_new_machine diff --git a/gm4_smelteries/data/gm4_smelteries/function/smelt/smelting.mcfunction b/gm4_smelteries/data/gm4_smelteries/function/smelt/smelting.mcfunction index 34dedaddf0..c0e7ce1b08 100644 --- a/gm4_smelteries/data/gm4_smelteries/function/smelt/smelting.mcfunction +++ b/gm4_smelteries/data/gm4_smelteries/function/smelt/smelting.mcfunction @@ -3,12 +3,24 @@ # located at the smeltery block (furnace) # run from smelt/check_cook_time -# check if item is doubable by setting the head item of the stand -data modify entity @s equipment.mainhand set from block ~ ~ ~ Items[{Slot:0b}] +# check if the currently smeling item can be doubled item replace entity @s armor.head with air -execute store result score $double gm4_smelt_data run loot replace entity @s armor.head fish gm4_smelteries:technical/smeltable_display ~ ~ ~ mainhand -item replace entity @s weapon with air +execute unless items block ~ ~ ~ container.0 #gm4_smelteries:can_double run return run tag @e[type=marker,tag=gm4_smeltery_processing,limit=1,distance=..2] remove gm4_smeltery_smelting + +# update the cauldron block display +execute if items block ~ ~ ~ container.0 minecraft:gold_ore run item replace entity @s armor.head with minecraft:gold_ore[custom_model_data={"strings":["gm4_smelteries:block/ore_display/gold_ore"]}] +execute if items block ~ ~ ~ container.0 minecraft:nether_gold_ore run item replace entity @s armor.head with minecraft:nether_gold_ore[custom_model_data={"strings":["gm4_smelteries:block/ore_display/nether_gold_ore"]}] +execute if items block ~ ~ ~ container.0 minecraft:deepslate_gold_ore run item replace entity @s armor.head with minecraft:deepslate_gold_ore[custom_model_data={"strings":["gm4_smelteries:block/ore_display/deepslate_gold_ore"]}] +execute if items block ~ ~ ~ container.0 minecraft:raw_gold run item replace entity @s armor.head with minecraft:raw_gold_block[custom_model_data={"strings":["gm4_smelteries:block/ore_display/raw_gold"]}] +execute if items block ~ ~ ~ container.0 minecraft:iron_ore run item replace entity @s armor.head with minecraft:iron_ore[custom_model_data={"strings":["gm4_smelteries:block/ore_display/iron_ore"]}] +execute if items block ~ ~ ~ container.0 minecraft:deepslate_iron_ore run item replace entity @s armor.head with minecraft:deepslate_iron_ore[custom_model_data={"strings":["gm4_smelteries:block/ore_display/deepslate_iron_ore"]}] +execute if items block ~ ~ ~ container.0 minecraft:raw_iron run item replace entity @s armor.head with minecraft:raw_iron_block[custom_model_data={"strings":["gm4_smelteries:block/ore_display/raw_iron"]}] +execute if items block ~ ~ ~ container.0 minecraft:copper_ore run item replace entity @s armor.head with minecraft:copper_ore[custom_model_data={"strings":["gm4_smelteries:block/ore_display/copper_ore"]}] +execute if items block ~ ~ ~ container.0 minecraft:deepslate_copper_ore run item replace entity @s armor.head with minecraft:deepslate_copper_ore[custom_model_data={"strings":["gm4_smelteries:block/ore_display/deepslate_copper_ore"]}] +execute if items block ~ ~ ~ container.0 minecraft:raw_copper run item replace entity @s armor.head with minecraft:raw_copper_block[custom_model_data={"strings":["gm4_smelteries:block/ore_display/raw_copper"]}] +execute if items block ~ ~ ~ container.0 minecraft:sand run item replace entity @s armor.head with minecraft:sand[custom_model_data={"strings":["gm4_smelteries:block/ore_display/sand"]}] +execute if items block ~ ~ ~ container.0 minecraft:red_sand run item replace entity @s armor.head with minecraft:red_sand[custom_model_data={"strings":["gm4_smelteries:block/ore_display/red_sand"]}] +execute if items block ~ ~ ~ container.0 minecraft:chorus_fruit run item replace entity @s armor.head with minecraft:chorus_flower[custom_model_data={"strings":["gm4_smelteries:block/ore_display/chorus_fruit"]}] # check if the furnace is close to finish smelting -execute if score $double gm4_smelt_data matches 1.. if score $cook_time gm4_smelt_data matches 184..199 run function gm4_smelteries:smelt/prep_finish_smelt -execute unless score $double gm4_smelt_data matches 1.. run tag @e[type=marker,tag=gm4_smeltery_processing,limit=1,distance=..2] remove gm4_smeltery_smelting +execute if score $cook_time gm4_smelt_data matches 184..199 run function gm4_smelteries:smelt/prep_finish_smelt diff --git a/gm4_smelteries/data/gm4_smelteries/gm4_recipes/smeltery.json b/gm4_smelteries/data/gm4_smelteries/gm4_recipes/smeltery.json deleted file mode 100644 index 0cc8cb67a2..0000000000 --- a/gm4_smelteries/data/gm4_smelteries/gm4_recipes/smeltery.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "CCC", - "CFC", - "IRI" - ], - "key": { - "C": { - "item": "minecraft:cobblestone" - }, - "F": { - "item": "minecraft:furnace" - }, - "I": { - "item": "minecraft:iron_ingot" - }, - "R": { - "item": "minecraft:comparator" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_smelteries:items/smeltery", - "count": 1 - } - } -} diff --git a/gm4_smelteries/data/gm4_smelteries/guidebook/smelteries.json b/gm4_smelteries/data/gm4_smelteries/guidebook/smelteries.json index 216e805cea..126cf4acf4 100644 --- a/gm4_smelteries/data/gm4_smelteries/guidebook/smelteries.json +++ b/gm4_smelteries/data/gm4_smelteries/guidebook/smelteries.json @@ -6,24 +6,6 @@ "id": "minecraft:furnace" }, "criteria": { - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, "obtain_furnace": { "trigger": "minecraft:inventory_changed", "conditions": { @@ -71,11 +53,7 @@ { "name": "description", "enable": [], - "requirements": [ - [ - "open_custom_crafter" - ] - ], + "requirements": [], "pages": [ [ { @@ -92,9 +70,6 @@ "name": "crafting", "enable": [], "requirements": [ - [ - "open_custom_crafter" - ], [ "obtain_furnace" ], @@ -106,7 +81,7 @@ [ { "translate": "text.gm4.guidebook.smelteries.crafting", - "fallback": "A Smeltery can be crafted in a Custom Crafter:" + "fallback": "A Smeltery can be crafted in a crafting table:" }, "\n", { diff --git a/gm4_smelteries/data/gm4_smelteries/loot_table/crafting/smeltery.json b/gm4_smelteries/data/gm4_smelteries/loot_table/crafting/smeltery.json deleted file mode 100644 index 7f544c52ab..0000000000 --- a/gm4_smelteries/data/gm4_smelteries/loot_table/crafting/smeltery.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_smelteries:items/smeltery", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_smelteries/data/gm4_smelteries/loot_table/items/smeltery.json b/gm4_smelteries/data/gm4_smelteries/loot_table/items/smeltery.json index 48ebd3d662..00ac9d23ed 100644 --- a/gm4_smelteries/data/gm4_smelteries/loot_table/items/smeltery.json +++ b/gm4_smelteries/data/gm4_smelteries/loot_table/items/smeltery.json @@ -11,7 +11,7 @@ { "function": "set_components", "components": { - "minecraft:custom_model_data": "item/smeltery", + "minecraft:custom_model_data": {"strings":["gm4_smelteries:item/smeltery"]}, "minecraft:profile": "$smeltery" } }, diff --git a/gm4_smelteries/data/gm4_smelteries/loot_table/technical/smeltable_display.json b/gm4_smelteries/data/gm4_smelteries/loot_table/technical/smeltable_display.json deleted file mode 100644 index 9ffaaddd8f..0000000000 --- a/gm4_smelteries/data/gm4_smelteries/loot_table/technical/smeltable_display.json +++ /dev/null @@ -1,301 +0,0 @@ -{ - "type": "minecraft:fishing", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:gold_ore", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/gold_ore" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:gold_ore" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:nether_gold_ore", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/nether_gold_ore" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:nether_gold_ore" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:deepslate_gold_ore", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/deepslate_gold_ore" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:deepslate_gold_ore" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:raw_gold_block", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/raw_gold" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:raw_gold" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:iron_ore", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/iron_ore" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:iron_ore" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:deepslate_iron_ore", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/deepslate_iron_ore" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:deepslate_iron_ore" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:raw_iron_block", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/raw_iron" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:raw_iron" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:copper_ore", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/copper_ore" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:copper_ore" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:deepslate_copper_ore", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/deepslate_copper_ore" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:deepslate_copper_ore" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:raw_copper_block", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/raw_copper" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:raw_copper" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:sand", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/sand" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:sand" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:red_sand", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/red_sand" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:red_sand" - ] - } - } - ] - }, - { - "type": "minecraft:item", - "name": "minecraft:chorus_flower", - "functions": [ - { - "function": "minecraft:set_components", - "components": { - "minecraft:custom_model_data": "block/ore_display/chorus_fruit" - } - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:chorus_fruit" - ] - } - } - ] - } - ] - } - ] - } - ] -} diff --git a/gm4_smelteries/data/gm4_smelteries/recipe/smeltery.json b/gm4_smelteries/data/gm4_smelteries/recipe/smeltery.json index c9dc6ec599..ef85b22cc8 100644 --- a/gm4_smelteries/data/gm4_smelteries/recipe/smeltery.json +++ b/gm4_smelteries/data/gm4_smelteries/recipe/smeltery.json @@ -15,7 +15,7 @@ "result": { "id": "minecraft:player_head", "components": { - "minecraft:custom_model_data": "item/smeltery", + "minecraft:custom_model_data": {"strings":["gm4_smelteries:item/smeltery"]}, "minecraft:profile": "$smeltery", "minecraft:custom_data": "{gm4_machines:{id:'smeltery'}}", "minecraft:custom_name": {"translate":"block.gm4.smeltery","fallback":"Smeltery","color":"white","italic":false} diff --git a/gm4_smelteries/data/gm4_smelteries/tags/item/can_double.json b/gm4_smelteries/data/gm4_smelteries/tags/item/can_double.json new file mode 100644 index 0000000000..bf6ec6da8c --- /dev/null +++ b/gm4_smelteries/data/gm4_smelteries/tags/item/can_double.json @@ -0,0 +1,17 @@ +{ + "values": [ + "minecraft:gold_ore", + "minecraft:nether_gold_ore", + "minecraft:deepslate_gold_ore", + "minecraft:raw_gold", + "minecraft:iron_ore", + "minecraft:deepslate_iron_ore", + "minecraft:raw_iron", + "minecraft:copper_ore", + "minecraft:deepslate_copper_ore", + "minecraft:raw_copper", + "minecraft:sand", + "minecraft:red_sand", + "minecraft:chorus_fruit" + ] +} diff --git a/gm4_soul_glass/data/gm4/advancement/soul_glass.json b/gm4_soul_glass/data/gm4/advancement/soul_glass.json index cdd019d1d8..dc4ab218ca 100644 --- a/gm4_soul_glass/data/gm4/advancement/soul_glass.json +++ b/gm4_soul_glass/data/gm4/advancement/soul_glass.json @@ -3,7 +3,7 @@ "icon": { "id": "brown_stained_glass", "components": { - "minecraft:custom_model_data": "gui/advancement/soul_glass" + "minecraft:custom_model_data": {"strings":["gm4_soul_glass:gui/advancement/soul_glass"]} } }, "title": { diff --git a/gm4_soul_glass/data/gm4_soul_glass/loot_table/items/soul_glass.json b/gm4_soul_glass/data/gm4_soul_glass/loot_table/items/soul_glass.json index 6f6727f559..b3cb68af67 100644 --- a/gm4_soul_glass/data/gm4_soul_glass/loot_table/items/soul_glass.json +++ b/gm4_soul_glass/data/gm4_soul_glass/loot_table/items/soul_glass.json @@ -11,7 +11,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "item/soul_glass" + "minecraft:custom_model_data": {"strings":["gm4_soul_glass:item/soul_glass"]} } }, { @@ -20,10 +20,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.soul_glass", - "fallback": "Soul Glass", - "italic": false + "fallback": "Soul Glass" } } ] diff --git a/gm4_soul_glass/data/gm4_soul_glass/recipe/soul_glass.json b/gm4_soul_glass/data/gm4_soul_glass/recipe/soul_glass.json index 7f152d11be..c68726d1ba 100644 --- a/gm4_soul_glass/data/gm4_soul_glass/recipe/soul_glass.json +++ b/gm4_soul_glass/data/gm4_soul_glass/recipe/soul_glass.json @@ -4,10 +4,10 @@ "result": { "id": "minecraft:brown_stained_glass", "components": { - "minecraft:custom_model_data": "item/soul_glass", + "minecraft:custom_model_data": {"strings":["gm4_soul_glass:item/soul_glass"]}, "minecraft:custom_data": "{gm4_soul_glass:1b}", "minecraft:enchantment_glint_override": true, - "minecraft:custom_name": {"translate":"item.gm4.soul_glass","fallback":"Soul Glass","italic":false} + "minecraft:item_name": {"translate":"item.gm4.soul_glass","fallback":"Soul Glass"} } }, "experience": 1.0, diff --git a/gm4_spawner_minecarts/data/gm4/advancement/spawner_minecarts.json b/gm4_spawner_minecarts/data/gm4/advancement/spawner_minecarts.json index abb17762d6..8bc3e667f0 100644 --- a/gm4_spawner_minecarts/data/gm4/advancement/spawner_minecarts.json +++ b/gm4_spawner_minecarts/data/gm4/advancement/spawner_minecarts.json @@ -3,7 +3,7 @@ "icon": { "id": "spawner", "components": { - "minecraft:custom_model_data": "gui/advancement/spawner_minecarts" + "minecraft:custom_model_data": {"strings":["gm4_spawner_minecarts:gui/advancement/spawner_minecarts"]} } }, "title": { diff --git a/gm4_standard_crafting/README.md b/gm4_standard_crafting/README.md index b999f0bdb4..51e76c54ef 100644 --- a/gm4_standard_crafting/README.md +++ b/gm4_standard_crafting/README.md @@ -1,10 +1,10 @@ # Standard Crafting -A recipe pack that adds some handy additional recipes to the Gamemode 4 custom crafter. +A recipe pack that adds some handy additional recipes to the crafting table. Player crafting basic recipes in a Custom Crafter ### Features -- Adds a basic set of recipes to the Custom Crafter +- Adds a basic set of recipes to the crafting table A full list of recipes can be read on the [Wiki](https://wiki.gm4.co/Standard_Crafting). diff --git a/gm4_standard_crafting/beet.yaml b/gm4_standard_crafting/beet.yaml index e24d1dc75a..1437ba491e 100644 --- a/gm4_standard_crafting/beet.yaml +++ b/gm4_standard_crafting/beet.yaml @@ -1,33 +1,16 @@ id: gm4_standard_crafting name: Standard Crafting -version: 1.6.X +version: 1.7.X data_pack: load: . - overlays: - - formats: - min_inclusive: 88 - max_inclusive: 88 - min_format: 88 - max_format: 88 - directory: since_88 - - formats: - min_inclusive: 81 - max_inclusive: 88 - min_format: 81 - max_format: 88 - directory: empty pipeline: - generate_recipes - gm4.plugins.extend.module - - gm4.plugins.include.lib_custom_crafters meta: gm4: - versioning: - required: - lib_custom_crafters: 3.4.0 website: description: A crafting recipe pack that adds some nifty new recipes to the game. recommended: [] @@ -41,5 +24,6 @@ meta: - Sparks Updated by: - Bloo + - runcows Icon Design: - Sparks diff --git a/gm4_standard_crafting/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_standard_crafting/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 77187907d3..0000000000 --- a/gm4_standard_crafting/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values":[ - "gm4_standard_crafting:check_recipes" - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/bamboo_block_chest.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/bamboo_block_chest.json new file mode 100644 index 0000000000..bdbd1d05a9 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/bamboo_block_chest.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "gm4_standard_crafting:bamboo_block_chest" + } + }, + "has_materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:bamboo_block", + "minecraft:stripped_bamboo_block" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_materials" + ] + ], + "rewards": { + "recipes": [ + "gm4_standard_crafting:bamboo_block_chest" + ] + } +} diff --git a/lib_custom_crafters/data/gm4/advancement/recipes/custom_crafter.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/bone_block.json similarity index 79% rename from lib_custom_crafters/data/gm4/advancement/recipes/custom_crafter.json rename to gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/bone_block.json index c575aa24cb..51a2778737 100644 --- a/lib_custom_crafters/data/gm4/advancement/recipes/custom_crafter.json +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/bone_block.json @@ -4,7 +4,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "gm4:custom_crafter" + "recipe": "gm4_standard_crafting:bone_block" } }, "has_materials": { @@ -13,7 +13,7 @@ "items": [ { "items": [ - "minecraft:crafting_table" + "minecraft:bone" ] } ] @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "gm4:custom_crafter" + "gm4_standard_crafting:bone_block" ] } } diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/brown_dye.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/brown_dye.json new file mode 100644 index 0000000000..ec5489b3a4 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/brown_dye.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "gm4_standard_crafting:brown_dye" + } + }, + "has_materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:orange_dye", + "minecraft:black_dye" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_materials" + ] + ], + "rewards": { + "recipes": [ + "gm4_standard_crafting:brown_dye" + ] + } +} diff --git a/gm4_heart_canisters/data/gm4_heart_canisters/advancement/recipes/heart_canister_tier_1.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/cherry_leaves.json similarity index 76% rename from gm4_heart_canisters/data/gm4_heart_canisters/advancement/recipes/heart_canister_tier_1.json rename to gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/cherry_leaves.json index ee29f08260..a90de13e5b 100644 --- a/gm4_heart_canisters/data/gm4_heart_canisters/advancement/recipes/heart_canister_tier_1.json +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/cherry_leaves.json @@ -4,7 +4,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "gm4_heart_canisters:heart_canister_tier_1" + "recipe": "gm4_standard_crafting:cherry_leaves" } }, "has_materials": { @@ -13,7 +13,7 @@ "items": [ { "items": [ - "minecraft:nether_star" + "minecraft:pink_petals" ] } ] @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "gm4_heart_canisters:heart_canister_tier_1" + "gm4_standard_crafting:cherry_leaves" ] } } diff --git a/gm4_standard_crafting/since_88/data/gm4_standard_crafting/advancement/recipes/copper_horse_armor.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/copper_chain.json similarity index 82% rename from gm4_standard_crafting/since_88/data/gm4_standard_crafting/advancement/recipes/copper_horse_armor.json rename to gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/copper_chain.json index 7b22ac06eb..b8610cfe9a 100644 --- a/gm4_standard_crafting/since_88/data/gm4_standard_crafting/advancement/recipes/copper_horse_armor.json +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/copper_chain.json @@ -4,7 +4,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "gm4_standard_crafting:copper_horse_armor" + "recipe": "gm4_standard_crafting:copper_chain" } }, "has_materials": { @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "gm4_standard_crafting:copper_horse_armor" + "gm4_standard_crafting:copper_chain" ] } } diff --git a/gm4_mountaineering/data/gm4_mountaineering/advancement/recipes/crampons.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/dispenser.json similarity index 79% rename from gm4_mountaineering/data/gm4_mountaineering/advancement/recipes/crampons.json rename to gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/dispenser.json index 58eded4443..516993e432 100644 --- a/gm4_mountaineering/data/gm4_mountaineering/advancement/recipes/crampons.json +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/dispenser.json @@ -4,7 +4,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "gm4_mountaineering:crampons" + "recipe": "gm4_standard_crafting:dispenser" } }, "has_materials": { @@ -13,7 +13,7 @@ "items": [ { "items": [ - "minecraft:chainmail_boots" + "minecraft:dropper" ] } ] @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "gm4_mountaineering:crampons" + "gm4_standard_crafting:dispenser" ] } } diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/green_dye.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/green_dye.json new file mode 100644 index 0000000000..3ab84c0f7e --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/green_dye.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "gm4_standard_crafting:green_dye" + } + }, + "has_materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:blue_dye", + "minecraft:yellow_dye" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_materials" + ] + ], + "rewards": { + "recipes": [ + "gm4_standard_crafting:green_dye" + ] + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/honeycomb.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/honeycomb.json new file mode 100644 index 0000000000..dc2cacc07d --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/honeycomb.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "gm4_standard_crafting:honeycomb" + } + }, + "has_materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:honeycomb_block" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_materials" + ] + ], + "rewards": { + "recipes": [ + "gm4_standard_crafting:honeycomb" + ] + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/iron_chain.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/iron_chain.json new file mode 100644 index 0000000000..3253b62991 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/iron_chain.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "gm4_standard_crafting:iron_chain" + } + }, + "has_materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_materials" + ] + ], + "rewards": { + "recipes": [ + "gm4_standard_crafting:iron_chain" + ] + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/log_chest.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/log_chest.json new file mode 100644 index 0000000000..9cb15db11f --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/log_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "gm4_standard_crafting:log_chest" + } + }, + "has_materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#minecraft:logs" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_materials" + ] + ], + "rewards": { + "recipes": [ + "gm4_standard_crafting:log_chest" + ] + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand_from_red_dye.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/pink_petals.json similarity index 76% rename from gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand_from_red_dye.json rename to gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/pink_petals.json index 25bef876b8..493cfbb300 100644 --- a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand_from_red_dye.json +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/pink_petals.json @@ -4,7 +4,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "gm4_standard_crafting:red_sand_from_red_dye" + "recipe": "gm4_standard_crafting:pink_petals" } }, "has_materials": { @@ -13,7 +13,7 @@ "items": [ { "items": [ - "minecraft:red_dye" + "minecraft:cherry_leaves" ] } ] @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "gm4_standard_crafting:red_sand_from_red_dye" + "gm4_standard_crafting:pink_petals" ] } } diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/pointed_dripstone.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/pointed_dripstone.json new file mode 100644 index 0000000000..839d8beecf --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/pointed_dripstone.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "gm4_standard_crafting:pointed_dripstone" + } + }, + "has_materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:dripstone_block" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_materials" + ] + ], + "rewards": { + "recipes": [ + "gm4_standard_crafting:pointed_dripstone" + ] + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/quartz.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/quartz.json new file mode 100644 index 0000000000..c1d82e9a11 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/quartz.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "gm4_standard_crafting:quartz" + } + }, + "has_materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:quartz_block" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_materials" + ] + ], + "rewards": { + "recipes": [ + "gm4_standard_crafting:quartz" + ] + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand_conversion.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand_conversion.json new file mode 100644 index 0000000000..6654aa66a8 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand_conversion.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "gm4_standard_crafting:red_sand_conversion" + } + }, + "has_materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_nugget" + ] + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_materials" + ] + ], + "rewards": { + "recipes": [ + "gm4_standard_crafting:red_sand_conversion" + ] + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand_from_sandstone.json similarity index 84% rename from gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand.json rename to gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand_from_sandstone.json index 1c9749ee36..b24f181af4 100644 --- a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand.json +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/red_sand_from_sandstone.json @@ -4,7 +4,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "gm4_standard_crafting:red_sand" + "recipe": "gm4_standard_crafting:red_sand_from_sandstone" } }, "has_materials": { @@ -31,7 +31,7 @@ ], "rewards": { "recipes": [ - "gm4_standard_crafting:red_sand" + "gm4_standard_crafting:red_sand_from_sandstone" ] } } diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/function/check_recipes.mcfunction b/gm4_standard_crafting/data/gm4_standard_crafting/function/check_recipes.mcfunction deleted file mode 100644 index fc895d5bc8..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/function/check_recipes.mcfunction +++ /dev/null @@ -1,50 +0,0 @@ -# @s = custom crafters with valid recipe format inside -# run from #gm4_custom_crafters:check_recipes - -# recipes -# sandstones to sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:chiseled_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:cut_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:smooth_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/sand - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:red_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/red_sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:chiseled_red_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/red_sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:cut_red_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/red_sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:smooth_red_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/red_sand - -# red sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches ..8 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:sand"},{Slot:1b,id:"minecraft:sand"},{Slot:2b,id:"minecraft:sand"},{Slot:3b,id:"minecraft:sand"},{Slot:4b,id:"minecraft:red_dye"},{Slot:5b,id:"minecraft:sand"},{Slot:6b,id:"minecraft:sand"},{Slot:7b,id:"minecraft:sand"},{Slot:8b,id:"minecraft:sand"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/red_sand_dye - -# flint to gravel -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 4 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:flint"},{Slot:1b,id:"minecraft:flint"},{Slot:3b,id:"minecraft:flint"},{Slot:4b,id:"minecraft:flint"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/gravel - -# cobweb -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches ..64 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:string"},{Slot:1b,id:"minecraft:string"},{Slot:2b,id:"minecraft:string"},{Slot:3b,id:"minecraft:string"},{Slot:4b,id:"minecraft:slime_ball"},{Slot:5b,id:"minecraft:string"},{Slot:6b,id:"minecraft:string"},{Slot:7b,id:"minecraft:string"},{Slot:8b,id:"minecraft:string"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/cobweb - -# horse armour -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:2b,id:"minecraft:iron_ingot"},{Slot:3b,id:"minecraft:iron_ingot"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:iron_ingot"},{Slot:6b,id:"minecraft:iron_ingot"},{Slot:8b,id:"minecraft:iron_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/iron_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:iron_ingot"},{Slot:3b,id:"minecraft:iron_ingot"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:iron_ingot"},{Slot:6b,id:"minecraft:iron_ingot"},{Slot:8b,id:"minecraft:iron_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/iron_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:2b,id:"minecraft:gold_ingot"},{Slot:3b,id:"minecraft:gold_ingot"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:gold_ingot"},{Slot:6b,id:"minecraft:gold_ingot"},{Slot:8b,id:"minecraft:gold_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/golden_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:gold_ingot"},{Slot:3b,id:"minecraft:gold_ingot"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:gold_ingot"},{Slot:6b,id:"minecraft:gold_ingot"},{Slot:8b,id:"minecraft:gold_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/golden_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:2b,id:"minecraft:diamond"},{Slot:3b,id:"minecraft:diamond"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:diamond"},{Slot:6b,id:"minecraft:diamond"},{Slot:8b,id:"minecraft:diamond"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/diamond_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:diamond"},{Slot:3b,id:"minecraft:diamond"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:diamond"},{Slot:6b,id:"minecraft:diamond"},{Slot:8b,id:"minecraft:diamond"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/diamond_horse_armor - -# notch apple -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches ..64 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:gold_block"},{Slot:1b,id:"minecraft:gold_block"},{Slot:2b,id:"minecraft:gold_block"},{Slot:3b,id:"minecraft:gold_block"},{Slot:4b,id:"minecraft:apple"},{Slot:5b,id:"minecraft:gold_block"},{Slot:6b,id:"minecraft:gold_block"},{Slot:7b,id:"minecraft:gold_block"},{Slot:8b,id:"minecraft:gold_block"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/enchanted_golden_apple - -# quartz block to nether quartz -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:quartz_block"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/quartz - -# amethyst block to amethyst shards -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:amethyst_block"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/amethyst_shard - -# dripstone block to pointed dripstone -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:dripstone_block"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/pointed_dripstone - -# stairs -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 4 if score $stack_size gm4_crafting matches ..16 run function gm4_standard_crafting:stairs_recipes -# slabs -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 4 if score $stack_size gm4_crafting matches ..32 run function gm4_standard_crafting:slabs_recipes -# string -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..21 run function gm4_standard_crafting:string_recipes diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/function/string_recipes.mcfunction b/gm4_standard_crafting/data/gm4_standard_crafting/function/string_recipes.mcfunction deleted file mode 100644 index 276f33e958..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/function/string_recipes.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:white_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:orange_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:magenta_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:light_blue_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:yellow_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:lime_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:pink_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:gray_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:light_gray_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:cyan_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:purple_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:blue_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:brown_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:green_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:red_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:black_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/string diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/amethyst_shard.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/amethyst_shard.json deleted file mode 100644 index f77c20ae1b..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/amethyst_shard.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "A" - ], - "key": { - "A": { - "item": "minecraft:amethyst_block" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:amethyst_shard", - "count": 4 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/cobweb.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/cobweb.json deleted file mode 100644 index 1b99b01871..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/cobweb.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "SSS", - "SBS", - "SSS" - ], - "key": { - "S": { - "item": "minecraft:string" - }, - "B": { - "item": "minecraft:slime_ball" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:cobweb", - "count": 1 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/diamond_horse_armor.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/diamond_horse_armor.json deleted file mode 100644 index f8f3a2b779..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/diamond_horse_armor.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - " X", - "XLX", - "X X" - ], - "key": { - "X": { - "item": "minecraft:diamond" - }, - "L": { - "item": "minecraft:leather" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:diamond_horse_armor", - "count": 1 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/enchanted_golden_apple.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/enchanted_golden_apple.json deleted file mode 100644 index 562e757a9a..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/enchanted_golden_apple.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "GGG", - "GAG", - "GGG" - ], - "key": { - "G": { - "item": "minecraft:gold_ingot" - }, - "A": { - "item": "minecraft:apple" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:enchanted_golden_apple", - "count": 1 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/golden_horse_armor.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/golden_horse_armor.json deleted file mode 100644 index 88d29411f8..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/golden_horse_armor.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - " X", - "XLX", - "X X" - ], - "key": { - "X": { - "item": "minecraft:gold_ingot" - }, - "L": { - "item": "minecraft:leather" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:golden_horse_armor", - "count": 1 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/gravel.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/gravel.json deleted file mode 100644 index 89c88164f4..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/gravel.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "FF", - "FF" - ], - "key": { - "F": { - "item": "minecraft:flint" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:gravel", - "count": 4 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/iron_horse_armor.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/iron_horse_armor.json deleted file mode 100644 index 204ed622f1..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/iron_horse_armor.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - " X", - "XLX", - "X X" - ], - "key": { - "X": { - "item": "minecraft:iron_ingot" - }, - "L": { - "item": "minecraft:leather" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:iron_horse_armor", - "count": 1 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/pointed_dripstone.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/pointed_dripstone.json deleted file mode 100644 index 5451ec5dc4..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/pointed_dripstone.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "D" - ], - "key": { - "D": { - "item": "minecraft:dripstone_block" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:pointed_dripstone", - "count": 4 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/quartz.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/quartz.json deleted file mode 100644 index 835925190a..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/quartz.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "Q" - ], - "key": { - "Q": { - "item": "minecraft:quartz_block" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:quartz", - "count": 4 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/red_sand.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/red_sand.json deleted file mode 100644 index 1d8675152b..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/red_sand.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "S" - ], - "key": { - "S": [ - { - "item": "minecraft:red_sandstone" - }, - { - "item": "minecraft:red_chiseled_sandstone" - }, - { - "item": "minecraft:red_cut_sandstone" - }, - { - "item": "minecraft:red_smooth_sandstone" - } - ] - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:red_sand", - "count": 4 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/red_sand_dye.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/red_sand_dye.json deleted file mode 100644 index c78b0be9ee..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/red_sand_dye.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "SSS", - "SRS", - "SSS" - ], - "key": { - "S": { - "item": "minecraft:sand" - }, - "R": { - "item": "minecraft:red_dye" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:red_sand", - "count": 8 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/sand.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/sand.json deleted file mode 100644 index f75834973b..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/sand.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "S" - ], - "key": { - "S": [ - { - "item": "minecraft:sandstone" - }, - { - "item": "minecraft:chiseled_sandstone" - }, - { - "item": "minecraft:cut_sandstone" - }, - { - "item": "minecraft:smooth_sandstone" - } - ] - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:sand", - "count": 4 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/string.json b/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/string.json deleted file mode 100644 index a7e133c574..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/gm4_recipes/string.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "W" - ], - "key": { - "W": { - "tag": "minecraft:wool" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:string", - "count": 3 - } - } -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/guidebook/standard_crafting.json b/gm4_standard_crafting/data/gm4_standard_crafting/guidebook/standard_crafting.json index ffd6a5500b..e01fa1203d 100644 --- a/gm4_standard_crafting/data/gm4_standard_crafting/guidebook/standard_crafting.json +++ b/gm4_standard_crafting/data/gm4_standard_crafting/guidebook/standard_crafting.json @@ -1,30 +1,11 @@ { "id": "standard_crafting", "name": "Standard Crafting", - "module_type": "expansion", - "base_module": "custom_crafters", + "module_type": "module", "icon": { "id": "minecraft:crafting_table" }, "criteria": { - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, "obtain_gravel": { "trigger": "minecraft:inventory_changed", "conditions": { @@ -56,7 +37,7 @@ { "items": [ "minecraft:red_sand", - "minecraft:red_dye" + "minecraft:iron_nugget" ] } ] @@ -165,17 +146,146 @@ } ] } + }, + "obtain_honeycomb_block": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:honeycomb_block" + ] + } + ] + } + }, + "obtain_dropper": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:dropper" + ] + } + ] + } + }, + "obtain_bone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:bone" + ] + } + ] + } + }, + "obtain_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#minecraft:logs" + } + ] + } + }, + "obtain_bamboo_block": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:bamboo_block", + "minecraft:stripped_bamboo_block" + ] + } + ] + } + }, + "obtain_cherry_leaves": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:cherry_leaves" + ] + } + ] + } + }, + "obtain_pink_petals": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:pink_petals" + ] + } + ] + } + }, + "obtain_iron_ingot": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + } + }, + "obtain_copper_ingot": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + } + }, + "obtain_brown_dye_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:orange_dye", + "minecraft:black_dye" + ] + } + ] + } + }, + "obtain_green_dye_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:blue_dye", + "minecraft:yellow_dye" + ] + } + ] + } } }, "sections": [ { "name": "default_recipes", "enable": [], - "requirements": [ - [ - "open_custom_crafter" - ] - ], + "requirements": [], "pages": [ [ { @@ -183,7 +293,7 @@ }, { "translate": "text.gm4.guidebook.standard_crafting.recipes", - "fallback": "The custom crafter can be used to perform some simple crafting operations.\n\nThe following recipes have been added." + "fallback": "The following recipes have been added to the crafting table." } ], [ @@ -273,14 +383,14 @@ "\n", { "insert": "recipe", - "recipe": "gm4_standard_crafting:red_sand" + "recipe": "gm4_standard_crafting:red_sand_from_sandstone" } ], [ "\n\n\n", { "insert": "recipe", - "recipe": "gm4_standard_crafting:red_sand_dye" + "recipe": "gm4_standard_crafting:red_sand_conversion" } ] ], @@ -442,6 +552,237 @@ "prerequisites": [ "default_recipes" ] + }, + { + "name": "honeycomb_recipe", + "enable": [], + "requirements": [ + [ + "obtain_honeycomb_block" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:honeycomb" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] + }, + { + "name": "dispenser_recipe", + "enable": [], + "requirements": [ + [ + "obtain_dropper" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:dispenser" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] + }, + { + "name": "bone_block_recipe", + "enable": [], + "requirements": [ + [ + "obtain_bone" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:bone_block" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] + }, + { + "name": "log_chest_recipe", + "enable": [], + "requirements": [ + [ + "obtain_log" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:log_chest" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] + }, + { + "name": "bamboo_block_chest_recipe", + "enable": [], + "requirements": [ + [ + "obtain_bamboo_block" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:bamboo_block_chest" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] + }, + { + "name": "pink_petals_recipe", + "enable": [], + "requirements": [ + [ + "obtain_cherry_leaves" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:pink_petals" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] + }, + { + "name": "cherry_leaves_recipe", + "enable": [], + "requirements": [ + [ + "obtain_pink_petals" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:cherry_leaves" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] + }, + { + "name": "iron_chain_recipe", + "enable": [], + "requirements": [ + [ + "obtain_iron_ingot" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:iron_chain" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] + }, + { + "name": "copper_chain_recipe", + "enable": [], + "requirements": [ + [ + "obtain_copper_ingot" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:copper_chain" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] + }, + { + "name": "brown_dye_recipe", + "enable": [], + "requirements": [ + [ + "obtain_brown_dye_ingredients" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:brown_dye" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] + }, + { + "name": "green_dye_recipe", + "enable": [], + "requirements": [ + [ + "obtain_green_dye_ingredients" + ] + ], + "pages": [ + [ + "\n\n\n", + { + "insert": "recipe", + "recipe": "gm4_standard_crafting:green_dye" + } + ] + ], + "prerequisites": [ + "default_recipes" + ] } ] } diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/amethyst_shard.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/amethyst_shard.json deleted file mode 100644 index bc6fa685ab..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/amethyst_shard.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:amethyst_shard", - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/cobweb.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/cobweb.json deleted file mode 100644 index bcb4ab87ad..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/cobweb.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:cobweb", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/diamond_horse_armor.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/diamond_horse_armor.json deleted file mode 100644 index 3f6b5d2a74..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/diamond_horse_armor.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:diamond_horse_armor", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/enchanted_golden_apple.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/enchanted_golden_apple.json deleted file mode 100644 index ffabcccc44..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/enchanted_golden_apple.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:enchanted_golden_apple", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/golden_horse_armor.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/golden_horse_armor.json deleted file mode 100644 index 49d946baea..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/golden_horse_armor.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:golden_horse_armor", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/gravel.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/gravel.json deleted file mode 100644 index 676ea049a0..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/gravel.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:gravel", - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/iron_horse_armor.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/iron_horse_armor.json deleted file mode 100644 index cc8be9c24b..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/iron_horse_armor.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:iron_horse_armor", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/pointed_dripstone.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/pointed_dripstone.json deleted file mode 100644 index db96f4c065..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/pointed_dripstone.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:pointed_dripstone", - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/quartz.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/quartz.json deleted file mode 100644 index 64b03ffac4..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/quartz.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:quartz", - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/red_sand.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/red_sand.json deleted file mode 100644 index 832d119f69..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/red_sand.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:red_sand", - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/red_sand_dye.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/red_sand_dye.json deleted file mode 100644 index f71123a88c..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/red_sand_dye.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:red_sand", - "functions": [ - { - "function": "minecraft:set_count", - "count": 8 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/sand.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/sand.json deleted file mode 100644 index 54afc363e2..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/sand.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:sand", - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/string.json b/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/string.json deleted file mode 100644 index 6021bf3b39..0000000000 --- a/gm4_standard_crafting/data/gm4_standard_crafting/loot_table/crafting/string.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:string", - "functions": [ - { - "function": "minecraft:set_count", - "count": 3 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/bamboo_block_chest.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/bamboo_block_chest.json new file mode 100644 index 0000000000..2af3fae150 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/bamboo_block_chest.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "chest", + "key": { + "#": [ + "minecraft:bamboo_block", + "minecraft:stripped_bamboo_block" + ] + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "id": "minecraft:chest", + "count": 2 + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/bone_block.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/bone_block.json new file mode 100644 index 0000000000..d9ae926e52 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/bone_block.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "bone_block", + "ingredients": [ + "minecraft:bone", + "minecraft:bone", + "minecraft:bone" + ], + "result": { + "id": "minecraft:bone_block" + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/brown_dye.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/brown_dye.json new file mode 100644 index 0000000000..aecca40d53 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/brown_dye.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "brown_dye", + "ingredients": [ + "minecraft:orange_dye", + "minecraft:black_dye" + ], + "result": { + "id": "minecraft:brown_dye", + "count": 2 + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/cherry_leaves.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/cherry_leaves.json new file mode 100644 index 0000000000..5dd4551220 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/cherry_leaves.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": "minecraft:pink_petals" + }, + "result": { + "id": "minecraft:cherry_leaves", + "count": 1 + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/copper_chain.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/copper_chain.json new file mode 100644 index 0000000000..7b097696e8 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/copper_chain.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "copper_chain", + "key": { + "I": "minecraft:copper_block", + "N": "minecraft:copper_ingot" + }, + "pattern": [ + "N", + "I", + "N" + ], + "result": { + "id": "minecraft:copper_chain", + "count": 9 + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/dispenser.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/dispenser.json new file mode 100644 index 0000000000..622078814e --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/dispenser.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "dispenser", + "key": { + "S": "minecraft:string", + "#": "minecraft:dropper", + "/": "minecraft:stick" + }, + "pattern": [ + " /S", + "/#S", + " /S" + ], + "result": { + "id": "minecraft:dispenser", + "count": 1 + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/green_dye.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/green_dye.json new file mode 100644 index 0000000000..b2d4c3a4f8 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/green_dye.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "minecraft:yellow_dye", + "minecraft:blue_dye" + ], + "result": { + "id": "minecraft:green_dye", + "count": 2 + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/honeycomb.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/honeycomb.json new file mode 100644 index 0000000000..78b04c7929 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/honeycomb.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "minecraft:honeycomb_block" + ], + "result": { + "id": "minecraft:honeycomb", + "count": 4 + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/iron_chain.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/iron_chain.json new file mode 100644 index 0000000000..4c6e349551 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/iron_chain.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "iron_chain", + "key": { + "I": "minecraft:iron_block", + "N": "minecraft:iron_ingot" + }, + "pattern": [ + "N", + "I", + "N" + ], + "result": { + "id": "minecraft:iron_chain", + "count": 9 + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/log_chest.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/log_chest.json new file mode 100644 index 0000000000..f98df1793c --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/log_chest.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "chest", + "key": { + "#": "#minecraft:logs" + }, + "pattern": [ + "###", + "# #", + "###" + ], + "result": { + "id": "minecraft:chest", + "count": 4 + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/pink_petals.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/pink_petals.json new file mode 100644 index 0000000000..bd0ec15ff2 --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/pink_petals.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "minecraft:cherry_leaves" + ], + "result": { + "id": "minecraft:pink_petals", + "count": 4 + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/red_sand_from_red_dye.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/red_sand_conversion.json similarity index 84% rename from gm4_standard_crafting/data/gm4_standard_crafting/recipe/red_sand_from_red_dye.json rename to gm4_standard_crafting/data/gm4_standard_crafting/recipe/red_sand_conversion.json index ff2c78c560..48ef4f6ac7 100644 --- a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/red_sand_from_red_dye.json +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/red_sand_conversion.json @@ -4,12 +4,12 @@ "group": "red_sand", "pattern": [ "SSS", - "SRS", + "SIS", "SSS" ], "key": { "S": "minecraft:sand", - "R": "minecraft:red_dye" + "I": "minecraft:iron_nugget" }, "result": { "id": "minecraft:red_sand", diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/red_sand.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/red_sand_from_sandstone.json similarity index 100% rename from gm4_standard_crafting/data/gm4_standard_crafting/recipe/red_sand.json rename to gm4_standard_crafting/data/gm4_standard_crafting/recipe/red_sand_from_sandstone.json diff --git a/gm4_standard_crafting/generate_recipes.py b/gm4_standard_crafting/generate_recipes.py index 888323fe11..f6587a9bd1 100644 --- a/gm4_standard_crafting/generate_recipes.py +++ b/gm4_standard_crafting/generate_recipes.py @@ -1,23 +1,49 @@ -from beet import Context, Recipe, Advancement, LootTable, Function +from beet import Context, Recipe, Advancement from beet.contrib.vanilla import Vanilla -from gm4_guidebook.generate_guidebooks import CustomCrafterRecipe import logging logger = logging.getLogger(__name__) def beet_default(ctx: Context): - """generates recipes for stair and slab decrafting - NOTE: Function definitions for custom crafters is explicitly set to a 2x2""" + """ + - generates recipes for stair and slab decrafting + - groups recipes that have existing vanilla recipes + """ vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '1.21.5' + vanilla.minecraft_version = '1.21.11' item_tags = vanilla.mount("data/minecraft/tags/item").data.item_tags recipes = vanilla.mount("data/minecraft/recipe").data.recipes - def recursive_apply(items: list[str], dir: str, shape: list[str], output_count: int, function: Function): + def group_recipe(output: str) -> str: + output = output.removeprefix('minecraft:') # remove prefix + output_recipe = recipes.get("minecraft:" + output) + if output_recipe is None: # no recipe + return output + elif "group" in output_recipe.data: # recipe with group + return output_recipe.data["group"] + else: # recipe but no group, add it + group: str = output + output_recipe.data["group"] = group + output_recipe.data["__smithed__"] = { + "rules": [ + { + "type": "replace", + "target": "group", + "source": { + "type": "reference", + "path": "group" + } + } + ] + } + ctx.data["minecraft:" + output] = Recipe(output_recipe.data) + return group + + def recursive_apply(items: list[str], dir: str, shape: list[str], output_count: int): for item in items: if "#" in item: - recursive_apply(item_tags[item.lstrip("#")].data["values"], dir, shape, output_count, function) + recursive_apply(item_tags[item.lstrip("#")].data["values"], dir, shape, output_count) continue # get full block id from the vanilla stair recipe @@ -33,27 +59,7 @@ def recursive_apply(items: list[str], dir: str, shape: list[str], output_count: recipe_path = f"gm4_standard_crafting:{dir}/{item.removeprefix('minecraft:')}" - output_recipe = recipes.get(output) - if output_recipe is None: - group: str = output.removeprefix('minecraft:') - elif "group" in output_recipe.data: - group: str = output_recipe.data["group"] - else: - group: str = output.removeprefix('minecraft:') - output_recipe.data["group"] = group - output_recipe.data["__smithed__"] = { - "rules": [ - { - "type": "replace", - "target": "group", - "source": { - "type": "reference", - "path": "group" - } - } - ] - } - ctx.data[output] = Recipe(output_recipe.data) + group = group_recipe(output) ctx.data[recipe_path] = Recipe({ "type": "minecraft:crafting_shaped", @@ -104,63 +110,12 @@ def recursive_apply(items: list[str], dir: str, shape: list[str], output_count: } }) - ctx.data[recipe_path] = CustomCrafterRecipe({ - "name": f"gm4_standard_crafting:{dir}/{item.removeprefix('minecraft:')}", - "input": { - "type": "shaped", - "recipe": shape, - "key": { - "#": { - "item": item - } - } - }, - "output": { - "result": { - "type": "item", - "name": output, - "count": output_count - } - } - }) - - ctx.data[f"gm4_standard_crafting:crafting/{dir}/{output.removeprefix('minecraft:')}"] = LootTable({ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": output, - "functions": [ - { - "function": "minecraft:set_count", - "count": output_count - } - ] - } - ] - } - ] - }) - - command: str = "execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:\"" + item + "\"},{Slot:1b,id:\"" + item + "\"},{Slot:3b,id:\"" + item + "\"},{Slot:4b,id:\"" + item + "\"}]} run loot replace block ~ ~ ~ container.0 loot " + f"gm4_standard_crafting:crafting/{dir}/{output.removeprefix('minecraft:')}" - function.append(command) - - stairs_recipes = ctx.data[f"gm4_standard_crafting:stairs_recipes"] = Function(["##stairs"]) stairs: list[str] = item_tags["minecraft:stairs"].data['values'] - recursive_apply(stairs, "stairs_decraft", ["##", "##"], 3, stairs_recipes) - - slabs_recipes = ctx.data[f"gm4_standard_crafting:slabs_recipes"] = Function(["##slabs"]) + recursive_apply(stairs, "stairs_decraft", ["##", "##"], 3) slabs: list[str] = item_tags["minecraft:slabs"].data['values'] - recursive_apply(slabs, "slab_decraft", ["##","##"], 2, slabs_recipes) + recursive_apply(slabs, "slab_decraft", ["##","##"], 2) + + for recipe in [ + "dispenser", "bone_block", "chest", "iron_chain", "copper_chain", "brown_dye" + ]: + group_recipe(recipe) diff --git a/gm4_standard_crafting/since_88/data/gm4_standard_crafting/function/check_recipes.mcfunction b/gm4_standard_crafting/since_88/data/gm4_standard_crafting/function/check_recipes.mcfunction deleted file mode 100644 index a2de04c1e9..0000000000 --- a/gm4_standard_crafting/since_88/data/gm4_standard_crafting/function/check_recipes.mcfunction +++ /dev/null @@ -1,52 +0,0 @@ -# @s = custom crafters with valid recipe format inside -# run from #gm4_custom_crafters:check_recipes - -# recipes -# sandstones to sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:chiseled_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:cut_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:smooth_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/sand - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:red_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/red_sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:chiseled_red_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/red_sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:cut_red_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/red_sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:smooth_red_sandstone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/red_sand - -# red sand -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches ..8 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:sand"},{Slot:1b,id:"minecraft:sand"},{Slot:2b,id:"minecraft:sand"},{Slot:3b,id:"minecraft:sand"},{Slot:4b,id:"minecraft:red_dye"},{Slot:5b,id:"minecraft:sand"},{Slot:6b,id:"minecraft:sand"},{Slot:7b,id:"minecraft:sand"},{Slot:8b,id:"minecraft:sand"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/red_sand_dye - -# flint to gravel -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 4 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:flint"},{Slot:1b,id:"minecraft:flint"},{Slot:3b,id:"minecraft:flint"},{Slot:4b,id:"minecraft:flint"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/gravel - -# cobweb -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches ..64 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:string"},{Slot:1b,id:"minecraft:string"},{Slot:2b,id:"minecraft:string"},{Slot:3b,id:"minecraft:string"},{Slot:4b,id:"minecraft:slime_ball"},{Slot:5b,id:"minecraft:string"},{Slot:6b,id:"minecraft:string"},{Slot:7b,id:"minecraft:string"},{Slot:8b,id:"minecraft:string"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/cobweb - -# horse armour -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:2b,id:"minecraft:iron_ingot"},{Slot:3b,id:"minecraft:iron_ingot"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:iron_ingot"},{Slot:6b,id:"minecraft:iron_ingot"},{Slot:8b,id:"minecraft:iron_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/iron_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:iron_ingot"},{Slot:3b,id:"minecraft:iron_ingot"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:iron_ingot"},{Slot:6b,id:"minecraft:iron_ingot"},{Slot:8b,id:"minecraft:iron_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/iron_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:2b,id:"minecraft:gold_ingot"},{Slot:3b,id:"minecraft:gold_ingot"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:gold_ingot"},{Slot:6b,id:"minecraft:gold_ingot"},{Slot:8b,id:"minecraft:gold_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/golden_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:gold_ingot"},{Slot:3b,id:"minecraft:gold_ingot"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:gold_ingot"},{Slot:6b,id:"minecraft:gold_ingot"},{Slot:8b,id:"minecraft:gold_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/golden_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:2b,id:"minecraft:diamond"},{Slot:3b,id:"minecraft:diamond"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:diamond"},{Slot:6b,id:"minecraft:diamond"},{Slot:8b,id:"minecraft:diamond"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/diamond_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:diamond"},{Slot:3b,id:"minecraft:diamond"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:diamond"},{Slot:6b,id:"minecraft:diamond"},{Slot:8b,id:"minecraft:diamond"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/diamond_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:2b,id:"minecraft:copper_ingot"},{Slot:3b,id:"minecraft:copper_ingot"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:copper_ingot"},{Slot:6b,id:"minecraft:copper_ingot"},{Slot:8b,id:"minecraft:copper_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/copper_horse_armor -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 6 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:copper_ingot"},{Slot:3b,id:"minecraft:copper_ingot"},{Slot:4b,id:"minecraft:leather"},{Slot:5b,id:"minecraft:copper_ingot"},{Slot:6b,id:"minecraft:copper_ingot"},{Slot:8b,id:"minecraft:copper_ingot"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/copper_horse_armor - -# notch apple -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches ..64 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:gold_block"},{Slot:1b,id:"minecraft:gold_block"},{Slot:2b,id:"minecraft:gold_block"},{Slot:3b,id:"minecraft:gold_block"},{Slot:4b,id:"minecraft:apple"},{Slot:5b,id:"minecraft:gold_block"},{Slot:6b,id:"minecraft:gold_block"},{Slot:7b,id:"minecraft:gold_block"},{Slot:8b,id:"minecraft:gold_block"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/enchanted_golden_apple - -# quartz block to nether quartz -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:quartz_block"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/quartz - -# amethyst block to amethyst shards -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:amethyst_block"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/amethyst_shard - -# dripstone block to pointed dripstone -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..16 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:dripstone_block"}]} run loot replace block ~ ~ ~ container.0 loot gm4_standard_crafting:crafting/pointed_dripstone - -# stairs -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 4 if score $stack_size gm4_crafting matches ..16 run function gm4_standard_crafting:stairs_recipes -# slabs -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 4 if score $stack_size gm4_crafting matches ..32 run function gm4_standard_crafting:slabs_recipes -# string -execute if score $crafted gm4_crafting matches 0 if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..21 run function gm4_standard_crafting:string_recipes diff --git a/gm4_standard_crafting/since_88/data/gm4_standard_crafting/gm4_recipes/copper_horse_armor.json b/gm4_standard_crafting/since_88/data/gm4_standard_crafting/gm4_recipes/copper_horse_armor.json deleted file mode 100644 index d825a6298f..0000000000 --- a/gm4_standard_crafting/since_88/data/gm4_standard_crafting/gm4_recipes/copper_horse_armor.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - " X", - "XLX", - "X X" - ], - "key": { - "X": { - "item": "minecraft:copper_ingot" - }, - "L": { - "item": "minecraft:leather" - } - } - }, - "output": { - "result": { - "type": "item", - "name": "minecraft:copper_horse_armor", - "count": 1 - } - } -} diff --git a/gm4_standard_crafting/since_88/data/gm4_standard_crafting/loot_table/crafting/copper_horse_armor.json b/gm4_standard_crafting/since_88/data/gm4_standard_crafting/loot_table/crafting/copper_horse_armor.json deleted file mode 100644 index 5e03bd3a9a..0000000000 --- a/gm4_standard_crafting/since_88/data/gm4_standard_crafting/loot_table/crafting/copper_horse_armor.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:copper_horse_armor", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_standard_crafting/since_88/data/gm4_standard_crafting/recipe/copper_horse_armor.json b/gm4_standard_crafting/since_88/data/gm4_standard_crafting/recipe/copper_horse_armor.json deleted file mode 100644 index 4746539cb7..0000000000 --- a/gm4_standard_crafting/since_88/data/gm4_standard_crafting/recipe/copper_horse_armor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "equipment", - "pattern": [ - " I", - "ILI", - "I I" - ], - "key": { - "I": "minecraft:copper_ingot", - "L": "minecraft:leather" - }, - "result": { - "id": "minecraft:copper_horse_armor" - } -} diff --git a/gm4_standard_crafting/translations.csv b/gm4_standard_crafting/translations.csv index da0565b993..3d1d61d086 100644 --- a/gm4_standard_crafting/translations.csv +++ b/gm4_standard_crafting/translations.csv @@ -1,6 +1,7 @@ key,en_us text.gm4.guidebook.module_desc.standard_crafting,A crafting recipe pack that adds some nifty new recipes to the game. -text.gm4.guidebook.standard_crafting.recipes,The custom crafter can be used to perform some simple crafting operations.\n\nThe following recipes have been added. +text.gm4.guidebook.shapeless,Recipe is shapeless +text.gm4.guidebook.standard_crafting.recipes,The following recipes have been added to the crafting table. text.gm4.guidebook.standard_crafting.stair_decraft,Stairs can be reverted to their base block text.gm4.guidebook.standard_crafting.slab_decraft,Slabs can be reverted to their base block text.gm4.guidebook.standard_crafting.sandstone_decraft,Any sandstone can be converted into sand diff --git a/gm4_sunken_treasure/data/gm4/advancement/sunken_treasure.json b/gm4_sunken_treasure/data/gm4/advancement/sunken_treasure.json index 21f2a30063..cc269921ab 100644 --- a/gm4_sunken_treasure/data/gm4/advancement/sunken_treasure.json +++ b/gm4_sunken_treasure/data/gm4/advancement/sunken_treasure.json @@ -3,7 +3,7 @@ "icon": { "id": "glass_bottle", "components": { - "minecraft:custom_model_data": "gui/advancement/sunken_treasure" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:gui/advancement/sunken_treasure"]} } }, "title": { diff --git a/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/audrey_bottle.json b/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/audrey_bottle.json index bb1e5456da..45b82f95ff 100644 --- a/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/audrey_bottle.json +++ b/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/audrey_bottle.json @@ -12,7 +12,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -21,10 +21,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -55,7 +55,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -64,10 +64,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -110,7 +110,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -119,10 +119,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -195,7 +195,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -204,10 +204,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -262,7 +262,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -271,10 +271,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -323,7 +323,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -332,10 +332,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -384,7 +384,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -393,10 +393,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -439,7 +439,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -448,10 +448,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -500,7 +500,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -509,10 +509,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -555,7 +555,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -564,10 +564,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -610,7 +610,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -619,10 +619,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -671,7 +671,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -680,10 +680,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -714,7 +714,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -723,10 +723,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -775,7 +775,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -784,10 +784,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -836,7 +836,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -845,10 +845,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -903,7 +903,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -912,10 +912,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -976,7 +976,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -985,10 +985,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -1031,7 +1031,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -1040,10 +1040,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -1092,7 +1092,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -1101,10 +1101,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { @@ -1159,7 +1159,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/message_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/message_in_a_bottle"]} } }, { @@ -1168,10 +1168,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.message_in_a_bottle", - "fallback": "Message in a Bottle", - "italic": false + "fallback": "Message in a Bottle" } }, { diff --git a/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/gravel.json b/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/gravel.json index c46f747bda..591d84ccd1 100644 --- a/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/gravel.json +++ b/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/gravel.json @@ -82,16 +82,16 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.waders", - "fallback": "Waders", - "italic": false + "fallback": "Waders" } }, { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/waders" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/waders"]} } } ] @@ -204,7 +204,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/shipwreck_supply", + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/shipwreck_supply"]}, "minecraft:container_loot": { "loot_table": "minecraft:chests/shipwreck_supply" } @@ -212,10 +212,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "block.gm4.shipwreck_supply_chest", - "fallback": "Shipwreck Supply Chest", - "italic": false + "fallback": "Shipwreck Supply Chest" } } ] @@ -228,7 +228,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/shipwreck_treasure", + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/shipwreck_treasure"]}, "minecraft:container_loot": { "loot_table": "minecraft:chests/shipwreck_treasure" } @@ -236,10 +236,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "block.gm4.shipwreck_treasure_chest", - "fallback": "Shipwreck Treasure Chest", - "italic": false + "fallback": "Shipwreck Treasure Chest" } } ] @@ -252,7 +252,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/treasure_chest", + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/treasure_chest"]}, "minecraft:container_loot": { "loot_table": "gm4_sunken_treasure:chests/treasure_chest" } @@ -260,10 +260,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "block.gm4.treasure_chest", - "fallback": "Treasure Chest", - "italic": false + "fallback": "Treasure Chest" } } ] diff --git a/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/sand.json b/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/sand.json index 62af67b0f4..08fd2fa2f9 100644 --- a/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/sand.json +++ b/gm4_sunken_treasure/data/gm4_sunken_treasure/loot_table/gameplay/treasure_loot/sand.json @@ -87,16 +87,16 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.waders", - "fallback": "Waders", - "italic": false + "fallback": "Waders" } }, { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/waders" + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/waders"]} } } ] @@ -214,7 +214,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/shipwreck_supply", + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/shipwreck_supply"]}, "minecraft:container_loot": { "loot_table": "minecraft:chests/shipwreck_supply" } @@ -222,10 +222,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "block.gm4.shipwreck_supply_chest", - "fallback": "Shipwreck Supply Chest", - "italic": false + "fallback": "Shipwreck Supply Chest" } } ] @@ -238,7 +238,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/shipwreck_treasure", + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/shipwreck_treasure"]}, "minecraft:container_loot": { "loot_table": "minecraft:chests/shipwreck_treasure" } @@ -246,10 +246,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "block.gm4.shipwreck_treasure_chest", - "fallback": "Shipwreck Treasure Chest", - "italic": false + "fallback": "Shipwreck Treasure Chest" } } ] @@ -262,7 +262,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/treasure_chest", + "minecraft:custom_model_data": {"strings":["gm4_sunken_treasure:item/treasure_chest"]}, "minecraft:container_loot": { "loot_table": "gm4_sunken_treasure:chests/treasure_chest" } @@ -270,10 +270,10 @@ }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "block.gm4.treasure_chest", - "fallback": "Treasure Chest", - "italic": false + "fallback": "Treasure Chest" } } ] diff --git a/gm4_sunken_treasure/mod.mcdoc b/gm4_sunken_treasure/mod.mcdoc new file mode 100644 index 0000000000..266505b9d8 --- /dev/null +++ b/gm4_sunken_treasure/mod.mcdoc @@ -0,0 +1,14 @@ + +dispatch minecraft:storage[gm4_sunken_treasure:temp] to struct { + spawn?: SunkenTreasureSpawn, +} + +dispatch mcdoc:custom_data[gm4_sunken_treasure] to struct { + spawn?: SunkenTreasureSpawn, +} + +struct SunkenTreasureSpawn { + id: #[id="entity_type"] string, +} + +dispatch mcdoc:custom_data[gm4_audrey] to byte diff --git a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/chest/find_durability.mcfunction b/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/chest/find_durability.mcfunction deleted file mode 100644 index 529903fcdd..0000000000 --- a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/chest/find_durability.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# set damage on armor item -# @s = player wearing the item -# at unspecified -# run from player/armor/durability/chest/run - -execute if items block 29999998 1 7134 container.1 leather_chestplate run return 80 -execute if items block 29999998 1 7134 container.1 golden_chestplate run return 112 -execute if items block 29999998 1 7134 container.1 chainmail_chestplate run return 240 -execute if items block 29999998 1 7134 container.1 iron_chestplate run return 240 -execute if items block 29999998 1 7134 container.1 diamond_chestplate run return 528 -execute if items block 29999998 1 7134 container.1 netherite_chestplate run return 592 diff --git a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/feet/find_durability.mcfunction b/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/feet/find_durability.mcfunction deleted file mode 100644 index b3c9d4cb10..0000000000 --- a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/feet/find_durability.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# set damage on armor item -# @s = player wearing the item -# at unspecified -# run from player/armor/durability/feet/run - -execute if items block 29999998 1 7134 container.3 leather_boots run return 65 -execute if items block 29999998 1 7134 container.3 golden_boots run return 91 -execute if items block 29999998 1 7134 container.3 chainmail_boots run return 195 -execute if items block 29999998 1 7134 container.3 iron_boots run return 195 -execute if items block 29999998 1 7134 container.3 diamond_boots run return 429 -execute if items block 29999998 1 7134 container.3 netherite_boots run return 481 diff --git a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/head/find_durability.mcfunction b/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/head/find_durability.mcfunction deleted file mode 100644 index 907834e862..0000000000 --- a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/head/find_durability.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# set damage on armor item -# @s = player wearing the item -# at unspecified -# run from player/armor/durability/head/run - -execute if items block 29999998 1 7134 container.0 leather_helmet run return 55 -execute if items block 29999998 1 7134 container.0 golden_helmet run return 77 -execute if items block 29999998 1 7134 container.0 chainmail_helmet run return 165 -execute if items block 29999998 1 7134 container.0 iron_helmet run return 165 -execute if items block 29999998 1 7134 container.0 diamond_helmet run return 363 -execute if items block 29999998 1 7134 container.0 netherite_helmet run return 407 -execute if items block 29999998 1 7134 container.0 turtle_helmet run return 275 diff --git a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/legs/find_durability.mcfunction b/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/legs/find_durability.mcfunction deleted file mode 100644 index 6ea617a736..0000000000 --- a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/function/player/armor/durability/legs/find_durability.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# set damage on armor item -# @s = player wearing the item -# at unspecified -# run from player/armor/durability/legs/run - -execute if items block 29999998 1 7134 container.2 leather_leggings run return 75 -execute if items block 29999998 1 7134 container.2 golden_leggings run return 105 -execute if items block 29999998 1 7134 container.2 chainmail_leggings run return 225 -execute if items block 29999998 1 7134 container.2 iron_leggings run return 225 -execute if items block 29999998 1 7134 container.2 diamond_leggings run return 495 -execute if items block 29999998 1 7134 container.2 netherite_leggings run return 555 diff --git a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/chest.json b/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/chest.json deleted file mode 100644 index 1cf5959e69..0000000000 --- a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/chest.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "minecraft:diamond_chestplate", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/diamond" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 2 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "golden_chestplate", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/golden" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 1 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "iron_chestplate", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/iron" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 1 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "chainmail_chestplate", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/chainmail" - } - ] - }, - { - "type": "minecraft:item", - "name": "leather_chestplate" - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_chance" - }, - "score": "gm4_sr_data", - "scale": 0.05 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/feet.json b/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/feet.json deleted file mode 100644 index 124f009e71..0000000000 --- a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/feet.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "diamond_boots", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/diamond" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 2 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "golden_boots", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/golden" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 1 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "iron_boots", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/iron" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 1 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "chainmail_boots", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/chainmail" - } - ] - }, - { - "type": "minecraft:item", - "name": "leather_boots" - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_chance" - }, - "score": "gm4_sr_data", - "scale": 0.05 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/head.json b/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/head.json deleted file mode 100644 index 6cb672e21d..0000000000 --- a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/head.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "turtle_helmet", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/turtle_helmet" - } - ] - }, - { - "type": "minecraft:item", - "name": "diamond_helmet", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/diamond" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 2 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "golden_helmet", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/golden" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 1 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "iron_helmet", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/iron" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 1 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "chainmail_helmet", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/chainmail" - } - ] - }, - { - "type": "minecraft:item", - "name": "leather_helmet" - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_chance" - }, - "score": "gm4_sr_data", - "scale": 0.05 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/legs.json b/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/legs.json deleted file mode 100644 index 89ec7e19c4..0000000000 --- a/gm4_survival_refightalized/backport_81/data/gm4_survival_refightalized/loot_table/mob/generic/legs.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "name": "diamond_leggings", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/diamond" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 2 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "golden_leggings", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/golden" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 1 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "iron_leggings", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/iron" - }, - { - "condition": "minecraft:value_check", - "value": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_tier" - }, - "score": "gm4_sr_data" - }, - "range": { - "min": 1 - } - } - ] - }, - { - "type": "minecraft:item", - "name": "chainmail_leggings", - "conditions": [ - { - "condition": "minecraft:reference", - "name": "gm4_survival_refightalized:mob/material_check/chainmail" - } - ] - }, - { - "type": "minecraft:item", - "name": "leather_leggings" - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$armor_chance" - }, - "score": "gm4_sr_data", - "scale": 0.05 - } - } - ] - } - ] - } - ] -} diff --git a/gm4_survival_refightalized/beet.yaml b/gm4_survival_refightalized/beet.yaml index e85b6c9baf..9f5833ad75 100644 --- a/gm4_survival_refightalized/beet.yaml +++ b/gm4_survival_refightalized/beet.yaml @@ -4,17 +4,13 @@ version: 1.1.X data_pack: load: . - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 81 - min_format: 1 - max_format: 81 - directory: backport_81 resource_pack: load: . +require: + - bolt + pipeline: - gm4.plugins.extend.module - gm4.plugins.include.lib_forceload diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/function/init.mcfunction b/gm4_survival_refightalized/data/gm4_survival_refightalized/function/init.mcfunction index 5f2ee0a19f..eb1d6b8124 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/function/init.mcfunction +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/function/init.mcfunction @@ -55,7 +55,7 @@ execute unless score $natural_regen_disabled gm4_sr_data matches 1 run gamerule execute unless score $natural_regen_disabled gm4_sr_data matches 1 run data modify storage gm4:log queue append value {type:"text",message:{"text":"[INFO] Survival Refightalized changed gamerule natural_health_regeneration to false"}} scoreboard players set $natural_regen_disabled gm4_sr_data 1 execute store result score $naturalregeneration gm4_sr_data run gamerule natural_health_regeneration -execute if score $natural_regen gm4_sr_config matches 1 if score $naturalregeneration gm4_sr_data matches 1 run data modify storage gm4:log queue append value {type:"text",message:[{"text":"[WARN]","color":"red"},{"text":" Survival Refightalized requires minecraft:natural_health_regeneration to be false, but it is true. ","color":"white"},{"text":"click here to fix","color":"red","clickEvent":{"action":"suggest_command","value":"/gamerule natural_health_regeneration false"}}]} +execute if score $natural_regen gm4_sr_config matches 1 if score $naturalregeneration gm4_sr_data matches 1 run data modify storage gm4:log queue append value {type:"text",message:[{"text":"[WARN]","color":"red"},{"text":" Survival Refightalized requires minecraft:natural_health_regeneration to be false, but it is true. ","color":"white"},{"text":"click here to fix","color":"red","click_event":{"action":"suggest_command","command":"/gamerule natural_health_regeneration false"}}]} # constants scoreboard players set #-128 gm4_sr_data -128 diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/function/slow_clock.mcfunction b/gm4_survival_refightalized/data/gm4_survival_refightalized/function/slow_clock.mcfunction index 009ab13e56..433cfcae52 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/function/slow_clock.mcfunction +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/function/slow_clock.mcfunction @@ -1,7 +1,8 @@ schedule function gm4_survival_refightalized:slow_clock 30s +# TODO: remove raw and bolt require later # get moon cycle (0 = new moon, 4 = full moon) -execute store result score $moon gm4_sr_data run time query day +raw execute store result score $moon gm4_sr_data run time query day repetition scoreboard players operation $moon gm4_sr_data %= #8 gm4_sr_data scoreboard players set $8 gm4_sr_data 8 execute if score $moon gm4_sr_data matches ..3 store result score $moon gm4_sr_data run scoreboard players operation $8 gm4_sr_data -= $moon gm4_sr_data diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/loot_table/mob/wither_skeleton/arrow.json b/gm4_survival_refightalized/data/gm4_survival_refightalized/loot_table/mob/wither_skeleton/arrow.json index e0beac3385..d89090c46a 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/loot_table/mob/wither_skeleton/arrow.json +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/loot_table/mob/wither_skeleton/arrow.json @@ -27,11 +27,10 @@ }, { "function": "minecraft:set_name", - "target": "custom_name", + "target": "item_name", "name": { "translate": "item.gm4.survival_refightalized.lore.wither_arrow", - "fallback": "Arrow of Wither", - "italic": false + "fallback": "Arrow of Wither" } }, { diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/predicate/technical/night_time.json b/gm4_survival_refightalized/data/gm4_survival_refightalized/predicate/technical/night_time.json index 26225d2480..3a841c7892 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/predicate/technical/night_time.json +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/predicate/technical/night_time.json @@ -1,5 +1,6 @@ { "condition": "minecraft:time_check", + "clock": "minecraft:overworld", "value": { "min": 13188, "max": 23031 diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/entity_type/modify.json b/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/entity_type/modify.json index b160b06140..86cbaf34bd 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/entity_type/modify.json +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/entity_type/modify.json @@ -6,7 +6,7 @@ "minecraft:drowned", "minecraft:enderman", "minecraft:husk", - {"id": "minecraft:parched", "required": false}, + "minecraft:parched", "minecraft:phantom", "minecraft:piglin", "minecraft:piglin_brute", diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/entity_type/skeleton_types.json b/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/entity_type/skeleton_types.json index c6134d6b8e..4be07ecb00 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/entity_type/skeleton_types.json +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/entity_type/skeleton_types.json @@ -1,7 +1,7 @@ { "values": [ "minecraft:bogged", - {"id": "minecraft:parched", "required": false}, + "minecraft:parched", "minecraft:skeleton", "minecraft:stray", "minecraft:wither_skeleton" diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/item/armor.json b/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/item/armor.json index a869d3e2c7..0b6dd8f07a 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/item/armor.json +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/item/armor.json @@ -4,10 +4,10 @@ "chainmail_chestplate", "chainmail_helmet", "chainmail_leggings", - {"id": "copper_boots", "required": false}, - {"id": "copper_chestplate", "required": false}, - {"id": "copper_helmet", "required": false}, - {"id": "copper_leggings", "required": false}, + "copper_boots", + "copper_chestplate", + "copper_helmet", + "copper_leggings", "diamond_boots", "diamond_chestplate", "diamond_helmet", diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/item/weapon.json b/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/item/weapon.json index afc23702e3..7bca10d4ec 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/item/weapon.json +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/tags/item/weapon.json @@ -1,9 +1,9 @@ { "values": [ - {"id": "copper_axe", "required": false}, - {"id": "copper_pickaxe", "required": false}, - {"id": "copper_shovel", "required": false}, - {"id": "copper_sword", "required": false}, + "copper_axe", + "copper_pickaxe", + "copper_shovel", + "copper_sword", "diamond_axe", "diamond_pickaxe", "diamond_shovel", diff --git a/gm4_survival_refightalized/mod.mcdoc b/gm4_survival_refightalized/mod.mcdoc new file mode 100644 index 0000000000..59a175bebb --- /dev/null +++ b/gm4_survival_refightalized/mod.mcdoc @@ -0,0 +1,30 @@ +use ::java::util::slot::SlottedItem +use ::java::util::effect::MobEffectInstance + +dispatch minecraft:storage[gm4_survival_refightalized:temp] to struct { + picked_stat?: struct { + damage_capped?: float, + health?: float, + damage?: float, + speed?: float, + }, + set?: struct { + armor_reduction?: float, + damage?: int, + absorption_reduction?: float, + }, + parry?: struct { + damage?: float, + }, + heal_player?: struct { + remove_health?: float, + }, + reapply_resistance?: struct { + ...MobEffectInstance, + show_icon: (boolean | "true" | "false"), + duration_set: (int | "infinite"), + }, + Items?: [SlottedItem], + Item?: SlottedItem, + active_effects: [MobEffectInstance], +} diff --git a/gm4_sweethearts/assets/translations.csv b/gm4_sweethearts/assets/translations.csv index 297027b3bf..f52993d2e7 100644 --- a/gm4_sweethearts/assets/translations.csv +++ b/gm4_sweethearts/assets/translations.csv @@ -2,4 +2,4 @@ key,en_us advancement.gm4.sweethearts.title,Selfless advancement.gm4.sweethearts.description,Give your last heart to another text.gm4.guidebook.module_desc.sweethearts,Transfer your health to another player using flowers. -text.gm4.guidebook.sweethearts.description,Sneaking while holding a small flower will transfer health to a nearby ally in need.\n\nAll small flowers except wither roses work. +text.gm4.guidebook.sweethearts.description,Sneaking while holding a small flower will transfer health to a nearby ally in need.\n\nAll small flowers work. diff --git a/gm4_sweethearts/data/gm4/advancement/sweethearts.json b/gm4_sweethearts/data/gm4/advancement/sweethearts.json index 86ba660826..662cbd685c 100644 --- a/gm4_sweethearts/data/gm4/advancement/sweethearts.json +++ b/gm4_sweethearts/data/gm4/advancement/sweethearts.json @@ -3,7 +3,7 @@ "icon": { "id": "poppy", "components": { - "minecraft:custom_model_data": "gui/advancement/sweethearts" + "minecraft:custom_model_data": {"strings":["gm4_sweethearts:gui/advancement/sweethearts"]} } }, "title": { diff --git a/gm4_sweethearts/data/gm4_sweethearts/function/check_transfer.mcfunction b/gm4_sweethearts/data/gm4_sweethearts/function/check_transfer.mcfunction deleted file mode 100644 index 0f10cf5b32..0000000000 --- a/gm4_sweethearts/data/gm4_sweethearts/function/check_transfer.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# @s = none -# run from main - -execute as @a[tag=gm4_sh_transfered] run function gm4_sweethearts:revert_health diff --git a/gm4_sweethearts/data/gm4_sweethearts/function/delayed_revert.mcfunction b/gm4_sweethearts/data/gm4_sweethearts/function/delayed_revert.mcfunction new file mode 100644 index 0000000000..814ddcce30 --- /dev/null +++ b/gm4_sweethearts/data/gm4_sweethearts/function/delayed_revert.mcfunction @@ -0,0 +1,5 @@ +# @s = none +# at undefined +# scheduled from transfer_recipient + +execute as @a[tag=gm4_sh_revert_health] run function gm4_sweethearts:revert_health diff --git a/gm4_sweethearts/data/gm4_sweethearts/function/get_health.mcfunction b/gm4_sweethearts/data/gm4_sweethearts/function/get_health.mcfunction index 2ee8ec717b..e365ad155b 100644 --- a/gm4_sweethearts/data/gm4_sweethearts/function/get_health.mcfunction +++ b/gm4_sweethearts/data/gm4_sweethearts/function/get_health.mcfunction @@ -1,4 +1,5 @@ -# @s = players near sneaking player holding flower +# @s = players near sneaking player holding flower (including player holding flower) +# at player holding flower # run from transferring # get max health of player diff --git a/gm4_sweethearts/data/gm4_sweethearts/function/kill_donor.mcfunction b/gm4_sweethearts/data/gm4_sweethearts/function/kill_donor.mcfunction index dc21a8f588..8d21ff1196 100644 --- a/gm4_sweethearts/data/gm4_sweethearts/function/kill_donor.mcfunction +++ b/gm4_sweethearts/data/gm4_sweethearts/function/kill_donor.mcfunction @@ -1,10 +1,6 @@ # @s = sneaking player donating health +# at @s # run from transfer_donor -execute store result score $deathmessage gm4_sh_data run gamerule show_death_messages -gamerule show_death_messages false advancement grant @s only gm4:sweethearts execute if score $deathmessage gm4_sh_data matches 1 run tellraw @a [{"text":"","color":"white"},{"selector":"@s"},{"text":" was shot through the heart and "},{"selector":"@p[tag=gm4_sh_recipient]"},{"text":" was to blame"}] -kill @s -execute if score $deathmessage gm4_sh_data matches 1 run gamerule show_death_messages true -scoreboard players reset $deathmessage gm4_sh_data diff --git a/gm4_sweethearts/data/gm4_sweethearts/function/main.mcfunction b/gm4_sweethearts/data/gm4_sweethearts/function/main.mcfunction index 6874527913..6717341c87 100644 --- a/gm4_sweethearts/data/gm4_sweethearts/function/main.mcfunction +++ b/gm4_sweethearts/data/gm4_sweethearts/function/main.mcfunction @@ -1,4 +1,7 @@ -execute as @a[gamemode=!creative,gamemode=!spectator,predicate=gm4_sweethearts:valid_transfer] at @s run function gm4_sweethearts:transferring +# @s = none +# at undefined +# scheduled from init and self + +execute as @a[gamemode=!creative,gamemode=!spectator,predicate=gm4_sweethearts:valid_donor] at @s run function gm4_sweethearts:transferring -schedule function gm4_sweethearts:check_transfer 1t schedule function gm4_sweethearts:main 16t diff --git a/gm4_sweethearts/data/gm4_sweethearts/function/revert_health.mcfunction b/gm4_sweethearts/data/gm4_sweethearts/function/revert_health.mcfunction index 2df62ff40f..4402ad32fa 100644 --- a/gm4_sweethearts/data/gm4_sweethearts/function/revert_health.mcfunction +++ b/gm4_sweethearts/data/gm4_sweethearts/function/revert_health.mcfunction @@ -1,20 +1,19 @@ -# @s = player that received or donated health -# run from check_transfer +# @s = player that received health, tagged with gm4_sh_revert_health +# at undefined +# run from delayed_revert # revert max health -attribute @s minecraft:max_health modifier remove minecraft:2a0687d4-f85c-4b07-9310-beaa76ef6f7d -attribute @s minecraft:max_health modifier remove minecraft:3749747b-8bab-4f91-a63c-518268ca4856 -attribute @s minecraft:max_health modifier remove minecraft:fc665a2d-71e8-4fe4-8d6d-91283f14e536 -attribute @s minecraft:max_health modifier remove minecraft:9dd58507-2a53-4ab6-8688-b0fa0be102dd -attribute @s minecraft:max_health modifier remove minecraft:226acf45-e0df-4164-92ed-cbf02a65eee2 -attribute @s minecraft:max_health modifier remove minecraft:04f2b196-ca85-4ac8-b8e0-a7d569b415c8 -attribute @s minecraft:max_health modifier remove minecraft:8c5c4e5e-1823-45c0-9e96-5992e75ae463 -attribute @s minecraft:max_health modifier remove minecraft:4cb0a7c9-22f2-4a73-86c6-745d2f59331f -attribute @s minecraft:max_health modifier remove minecraft:e565e188-bfb5-47c4-83bd-7e0babf62ccb -attribute @s minecraft:max_health modifier remove minecraft:52ff177d-8222-4810-924f-f8bd44b43cfd +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_remove_512 +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_remove_256 +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_remove_128 +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_remove_64 +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_remove_32 +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_remove_16 +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_remove_8 +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_remove_4 +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_remove_2 +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_remove_1 -attribute @s minecraft:max_health modifier remove minecraft:381e44f6-ebee-4f7c-9aff-8471a843c4b2 -attribute @s minecraft:max_health modifier remove minecraft:17d25a01-e9ba-4c08-8a79-ee8f72fb033d +attribute @s minecraft:max_health modifier remove gm4_sweethearts:health_add_1 - -tag @s remove gm4_sh_transfered +tag @s remove gm4_sh_revert_health diff --git a/gm4_sweethearts/data/gm4_sweethearts/function/transfer_donor.mcfunction b/gm4_sweethearts/data/gm4_sweethearts/function/transfer_donor.mcfunction index 095a3ce7cb..5f4ce94288 100644 --- a/gm4_sweethearts/data/gm4_sweethearts/function/transfer_donor.mcfunction +++ b/gm4_sweethearts/data/gm4_sweethearts/function/transfer_donor.mcfunction @@ -1,46 +1,20 @@ # @s = sneaking player donating health +# at @s # run from transfer_recipient -# calculate amount of max_health to remove to get to current health -execute store result score $remove_health gm4_sh_data run attribute @s minecraft:max_health get -scoreboard players operation $remove_health gm4_sh_data -= @s gm4_sh_health -scoreboard players operation $donor_init_health gm4_sh_data = $remove_health gm4_sh_data - -# lower player's max health to their current health -execute if score $remove_health gm4_sh_data matches 512.. run attribute @s minecraft:max_health modifier add minecraft:2a0687d4-f85c-4b07-9310-beaa76ef6f7d -512 add_value -execute if score $remove_health gm4_sh_data matches 512.. run scoreboard players remove $remove_health gm4_sh_data 512 -execute if score $remove_health gm4_sh_data matches 256.. run attribute @s minecraft:max_health modifier add minecraft:3749747b-8bab-4f91-a63c-518268ca4856 -256 add_value -execute if score $remove_health gm4_sh_data matches 256.. run scoreboard players remove $remove_health gm4_sh_data 256 -execute if score $remove_health gm4_sh_data matches 128.. run attribute @s minecraft:max_health modifier add minecraft:fc665a2d-71e8-4fe4-8d6d-91283f14e536 -128 add_value -execute if score $remove_health gm4_sh_data matches 128.. run scoreboard players remove $remove_health gm4_sh_data 128 -execute if score $remove_health gm4_sh_data matches 64.. run attribute @s minecraft:max_health modifier add minecraft:9dd58507-2a53-4ab6-8688-b0fa0be102dd -64 add_value -execute if score $remove_health gm4_sh_data matches 64.. run scoreboard players remove $remove_health gm4_sh_data 64 -execute if score $remove_health gm4_sh_data matches 32.. run attribute @s minecraft:max_health modifier add minecraft:226acf45-e0df-4164-92ed-cbf02a65eee2 -32 add_value -execute if score $remove_health gm4_sh_data matches 32.. run scoreboard players remove $remove_health gm4_sh_data 32 -execute if score $remove_health gm4_sh_data matches 16.. run attribute @s minecraft:max_health modifier add minecraft:04f2b196-ca85-4ac8-b8e0-a7d569b415c8 -16 add_value -execute if score $remove_health gm4_sh_data matches 16.. run scoreboard players remove $remove_health gm4_sh_data 16 -execute if score $remove_health gm4_sh_data matches 8.. run attribute @s minecraft:max_health modifier add minecraft:8c5c4e5e-1823-45c0-9e96-5992e75ae463 -8 add_value -execute if score $remove_health gm4_sh_data matches 8.. run scoreboard players remove $remove_health gm4_sh_data 8 -execute if score $remove_health gm4_sh_data matches 4.. run attribute @s minecraft:max_health modifier add minecraft:4cb0a7c9-22f2-4a73-86c6-745d2f59331f -4 add_value -execute if score $remove_health gm4_sh_data matches 4.. run scoreboard players remove $remove_health gm4_sh_data 4 -execute if score $remove_health gm4_sh_data matches 2.. run attribute @s minecraft:max_health modifier add minecraft:e565e188-bfb5-47c4-83bd-7e0babf62ccb -2 add_value -execute if score $remove_health gm4_sh_data matches 2.. run scoreboard players remove $remove_health gm4_sh_data 2 -execute if score $remove_health gm4_sh_data matches 1.. run attribute @s minecraft:max_health modifier add minecraft:52ff177d-8222-4810-924f-f8bd44b43cfd -1 add_value -execute if score $remove_health gm4_sh_data matches 1.. run scoreboard players remove $remove_health gm4_sh_data 1 +# turn off death messages for potential death +execute store result score $deathmessage gm4_sh_data run gamerule show_death_messages +gamerule show_death_messages false # damage player -attribute @s minecraft:max_health modifier add minecraft:381e44f6-ebee-4f7c-9aff-8471a843c4b2 -1 add_value -effect give @s minecraft:instant_health 1 0 true - -# kill if health should be 0 -execute store result score $donor_curr_health gm4_sh_data run attribute @s minecraft:max_health get -scoreboard players operation $donor_lost_health gm4_sh_data = $donor_init_health gm4_sh_data -scoreboard players operation $donor_lost_health gm4_sh_data += $donor_curr_health gm4_sh_data +damage @s 1 magic by @s -execute if score $donor_lost_health gm4_sh_data = @s gm4_sh_data run function gm4_sweethearts:kill_donor +# handle death (@e only selects entities which are alive) +execute at @s unless entity @e[type=player,tag=gm4_sh_donor,distance=0,limit=1] run function gm4_sweethearts:kill_donor -# revert max health -tag @s add gm4_sh_transfered +# re-enable death messages +execute if score $deathmessage gm4_sh_data matches 1 run gamerule show_death_messages true +scoreboard players reset $deathmessage gm4_sh_data # visuals particle damage_indicator ~ ~2 ~ 0 0 0 .255 5 diff --git a/gm4_sweethearts/data/gm4_sweethearts/function/transfer_recipient.mcfunction b/gm4_sweethearts/data/gm4_sweethearts/function/transfer_recipient.mcfunction index 922daff208..b8445a940e 100644 --- a/gm4_sweethearts/data/gm4_sweethearts/function/transfer_recipient.mcfunction +++ b/gm4_sweethearts/data/gm4_sweethearts/function/transfer_recipient.mcfunction @@ -1,7 +1,8 @@ # @s = player near a sneaking player holding flower -# run from sneaking +# at @s +# run from transferring -# tag player +# tag player, for selection in death message of donor tag @s add gm4_sh_recipient # run donor transfer @@ -12,33 +13,34 @@ execute store result score $remove_health gm4_sh_data run attribute @s minecraft scoreboard players operation $remove_health gm4_sh_data -= @s gm4_sh_health # lower player's max health to their current health -execute if score $remove_health gm4_sh_data matches 512.. run attribute @s minecraft:max_health modifier add minecraft:2a0687d4-f85c-4b07-9310-beaa76ef6f7d -512 add_value +execute if score $remove_health gm4_sh_data matches 512.. run attribute @s minecraft:max_health modifier add gm4_sweethearts:health_remove_512 -512 add_value execute if score $remove_health gm4_sh_data matches 512.. run scoreboard players remove $remove_health gm4_sh_data 512 -execute if score $remove_health gm4_sh_data matches 256.. run attribute @s minecraft:max_health modifier add minecraft:3749747b-8bab-4f91-a63c-518268ca4856 -256 add_value +execute if score $remove_health gm4_sh_data matches 256.. run attribute @s minecraft:max_health modifier add gm4_sweethearts:health_remove_256 -256 add_value execute if score $remove_health gm4_sh_data matches 256.. run scoreboard players remove $remove_health gm4_sh_data 256 -execute if score $remove_health gm4_sh_data matches 128.. run attribute @s minecraft:max_health modifier add minecraft:fc665a2d-71e8-4fe4-8d6d-91283f14e536 -128 add_value +execute if score $remove_health gm4_sh_data matches 128.. run attribute @s minecraft:max_health modifier add gm4_sweethearts:health_remove_128 -128 add_value execute if score $remove_health gm4_sh_data matches 128.. run scoreboard players remove $remove_health gm4_sh_data 128 -execute if score $remove_health gm4_sh_data matches 64.. run attribute @s minecraft:max_health modifier add minecraft:9dd58507-2a53-4ab6-8688-b0fa0be102dd -64 add_value +execute if score $remove_health gm4_sh_data matches 64.. run attribute @s minecraft:max_health modifier add gm4_sweethearts:health_remove_64 -64 add_value execute if score $remove_health gm4_sh_data matches 64.. run scoreboard players remove $remove_health gm4_sh_data 64 -execute if score $remove_health gm4_sh_data matches 32.. run attribute @s minecraft:max_health modifier add minecraft:226acf45-e0df-4164-92ed-cbf02a65eee2 -32 add_value +execute if score $remove_health gm4_sh_data matches 32.. run attribute @s minecraft:max_health modifier add gm4_sweethearts:health_remove_32 -32 add_value execute if score $remove_health gm4_sh_data matches 32.. run scoreboard players remove $remove_health gm4_sh_data 32 -execute if score $remove_health gm4_sh_data matches 16.. run attribute @s minecraft:max_health modifier add minecraft:04f2b196-ca85-4ac8-b8e0-a7d569b415c8 -16 add_value +execute if score $remove_health gm4_sh_data matches 16.. run attribute @s minecraft:max_health modifier add gm4_sweethearts:health_remove_16 -16 add_value execute if score $remove_health gm4_sh_data matches 16.. run scoreboard players remove $remove_health gm4_sh_data 16 -execute if score $remove_health gm4_sh_data matches 8.. run attribute @s minecraft:max_health modifier add minecraft:8c5c4e5e-1823-45c0-9e96-5992e75ae463 -8 add_value +execute if score $remove_health gm4_sh_data matches 8.. run attribute @s minecraft:max_health modifier add gm4_sweethearts:health_remove_8 -8 add_value execute if score $remove_health gm4_sh_data matches 8.. run scoreboard players remove $remove_health gm4_sh_data 8 -execute if score $remove_health gm4_sh_data matches 4.. run attribute @s minecraft:max_health modifier add minecraft:4cb0a7c9-22f2-4a73-86c6-745d2f59331f -4 add_value +execute if score $remove_health gm4_sh_data matches 4.. run attribute @s minecraft:max_health modifier add gm4_sweethearts:health_remove_4 -4 add_value execute if score $remove_health gm4_sh_data matches 4.. run scoreboard players remove $remove_health gm4_sh_data 4 -execute if score $remove_health gm4_sh_data matches 2.. run attribute @s minecraft:max_health modifier add minecraft:e565e188-bfb5-47c4-83bd-7e0babf62ccb -2 add_value +execute if score $remove_health gm4_sh_data matches 2.. run attribute @s minecraft:max_health modifier add gm4_sweethearts:health_remove_2 -2 add_value execute if score $remove_health gm4_sh_data matches 2.. run scoreboard players remove $remove_health gm4_sh_data 2 -execute if score $remove_health gm4_sh_data matches 1.. run attribute @s minecraft:max_health modifier add minecraft:52ff177d-8222-4810-924f-f8bd44b43cfd -1 add_value +execute if score $remove_health gm4_sh_data matches 1.. run attribute @s minecraft:max_health modifier add gm4_sweethearts:health_remove_1 -1 add_value execute if score $remove_health gm4_sh_data matches 1.. run scoreboard players remove $remove_health gm4_sh_data 1 # heal player -attribute @s minecraft:max_health modifier add minecraft:17d25a01-e9ba-4c08-8a79-ee8f72fb033d 1 add_value +attribute @s minecraft:max_health modifier add gm4_sweethearts:health_add_1 1 add_value effect give @s minecraft:instant_health 1 0 true # revert max health -tag @s add gm4_sh_transfered +tag @s add gm4_sh_revert_health +schedule function gm4_sweethearts:delayed_revert 1t # visuals particle heart ~ ~2 ~ 0.2 0.2 0.2 1 2 diff --git a/gm4_sweethearts/data/gm4_sweethearts/function/transferring.mcfunction b/gm4_sweethearts/data/gm4_sweethearts/function/transferring.mcfunction index 1f9bd50d1a..e88a6da1b2 100644 --- a/gm4_sweethearts/data/gm4_sweethearts/function/transferring.mcfunction +++ b/gm4_sweethearts/data/gm4_sweethearts/function/transferring.mcfunction @@ -1,4 +1,5 @@ # @s = sneaking player holding flower +# at @s # run from main tag @s add gm4_sh_donor @@ -7,6 +8,6 @@ tag @s add gm4_sh_donor execute as @a[gamemode=!creative,gamemode=!spectator,distance=..3] run function gm4_sweethearts:get_health # transfer health to nearest player -execute as @p[gamemode=!creative,gamemode=!spectator,tag=!gm4_sh_donor,distance=..3,predicate=gm4_sweethearts:not_sneaking] unless score @s gm4_sh_health >= @s gm4_sh_data at @s run function gm4_sweethearts:transfer_recipient +execute as @p[gamemode=!creative,gamemode=!spectator,tag=!gm4_sh_donor,distance=..3,predicate=!gm4_sweethearts:valid_donor] if score @s gm4_sh_health < @s gm4_sh_data at @s run function gm4_sweethearts:transfer_recipient tag @s remove gm4_sh_donor diff --git a/gm4_sweethearts/data/gm4_sweethearts/guidebook/sweethearts.json b/gm4_sweethearts/data/gm4_sweethearts/guidebook/sweethearts.json index 69ee2d7788..7f9e3e53b6 100644 --- a/gm4_sweethearts/data/gm4_sweethearts/guidebook/sweethearts.json +++ b/gm4_sweethearts/data/gm4_sweethearts/guidebook/sweethearts.json @@ -33,7 +33,7 @@ }, { "translate": "text.gm4.guidebook.sweethearts.description", - "fallback": "Sneaking while holding a small flower will transfer health to a nearby ally in need.\n\nAll small flowers except wither roses work." + "fallback": "Sneaking while holding a small flower will transfer health to a nearby ally in need.\n\nAll small flowers work." } ] ] diff --git a/gm4_sweethearts/data/gm4_sweethearts/predicate/not_sneaking.json b/gm4_sweethearts/data/gm4_sweethearts/predicate/not_sneaking.json deleted file mode 100644 index 9d5c91d935..0000000000 --- a/gm4_sweethearts/data/gm4_sweethearts/predicate/not_sneaking.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "flags": { - "is_sneaking": false - } - } -} diff --git a/gm4_sweethearts/data/gm4_sweethearts/predicate/valid_transfer.json b/gm4_sweethearts/data/gm4_sweethearts/predicate/valid_donor.json similarity index 83% rename from gm4_sweethearts/data/gm4_sweethearts/predicate/valid_transfer.json rename to gm4_sweethearts/data/gm4_sweethearts/predicate/valid_donor.json index 66ac07a2b0..ba466b632b 100644 --- a/gm4_sweethearts/data/gm4_sweethearts/predicate/valid_transfer.json +++ b/gm4_sweethearts/data/gm4_sweethearts/predicate/valid_donor.json @@ -5,8 +5,8 @@ "flags": { "is_sneaking": true }, - "equipment": { - "mainhand": { + "slots": { + "weapon.*": { "items": "#minecraft:small_flowers" } } diff --git a/gm4_teleportation_anchors/assets/translations.csv b/gm4_teleportation_anchors/assets/translations.csv index dc5dd26561..3a528396cb 100644 --- a/gm4_teleportation_anchors/assets/translations.csv +++ b/gm4_teleportation_anchors/assets/translations.csv @@ -7,8 +7,8 @@ advancement.gm4.teleportation_anchors_anchor.description,"Make a teleportation a advancement.gm4.teleportation_anchors_jammer.title,"Make Some Noise" advancement.gm4.teleportation_anchors_jammer.description,"Create a device to stop chorus in its tracks" text.gm4.guidebook.module_desc.teleportation_anchors,Suppress and control chorus-based teleportation! -text.gm4.guidebook.teleportation_jammer.description,Teleportation Jammers and Anchors can be used to supress and control chorus-based teleportation.\n\nThey can be crafted in a Custom Crafter. -text.gm4.guidebook.teleportation_anchors.crafting_jammer,A Teleportation Jammer can be crafted in a Custom Crafter: +text.gm4.guidebook.teleportation_jammer.description,Teleportation Jammers and Anchors can be used to supress and control chorus-based teleportation.\n\nThey can be crafted in a crafting table. +text.gm4.guidebook.teleportation_anchors.crafting_jammer,A Teleportation Jammer can be crafted in a crafting table: text.gm4.guidebook.teleportation_anchors.jamming,"A Teleportation Jammer is used to suppress chorus based teleportation.\n\nThis includes endermen, shulkers, chorus fruit, end gateways, and other random teleportation that doesn't require line-of-sight." text.gm4.guidebook.teleportation_anchors.jammer_effects,"When entities are jammed, any act of teleportation will cause them to jump back to their original location.\n\nWhen endermen are jammed, they are also prevented from picking up blocks." text.gm4.guidebook.teleportation_anchors.jammer_power,"In order for a TP Jammer to work, it needs to broadcast a signal through an end rod placed on top of it.\n\nChorus fruit must be placed inside the jammer as fuel. Five fruit is enough for two days." diff --git a/gm4_teleportation_anchors/beet.yaml b/gm4_teleportation_anchors/beet.yaml index 9c607a496b..1bfe67d924 100644 --- a/gm4_teleportation_anchors/beet.yaml +++ b/gm4_teleportation_anchors/beet.yaml @@ -11,13 +11,11 @@ resource_pack: pipeline: - gm4.plugins.extend.module - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters meta: gm4: versioning: required: - lib_custom_crafters: 3.4.0 lib_machines: 1.4.0 schedule_loops: - main @@ -58,7 +56,6 @@ meta: description: Suppress and control chorus-based teleportation! recommended: - gm4_orb_of_ankou - - gm4_relocators - gm4_zauber_cauldrons notes: [] modrinth: diff --git a/gm4_teleportation_anchors/data/gm4/advancement/teleportation_anchors_anchor.json b/gm4_teleportation_anchors/data/gm4/advancement/teleportation_anchors_anchor.json index 27e8e692f9..e2b59d087e 100644 --- a/gm4_teleportation_anchors/data/gm4/advancement/teleportation_anchors_anchor.json +++ b/gm4_teleportation_anchors/data/gm4/advancement/teleportation_anchors_anchor.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:lodestone", "components": { - "minecraft:custom_model_data": "gui/advancement/teleportation_anchor" + "minecraft:custom_model_data": {"strings":["gm4_teleportation_anchors:gui/advancement/teleportation_anchor"]} } }, "title": { diff --git a/gm4_teleportation_anchors/data/gm4/advancement/teleportation_anchors_jammer.json b/gm4_teleportation_anchors/data/gm4/advancement/teleportation_anchors_jammer.json index 3203634a42..a56973b999 100644 --- a/gm4_teleportation_anchors/data/gm4/advancement/teleportation_anchors_jammer.json +++ b/gm4_teleportation_anchors/data/gm4/advancement/teleportation_anchors_jammer.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:end_rod", "components": { - "minecraft:custom_model_data": "gui/advancement/teleportation_jammer" + "minecraft:custom_model_data": {"strings":["gm4_teleportation_anchors:gui/advancement/teleportation_jammer"]} } }, "title": { @@ -16,7 +16,7 @@ "color": "gray" } }, - "parent": "gm4:custom_crafters", + "parent": "gm4:root", "criteria": { "impossible": { "trigger": "minecraft:impossible" diff --git a/gm4_teleportation_anchors/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_teleportation_anchors/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index dc1a286217..0000000000 --- a/gm4_teleportation_anchors/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_teleportation_anchors:check_recipes" - ] -} diff --git a/gm4_teleportation_anchors/data/gm4_relocators/tags/function/pick_up_check.json b/gm4_teleportation_anchors/data/gm4_relocators/tags/function/pick_up_check.json deleted file mode 100644 index 87980a89ab..0000000000 --- a/gm4_teleportation_anchors/data/gm4_relocators/tags/function/pick_up_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_teleportation_anchors:relocate/pick_up_check" - ] -} diff --git a/gm4_teleportation_anchors/data/gm4_relocators/tags/function/place_down_check.json b/gm4_teleportation_anchors/data/gm4_relocators/tags/function/place_down_check.json deleted file mode 100644 index c11c1260bb..0000000000 --- a/gm4_teleportation_anchors/data/gm4_relocators/tags/function/place_down_check.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_teleportation_anchors:relocate/place_down_check" - ] -} diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/blocks/anchor/create.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/blocks/anchor/create.mcfunction deleted file mode 100644 index 3c7a92af31..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/blocks/anchor/create.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @s = custom crafter with teleportation jammer recipe -# run from recipe_check - -setblock ~ ~ ~ lodestone -data merge entity @s {CustomName:"gm4_teleportation_anchor",equipment:{head:{id:"end_portal_frame",count:1,components:{"minecraft:custom_model_data":"block/teleportation_anchor"}}}} -playsound minecraft:block.end_portal.spawn block @a[distance=..8] ~ ~ ~ 0.3 1.8 -tag @s add gm4_teleportation_anchor -tag @s remove gm4_custom_crafter -advancement grant @a[distance=..4,gamemode=!spectator] only gm4:teleportation_anchors_anchor diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/blocks/jammer/active.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/blocks/jammer/active.mcfunction index 93c5fecb42..7be97e3bdd 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/blocks/jammer/active.mcfunction +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/blocks/jammer/active.mcfunction @@ -5,10 +5,10 @@ execute if block ~ ~-1 ~ purpur_pillar[axis=y] run tag @s add gm4_ta_wired # tag nearby entities based on pyramid level -tag @e[team=!gm4_invalid_team,type=!armor_stand,distance=..4,nbt=!{NoAI:1b}] add gm4_ta_new_jammed -execute if predicate gm4_teleportation_anchors:has_pyramid_1 run tag @e[team=!gm4_invalid_team,type=!armor_stand,distance=..16,nbt=!{NoAI:1b}] add gm4_ta_new_jammed -execute if predicate gm4_teleportation_anchors:has_pyramid_2 run tag @e[team=!gm4_invalid_team,type=!armor_stand,distance=..64,nbt=!{NoAI:1b}] add gm4_ta_new_jammed -execute if predicate gm4_teleportation_anchors:has_pyramid_3 run tag @e[team=!gm4_invalid_team,type=!armor_stand,distance=..128,nbt=!{NoAI:1b}] add gm4_ta_new_jammed +tag @e[type=!#gm4:non_living,type=!armor_stand,distance=..4,nbt=!{NoAI:1b}] add gm4_ta_new_jammed +execute if predicate gm4_teleportation_anchors:has_pyramid_1 run tag @e[type=!#gm4:non_living,type=!armor_stand,distance=..16,nbt=!{NoAI:1b}] add gm4_ta_new_jammed +execute if predicate gm4_teleportation_anchors:has_pyramid_2 run tag @e[type=!#gm4:non_living,type=!armor_stand,distance=..64,nbt=!{NoAI:1b}] add gm4_ta_new_jammed +execute if predicate gm4_teleportation_anchors:has_pyramid_3 run tag @e[type=!#gm4:non_living,type=!armor_stand,distance=..128,nbt=!{NoAI:1b}] add gm4_ta_new_jammed # track which jammed affected which entity and set decay score scoreboard players set @e[tag=gm4_ta_new_jammed,distance=..129] gm4_ta_jam_time 3 diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/blocks/jammer/create.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/blocks/jammer/create.mcfunction deleted file mode 100644 index a76b711725..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/blocks/jammer/create.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# @s = custom crafter with teleportation jammer recipe -# run from recipe_check - -data merge storage gm4_custom_crafters:temp/crafter {Items:[],CustomName:{"color":"dark_purple","translate":"block.gm4.teleportation_jammer","fallback":"Teleportation Jammer"}} -data merge entity @s {CustomName:"gm4_teleportation_jammer",equipment:{head:{id:"purpur_pillar",count:1,components:{"minecraft:custom_model_data":"block/teleportation_jammer"}}}} -playsound minecraft:block.chorus_flower.death block @a[distance=..8] ~ ~ ~ 100 1.3 -playsound minecraft:block.beacon.power_select block @a[distance=..8] ~ ~ ~ 0.3 0.3 -tag @s add gm4_teleportation_jammer -tag @s remove gm4_custom_crafter - -# assign id -execute store result score @s gm4_ta_jam_id run data get entity @s UUID[3] - -advancement grant @a[distance=..4,gamemode=!spectator] only gm4:teleportation_anchors_jammer diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/check_recipes.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/check_recipes.mcfunction deleted file mode 100644 index f64e914f3f..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/check_recipes.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 7 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:purpur_block"},{Slot:3b,id:"minecraft:crying_obsidian"},{Slot:4b,id:"minecraft:ender_eye"},{Slot:5b,id:"minecraft:crying_obsidian"},{Slot:6b,id:"minecraft:cobblestone"},{Slot:7b,id:"minecraft:end_crystal"},{Slot:8b,id:"minecraft:cobblestone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_teleportation_anchors:crafting/teleportation_jammer -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 7 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:1b,id:"minecraft:purpur_pillar"},{Slot:3b,id:"minecraft:crying_obsidian"},{Slot:4b,id:"minecraft:ender_eye"},{Slot:5b,id:"minecraft:crying_obsidian"},{Slot:6b,id:"minecraft:cobblestone"},{Slot:7b,id:"minecraft:end_crystal"},{Slot:8b,id:"minecraft:cobblestone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_teleportation_anchors:crafting/teleportation_jammer - -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:end_stone_bricks"},{Slot:1b,id:"minecraft:ender_pearl"},{Slot:2b,id:"minecraft:end_stone_bricks"},{Slot:3b,id:"minecraft:crying_obsidian"},{Slot:4b,id:"minecraft:lodestone"},{Slot:5b,id:"minecraft:crying_obsidian"},{Slot:6b,id:"minecraft:chiseled_stone_bricks"},{Slot:7b,id:"minecraft:chiseled_stone_bricks"},{Slot:8b,id:"minecraft:chiseled_stone_bricks"}]} run loot replace block ~ ~ ~ container.0 loot gm4_teleportation_anchors:crafting/teleportation_anchor diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/machine/create_anchor.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/machine/create_anchor.mcfunction index 6c26d2a0e4..5c353875b0 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/machine/create_anchor.mcfunction +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/machine/create_anchor.mcfunction @@ -7,7 +7,7 @@ setblock ~ ~ ~ lodestone # summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,DisabledSlots:2039552,Tags:["gm4_no_edit","gm4_teleportation_anchor_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_teleportation_anchor_stand",equipment:{head:{id:"end_portal_frame",count:1,components:{"minecraft:custom_model_data":"block/teleportation_anchor"}}},Rotation:[0.0f,0.0f]} +summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,DisabledSlots:2039552,Tags:["gm4_no_edit","gm4_teleportation_anchor_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_teleportation_anchor_stand",equipment:{head:{id:"end_portal_frame",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_teleportation_anchors:block/teleportation_anchor"]}}}},Rotation:[0.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_teleportation_anchor","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_teleportation_anchor",Rotation:[0.0f,0.0f]} # mark block as placed diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/machine/create_jammer.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/machine/create_jammer.mcfunction index 212cc10929..f8a9930047 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/machine/create_jammer.mcfunction +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/machine/create_jammer.mcfunction @@ -7,7 +7,7 @@ setblock ~ ~ ~ dropper[facing=up]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.teleportation_jammer","fallback":"Teleportation Jammer"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.teleportation_jammer","fallback":"Teleportation Jammer","font":"gm4:half_invert"},{"translate":"container.gm4.teleportation_jammer","fallback":"Teleportation Jammer","font":"gm4:offscreen"},{"translate":"gui.gm4.teleportation_jammer","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.teleportation_jammer","fallback":"Teleportation Jammer","font":"gm4:half_invert"},{"translate":"container.gm4.teleportation_jammer","fallback":"Teleportation Jammer","font":"gm4:default","color":"#404040"}]]}} # summon display armor stand and marker entity -summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,DisabledSlots:2039552,Tags:["gm4_no_edit","gm4_teleportation_jammer_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_teleportation_jammer_stand",equipment:{head:{id:"purpur_pillar",count:1,components:{"minecraft:custom_model_data":"block/teleportation_jammer"}}},Rotation:[0.0f,0.0f]} +summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,DisabledSlots:2039552,Tags:["gm4_no_edit","gm4_teleportation_jammer_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_teleportation_jammer_stand",equipment:{head:{id:"purpur_pillar",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_teleportation_anchors:block/teleportation_jammer"]}}}},Rotation:[0.0f,0.0f]} summon marker ~ ~ ~ {Tags:["gm4_teleportation_jammer","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_teleportation_jammer",Rotation:[0.0f,0.0f]} # set id diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/pick_up_check.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/pick_up_check.mcfunction deleted file mode 100644 index e5bf03c0eb..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/pick_up_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from #gm4_relocators:pick_up_check - -execute if score gm4_teleportation_anchors load.status matches 1.. if entity @s[tag=gm4_teleportation_jammer] run function gm4_teleportation_anchors:relocate/set_pick_up_data_jammer diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/place_down_check.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/place_down_check.mcfunction deleted file mode 100644 index 8fa52fa942..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/place_down_check.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks if the block is from this module -# @s = player who placed the block -# located at the center of the block to be placed -# run from #gm4_relocators:place_down_check - -execute if score $placed_block gm4_rl_data matches 0 if score gm4_teleportation_anchors load.status matches 1 if data storage gm4_relocators:temp gm4_relocation{custom_block:"gm4_teleportation_jammer"} run function gm4_teleportation_anchors:relocate/summon_block_markers_jammer diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/set_pick_up_data_anchor.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/set_pick_up_data_anchor.mcfunction deleted file mode 100644 index 6543aa49e7..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/set_pick_up_data_anchor.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# sets the specific relocator data -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from gm4_teleportation_anchors:relocate/pick_up_check - -data modify storage gm4_relocators:temp merge_data set value {custom_block:"gm4_teleportation_anchor",lore:{"translate":"block.gm4.teleportation_anchor","fallback":"Teleportation Anchor","color":"gray","italic":true}} - -execute positioned ~ ~-0.4 ~ run kill @e[type=armor_stand,tag=gm4_teleportation_anchor_stand,limit=1,distance=..0.1] -kill @s -scoreboard players set $found_marker gm4_rl_data 1 diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/set_pick_up_data_jammer.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/set_pick_up_data_jammer.mcfunction deleted file mode 100644 index 8d73afedaf..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/set_pick_up_data_jammer.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# sets the specific relocator data -# @s = "smithed.block" entity inside the block -# located at the center of the block to be picked up -# run from gm4_teleportation_anchors:relocate/pick_up_check - -data modify storage gm4_relocators:temp merge_data set value {custom_block:"gm4_teleportation_jammer",lore:{"translate":"block.gm4.teleportation_jammer","fallback":"Teleportation Jammer","color":"gray","italic":true}} - -execute positioned ~ ~-0.4 ~ run kill @e[type=armor_stand,tag=gm4_teleportation_jammer_stand,limit=1,distance=..0.1] -kill @s -scoreboard players set $found_marker gm4_rl_data 1 diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/summon_block_markers_jammer.mcfunction b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/summon_block_markers_jammer.mcfunction deleted file mode 100644 index b7d039c6c7..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/function/relocate/summon_block_markers_jammer.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# summons the entities for this machine -# @s = player who placed the block -# located at the center of the block to be placed -# run from gm4_teleportation_anchors:relocate/place_down_check - -scoreboard players set $placed_block gm4_rl_data 1 - -# summon entities -summon armor_stand ~ ~-0.4 ~ {Small:1b,NoGravity:1b,Marker:1b,Invulnerable:1b,Invisible:1b,DisabledSlots:2039552,Tags:["gm4_no_edit","gm4_teleportation_jammer_stand","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],HasVisualFire:1b,CustomName:"gm4_teleportation_jammer_stand",equipment:{head:{id:"purpur_pillar",count:1,components:{"minecraft:custom_model_data":"block/teleportation_jammer"}}},Rotation:[0.0f,0.0f]} -summon marker ~ ~ ~ {Tags:["gm4_teleportation_jammer","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_teleportation_jammer",Rotation:[0.0f,0.0f]} - -# set id -execute store result score @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.01] gm4_ta_jam_id run data get entity @e[type=marker,tag=gm4_new_machine,limit=1,distance=..0.01] UUID[3] - -# set entity version -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 1 -tag @e[distance=..2] remove gm4_new_machine diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/gm4_recipes/teleportation_anchor.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/gm4_recipes/teleportation_anchor.json deleted file mode 100644 index 524ad85631..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/gm4_recipes/teleportation_anchor.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "BEB", - "OLO", - "SSS" - ], - "key": { - "B": { - "item": "minecraft:end_stone_bricks" - }, - "E": { - "item": "minecraft:ender_pearl" - }, - "O": { - "item": "minecraft:crying_obsidian" - }, - "L": { - "item": "minecraft:lodestone" - }, - "S": { - "item": "minecraft:chiseled_stone_bricks" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_teleportation_anchors:items/teleportation_anchor", - "count": 1 - } - } -} diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/gm4_recipes/teleportation_jammer.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/gm4_recipes/teleportation_jammer.json deleted file mode 100644 index 00d62cbcc5..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/gm4_recipes/teleportation_jammer.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - " P ", - "OEO", - "CNC" - ], - "key": { - "P": { - "item": "minecraft:purpur_block" - }, - "O": { - "item": "minecraft:crying_obsidian" - }, - "E": { - "item": "minecraft:ender_eye" - }, - "C": { - "item": "minecraft:cobblestone" - }, - "N": { - "item": "minecraft:end_crystal" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_teleportation_anchors:items/teleportation_jammer", - "count": 1 - } - } -} diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/guidebook/teleportation_anchors.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/guidebook/teleportation_anchors.json index 72a8fe7e84..136d7a1c2f 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/guidebook/teleportation_anchors.json +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/guidebook/teleportation_anchors.json @@ -6,24 +6,6 @@ "id": "minecraft:furnace" }, "criteria": { - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - }, "obtain_chorus": { "trigger": "minecraft:inventory_changed", "conditions": { @@ -91,11 +73,7 @@ { "name": "description", "enable": [], - "requirements": [ - [ - "open_custom_crafter" - ] - ], + "requirements": [], "pages": [ [ { @@ -103,7 +81,7 @@ }, { "translate": "text.gm4.guidebook.teleportation_jammer.description", - "fallback": "Teleportation Jammers and Anchors can be used to supress and control chorus-based teleportation.\n\nThey can be crafted in a Custom Crafter." + "fallback": "Teleportation Jammers and Anchors can be used to supress and control chorus-based teleportation.\n\nThey can be crafted in a crafting table." } ] ] @@ -112,9 +90,6 @@ "name": "crafting_jammer", "enable": [], "requirements": [ - [ - "open_custom_crafter" - ], [ "obtain_chorus" ] @@ -123,7 +98,7 @@ [ { "translate": "text.gm4.guidebook.teleportation_anchors.crafting_jammer", - "fallback": "A Teleportation Jammer can be crafted in a Custom Crafter:" + "fallback": "A Teleportation Jammer can be crafted in a crafting table:" }, "\n", { diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/crafting/teleportation_anchor.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/crafting/teleportation_anchor.json deleted file mode 100644 index 084650ef70..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/crafting/teleportation_anchor.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_teleportation_anchors:items/teleportation_anchor", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/crafting/teleportation_jammer.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/crafting/teleportation_jammer.json deleted file mode 100644 index 32cce78629..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/crafting/teleportation_jammer.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_teleportation_anchors:items/teleportation_jammer", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/items/teleportation_anchor.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/items/teleportation_anchor.json index f7fcf72f65..f26b1e4dba 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/items/teleportation_anchor.json +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/items/teleportation_anchor.json @@ -11,7 +11,7 @@ { "function": "set_components", "components": { - "minecraft:custom_model_data": "item/teleportation_anchor", + "minecraft:custom_model_data": {"strings":["gm4_teleportation_anchors:item/teleportation_anchor"]}, "minecraft:profile": "$teleportation_anchor" } }, diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/items/teleportation_jammer.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/items/teleportation_jammer.json index db5b3641ee..d77f5a6db3 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/items/teleportation_jammer.json +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/loot_table/items/teleportation_jammer.json @@ -11,7 +11,7 @@ { "function": "set_components", "components": { - "minecraft:custom_model_data": "item/teleportation_jammer", + "minecraft:custom_model_data": {"strings":["gm4_teleportation_anchors:item/teleportation_jammer"]}, "minecraft:profile": "$teleportation_jammer" } }, diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/predicate/in_vehicle.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/predicate/in_vehicle.json index a974b9dfd1..f6494ce953 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/predicate/in_vehicle.json +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/predicate/in_vehicle.json @@ -1,23 +1,7 @@ { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "vehicle": { - "type": "minecraft:minecart" - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "vehicle": { - "type": "#gm4:boats" - } - } - } - ] + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "vehicle": {} + } } diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/recipe/teleportation_anchor.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/recipe/teleportation_anchor.json index 4cc04f51dd..8616f89027 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/recipe/teleportation_anchor.json +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/recipe/teleportation_anchor.json @@ -16,7 +16,7 @@ "result": { "id": "minecraft:player_head", "components": { - "minecraft:custom_model_data": "item/teleportation_anchor", + "minecraft:custom_model_data": {"strings":["gm4_teleportation_anchors:item/teleportation_anchor"]}, "minecraft:profile": "$teleportation_anchor", "minecraft:custom_data": "{gm4_machines:{id:'teleportation_anchor'}}", "minecraft:custom_name": {"translate":"block.gm4.teleportation_anchor","fallback":"Teleportation Anchor","color":"white","italic":false} diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/recipe/teleportation_jammer.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/recipe/teleportation_jammer.json index 90852fa794..90b70c8065 100644 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/recipe/teleportation_jammer.json +++ b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/recipe/teleportation_jammer.json @@ -19,7 +19,7 @@ "result": { "id": "minecraft:player_head", "components": { - "minecraft:custom_model_data": "item/teleportation_jammer", + "minecraft:custom_model_data": {"strings":["gm4_teleportation_anchors:item/teleportation_jammer"]}, "minecraft:profile": "$teleportation_jammer", "minecraft:custom_data": "{gm4_machines:{id:'teleportation_jammer'}}", "minecraft:custom_name": {"translate":"block.gm4.teleportation_jammer","fallback":"Teleportation Jammer","color":"white","italic":false} diff --git a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/tags/entity_type/vehicles.json b/gm4_teleportation_anchors/data/gm4_teleportation_anchors/tags/entity_type/vehicles.json deleted file mode 100644 index 0490af48ef..0000000000 --- a/gm4_teleportation_anchors/data/gm4_teleportation_anchors/tags/entity_type/vehicles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "minecraft:minecart", - "#gm4:boats" - ] -} diff --git a/gm4_teleportation_anchors/mod.mcdoc b/gm4_teleportation_anchors/mod.mcdoc new file mode 100644 index 0000000000..f85ad91a54 --- /dev/null +++ b/gm4_teleportation_anchors/mod.mcdoc @@ -0,0 +1,5 @@ +use ::java::util::slot::SlottedItem + +dispatch minecraft:storage[gm4_teleportation_anchors:data] to struct { + Items?: [SlottedItem] +} diff --git a/gm4_teleportation_anchors/pack.png b/gm4_teleportation_anchors/pack.png index a6d4975dbe..89f88c1547 100644 Binary files a/gm4_teleportation_anchors/pack.png and b/gm4_teleportation_anchors/pack.png differ diff --git a/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_bow.json b/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_bow.json index 7f3878abad..9d4b7ce624 100644 --- a/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_bow.json +++ b/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_bow.json @@ -14,15 +14,15 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/pirate_bow" + "minecraft:custom_model_data": {"strings":["gm4_tower_structures:item/pirate_bow"]} } }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.tower_structures.pirate_bow", - "fallback": "Pirate Bow", - "italic": false + "fallback": "Pirate Bow" } } ] diff --git a/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_hat.json b/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_hat.json index 007ca164f8..418115824c 100644 --- a/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_hat.json +++ b/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_hat.json @@ -20,15 +20,15 @@ "minecraft:dyed_color" ] }, - "minecraft:custom_model_data": "item/pirate_hat" + "minecraft:custom_model_data": {"strings":["gm4_tower_structures:item/pirate_hat"]} } }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.tower_structures.pirate_hat", - "fallback": "Pirate Hat", - "italic": false + "fallback": "Pirate Hat" } } ] diff --git a/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_sword.json b/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_sword.json index 4089449cb3..f6b8fdd7e9 100644 --- a/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_sword.json +++ b/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_sword.json @@ -14,15 +14,15 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/pirate_sword" + "minecraft:custom_model_data": {"strings":["gm4_tower_structures:item/pirate_sword"]} } }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.tower_structures.pirate_sword", - "fallback": "Pirate Sword", - "italic": false + "fallback": "Pirate Sword" } } ] diff --git a/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_turtle_helmet.json b/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_turtle_helmet.json index 39bf7d245f..80bf9f47e2 100644 --- a/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_turtle_helmet.json +++ b/gm4_tower_structures/data/gm4_tower_structures/loot_table/items/pirate_turtle_helmet.json @@ -14,15 +14,15 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/pirate_turtle_helmet" + "minecraft:custom_model_data": {"strings":["gm4_tower_structures:item/pirate_turtle_helmet"]} } }, { "function": "minecraft:set_name", + "target": "item_name", "name": { "translate": "item.gm4.tower_structures.pirate_turtle_helmet", - "fallback": "Pirate Turtle Helmet", - "italic": false + "fallback": "Pirate Turtle Helmet" } } ] diff --git a/gm4_tunnel_bores/assets/translations.csv b/gm4_tunnel_bores/assets/translations.csv index 876eae2ff0..75bf3c4dc2 100644 --- a/gm4_tunnel_bores/assets/translations.csv +++ b/gm4_tunnel_bores/assets/translations.csv @@ -3,9 +3,8 @@ item.gm4.minecart.bore,Minecart with Piston advancement.gm4.tunnel_bores.title,"Isn't It ""Groundbreaking""?" advancement.gm4.tunnel_bores.description,Obtain a Minecart with Piston text.gm4.guidebook.module_desc.tunnel_bores,"Ever wondered how mineshafts came to be? This is it! Tunnel Bores allow you to easily dig 3\u2a093 tunnels, and even lay rails behind themselves." -text.gm4.guidebook.tunnel_bores.description,"Tunnel Bores can be crafted to aid in excavation. Piston Minecarts will break blocks and place rails, moving forward.\n\nThey can be crafted in a Custom Crafter." +text.gm4.guidebook.tunnel_bores.description,"Tunnel Bores can be crafted to aid in excavation. Piston Minecarts will break blocks and place rails, moving forward.\n\nThey can be crafted in a crafting table." text.gm4.guidebook.tunnel_bores.crafting,Tunnel bores can be crafted as follows: -text.gm4.guidebook.shapeless,Recipe is shapeless text.gm4.guidebook.tunnel_bores.start_up,"Piston Minecarts are upgraded furnace minecarts and require coal as fuel. To start the bore, use a piece of coal on the bore.\n\nPiston Minecarts will mine piston-movable blocks in a 3x3 area centered at the block above it." text.gm4.guidebook.tunnel_bores.supply,These tunnel bores can place rails on solid blocks in front of it.\n\nChest Minecarts can be attached to supply the Piston Minecart with rails and coal. text.gm4.guidebook.tunnel_bores.mining,"Tunnel bores will continuously mine blocks when it hits a breakable block, but will always try to mine and refuel when on a powered activator rail.\n\nThis makes it possible to keep a stationary bore." diff --git a/gm4_tunnel_bores/beet.yaml b/gm4_tunnel_bores/beet.yaml index 137f240a26..23f8da2510 100644 --- a/gm4_tunnel_bores/beet.yaml +++ b/gm4_tunnel_bores/beet.yaml @@ -11,13 +11,11 @@ resource_pack: pipeline: - gm4.plugins.extend.module - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_custom_crafters meta: gm4: versioning: required: - lib_custom_crafters: 3.4.0 lib_machines: 1.4.0 schedule_loops: [pulse_check] model_data: diff --git a/gm4_tunnel_bores/data/gm4/advancement/tunnel_bores.json b/gm4_tunnel_bores/data/gm4/advancement/tunnel_bores.json index 105eadc1cf..a7d6d7e235 100644 --- a/gm4_tunnel_bores/data/gm4/advancement/tunnel_bores.json +++ b/gm4_tunnel_bores/data/gm4/advancement/tunnel_bores.json @@ -3,7 +3,7 @@ "icon": { "id": "piston", "components": { - "minecraft:custom_model_data": "gui/advancement/tunnel_bores" + "minecraft:custom_model_data": {"strings":["gm4_tunnel_bores:gui/advancement/tunnel_bores"]} } }, "title": { @@ -16,7 +16,7 @@ "color": "gray" } }, - "parent": "gm4:custom_crafters", + "parent": "gm4:root", "criteria": { "obtain_tunnel_bore": { "trigger": "minecraft:inventory_changed", diff --git a/gm4_tunnel_bores/data/gm4_custom_crafters/tags/function/check_recipes.json b/gm4_tunnel_bores/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index c4d689ca8d..0000000000 --- a/gm4_tunnel_bores/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_tunnel_bores:check_recipes" - ] -} diff --git a/gm4_tunnel_bores/data/gm4_tunnel_bores/function/check_recipes.mcfunction b/gm4_tunnel_bores/data/gm4_tunnel_bores/function/check_recipes.mcfunction deleted file mode 100644 index 89a70ec581..0000000000 --- a/gm4_tunnel_bores/data/gm4_tunnel_bores/function/check_recipes.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# check for recipes in custom crafter - -# minecart and furnace -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 4 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:furnace"},{id:"minecraft:tripwire_hook"},{id:"minecraft:minecart"},{id:"minecraft:piston"}]} run loot replace block ~ ~ ~ container.0 loot gm4_tunnel_bores:crafting/piston_minecart - -# furnace minecart -execute if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 3 if score $stack_size gm4_crafting matches ..1 if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:tripwire_hook"},{id:"minecraft:furnace_minecart"},{id:"minecraft:piston"}]} run loot replace block ~ ~ ~ container.0 loot gm4_tunnel_bores:crafting/piston_minecart diff --git a/gm4_tunnel_bores/data/gm4_tunnel_bores/gm4_recipes/tunnel_bore.json b/gm4_tunnel_bores/data/gm4_tunnel_bores/gm4_recipes/tunnel_bore.json deleted file mode 100644 index 58dc35f6da..0000000000 --- a/gm4_tunnel_bores/data/gm4_tunnel_bores/gm4_recipes/tunnel_bore.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "input": { - "type": "shapeless", - "ingredients": [ - { - "item": "minecraft:furnace" - }, - { - "item": "minecraft:tripwire_hook" - }, - { - "item": "minecraft:minecart" - }, - { - "item": "minecraft:piston" - } - ] - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_tunnel_bores:items/piston_minecart", - "count": 1 - } - } -} diff --git a/gm4_tunnel_bores/data/gm4_tunnel_bores/gm4_recipes/tunnel_bore_from_furnace_minecart.json b/gm4_tunnel_bores/data/gm4_tunnel_bores/gm4_recipes/tunnel_bore_from_furnace_minecart.json deleted file mode 100644 index 805edf501a..0000000000 --- a/gm4_tunnel_bores/data/gm4_tunnel_bores/gm4_recipes/tunnel_bore_from_furnace_minecart.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "input": { - "type": "shapeless", - "ingredients": [ - { - "item": "minecraft:furnace_minecart" - }, - { - "item": "minecraft:tripwire_hook" - }, - { - "item": "minecraft:piston" - } - ] - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_tunnel_bores:items/piston_minecart", - "count": 1 - } - } -} diff --git a/gm4_tunnel_bores/data/gm4_tunnel_bores/guidebook/tunnel_bores.json b/gm4_tunnel_bores/data/gm4_tunnel_bores/guidebook/tunnel_bores.json index 98c3a360a7..d148d1b56d 100644 --- a/gm4_tunnel_bores/data/gm4_tunnel_bores/guidebook/tunnel_bores.json +++ b/gm4_tunnel_bores/data/gm4_tunnel_bores/guidebook/tunnel_bores.json @@ -58,7 +58,7 @@ }, { "translate": "text.gm4.guidebook.tunnel_bores.description", - "fallback": "Tunnel Bores can be crafted to aid in excavation. Piston Minecarts will break blocks and place rails, moving forward.\n\nThey can be crafted in a Custom Crafter." + "fallback": "Tunnel Bores can be crafted to aid in excavation. Piston Minecarts will break blocks and place rails, moving forward.\n\nThey can be crafted in a crafting table." } ] ] @@ -83,14 +83,14 @@ "\n", { "insert": "recipe", - "recipe": "gm4_tunnel_bores:tunnel_bore" + "recipe": "gm4_tunnel_bores:piston_minecart" } ], [ "\n\n", { "insert": "recipe", - "recipe": "gm4_tunnel_bores:tunnel_bore_from_furnace_minecart" + "recipe": "gm4_tunnel_bores:piston_minecart_from_furnace_minecart" } ] ] diff --git a/gm4_tunnel_bores/data/gm4_tunnel_bores/loot_table/crafting/piston_minecart.json b/gm4_tunnel_bores/data/gm4_tunnel_bores/loot_table/crafting/piston_minecart.json deleted file mode 100644 index 11a0b75cf7..0000000000 --- a/gm4_tunnel_bores/data/gm4_tunnel_bores/loot_table/crafting/piston_minecart.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_tunnel_bores:items/piston_minecart", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/gm4_tunnel_bores/data/gm4_tunnel_bores/loot_table/items/piston_minecart.json b/gm4_tunnel_bores/data/gm4_tunnel_bores/loot_table/items/piston_minecart.json index 2fc685b43e..a9f8afd735 100644 --- a/gm4_tunnel_bores/data/gm4_tunnel_bores/loot_table/items/piston_minecart.json +++ b/gm4_tunnel_bores/data/gm4_tunnel_bores/loot_table/items/piston_minecart.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "item/piston_minecart" + "minecraft:custom_model_data": {"strings":["gm4_tunnel_bores:item/piston_minecart"]} } }, { diff --git a/gm4_tunnel_bores/data/gm4_tunnel_bores/recipe/piston_minecart.json b/gm4_tunnel_bores/data/gm4_tunnel_bores/recipe/piston_minecart.json index 31cfbdb764..2f40065bfe 100644 --- a/gm4_tunnel_bores/data/gm4_tunnel_bores/recipe/piston_minecart.json +++ b/gm4_tunnel_bores/data/gm4_tunnel_bores/recipe/piston_minecart.json @@ -15,7 +15,7 @@ "result": { "id": "minecraft:furnace_minecart", "components": { - "minecraft:custom_model_data": "item/piston_minecart", + "minecraft:custom_model_data": {"strings":["gm4_tunnel_bores:item/piston_minecart"]}, "minecraft:custom_data": "{gm4_machines:{id:'tunnel_bore'}}", "minecraft:custom_name": {"translate":"item.gm4.minecart.bore","fallback":"Minecart with Piston","color":"white","italic":false} } diff --git a/gm4_tunnel_bores/data/gm4_tunnel_bores/recipe/piston_minecart_from_furnace_minecart.json b/gm4_tunnel_bores/data/gm4_tunnel_bores/recipe/piston_minecart_from_furnace_minecart.json index 41962ea8df..e8550548fe 100644 --- a/gm4_tunnel_bores/data/gm4_tunnel_bores/recipe/piston_minecart_from_furnace_minecart.json +++ b/gm4_tunnel_bores/data/gm4_tunnel_bores/recipe/piston_minecart_from_furnace_minecart.json @@ -13,7 +13,7 @@ "result": { "id": "minecraft:furnace_minecart", "components": { - "minecraft:custom_model_data": "item/piston_minecart", + "minecraft:custom_model_data": {"strings":["gm4_tunnel_bores:item/piston_minecart"]}, "minecraft:custom_data": "{gm4_machines:{id:'tunnel_bore'}}", "minecraft:custom_name": {"translate":"item.gm4.minecart.bore","fallback":"Minecart with Piston","color":"white","italic":false} } diff --git a/gm4_tunnel_bores/data/gm4_tunnel_bores/tags/block/not_rail_solid.json b/gm4_tunnel_bores/data/gm4_tunnel_bores/tags/block/not_rail_solid.json index 2aedc7ab23..38144a9677 100644 --- a/gm4_tunnel_bores/data/gm4_tunnel_bores/tags/block/not_rail_solid.json +++ b/gm4_tunnel_bores/data/gm4_tunnel_bores/tags/block/not_rail_solid.json @@ -1,6 +1,7 @@ { "values": [ "#minecraft:air", + "#minecraft:chains", "#gm4_tunnel_bores:liquids", "#minecraft:small_flowers", "minecraft:brown_mushroom", @@ -143,8 +144,6 @@ "minecraft:crimson_roots", "minecraft:warped_roots", "minecraft:nether_sprouts", - { "id": "#minecraft:chains", "required": false }, - { "id": "minecraft:chain", "required": false }, "minecraft:warped_fence", "minecraft:crimson_fence_gate", "minecraft:sweet_berry_bush", diff --git a/gm4_tunnel_bores/data/gm4_tunnel_bores/tags/block/rail_replacable.json b/gm4_tunnel_bores/data/gm4_tunnel_bores/tags/block/rail_replacable.json index 8a0d05db5b..669da8e042 100644 --- a/gm4_tunnel_bores/data/gm4_tunnel_bores/tags/block/rail_replacable.json +++ b/gm4_tunnel_bores/data/gm4_tunnel_bores/tags/block/rail_replacable.json @@ -1,7 +1,6 @@ { "values": [ - "#minecraft:air", - "#gm4:foliage", - "#gm4:water" + "#gm4:replaceable", + "#gm4:foliage" ] } diff --git a/gm4_tunnel_bores/mod.mcdoc b/gm4_tunnel_bores/mod.mcdoc new file mode 100644 index 0000000000..5137fd0fe7 --- /dev/null +++ b/gm4_tunnel_bores/mod.mcdoc @@ -0,0 +1,5 @@ +use ::java::util::slot::SlottedItem + +dispatch minecraft:storage[gm4_tunnel_bores:bore_container] to struct { + Items?: [SlottedItem], +} diff --git a/gm4_undead_players/data/gm4/advancement/undead_players.json b/gm4_undead_players/data/gm4/advancement/undead_players.json index 0d7436b325..cf28755bfc 100644 --- a/gm4_undead_players/data/gm4/advancement/undead_players.json +++ b/gm4_undead_players/data/gm4/advancement/undead_players.json @@ -3,7 +3,7 @@ "icon": { "id": "zombie_head", "components": { - "minecraft:custom_model_data": "gui/advancement/undead_players" + "minecraft:custom_model_data": {"strings":["gm4_undead_players:gui/advancement/undead_players"]} } }, "title": { diff --git a/gm4_undead_players/mod.mcdoc b/gm4_undead_players/mod.mcdoc new file mode 100644 index 0000000000..d1b53cc32d --- /dev/null +++ b/gm4_undead_players/mod.mcdoc @@ -0,0 +1,9 @@ +use ::java::world::entity::mob::zombie::Zombie +use ::java::util::text::Text + +dispatch minecraft:storage[gm4_undead_players:temp] to struct { + zombie_data?: Zombie, + name_attribute?: struct { + Name: string, + }, +} diff --git a/gm4_vecto_shamir/data/gm4_vecto_shamir/loot_table/band.json b/gm4_vecto_shamir/data/gm4_vecto_shamir/loot_table/band.json index 732fd1e358..4fcab1b2ee 100644 --- a/gm4_vecto_shamir/data/gm4_vecto_shamir/loot_table/band.json +++ b/gm4_vecto_shamir/data/gm4_vecto_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/vecto" + "minecraft:custom_model_data": {"strings":["gm4_vecto_shamir:shamir/vecto"]} } }, { diff --git a/gm4_vecto_shamir/data/gm4_vecto_shamir/tags/entity_type/vehicle.json b/gm4_vecto_shamir/data/gm4_vecto_shamir/tags/entity_type/vehicle.json index 20be6d59a5..f0dd7da6f1 100644 --- a/gm4_vecto_shamir/data/gm4_vecto_shamir/tags/entity_type/vehicle.json +++ b/gm4_vecto_shamir/data/gm4_vecto_shamir/tags/entity_type/vehicle.json @@ -1,6 +1,6 @@ { "values": [ - "#gm4:boats", + "#minecraft:boat", "minecraft:minecart" ] } diff --git a/gm4_vertical_rails/data/gm4/advancement/vertical_rails.json b/gm4_vertical_rails/data/gm4/advancement/vertical_rails.json index 4ce9abdd55..1ad6b0d998 100644 --- a/gm4_vertical_rails/data/gm4/advancement/vertical_rails.json +++ b/gm4_vertical_rails/data/gm4/advancement/vertical_rails.json @@ -3,7 +3,7 @@ "icon": { "id": "ladder", "components": { - "minecraft:custom_model_data": "gui/advancement/vertical_rails" + "minecraft:custom_model_data": {"strings":["gm4_vertical_rails:gui/advancement/vertical_rails"]} } }, "title": { diff --git a/gm4_vigere_shamir/data/gm4_vigere_shamir/loot_table/band.json b/gm4_vigere_shamir/data/gm4_vigere_shamir/loot_table/band.json index f310322bc2..7a7936df1b 100644 --- a/gm4_vigere_shamir/data/gm4_vigere_shamir/loot_table/band.json +++ b/gm4_vigere_shamir/data/gm4_vigere_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/vigere" + "minecraft:custom_model_data": {"strings":["gm4_vigere_shamir:shamir/vigere"]} } }, { diff --git a/gm4_washing_tanks/backport_71/data/gm4_washing_tanks/function/wash.mcfunction b/gm4_washing_tanks/backport_71/data/gm4_washing_tanks/function/wash.mcfunction deleted file mode 100644 index f5980c97e0..0000000000 --- a/gm4_washing_tanks/backport_71/data/gm4_washing_tanks/function/wash.mcfunction +++ /dev/null @@ -1,30 +0,0 @@ -#@s = water tank liquid_tank_stand with item in first slot -#run from item_fill - -conversions = { - "glass": "glass", - "glass_pane": "glass_pane", - "terracotta": "terracotta", - "wool": "white_wool", - "bed": "white_bed", - "carpet": "white_carpet", - "shulker_box": "shulker_box", - # "harness": "white_harness" # Added in 1.21.6, - "bundle": "bundle", - "candle": "candle" -} - -for from_id, to_id in conversions.items(): - execute if items block ~ ~ ~ container.0 f"#gm4_washing_tanks:{from_id}" run function f"gm4_washing_tanks:washing_recipes/{from_id}": - scoreboard players set $item_value gm4_lt_value -1 - item replace entity 00344d47-0004-0004-0004-000f04ce104d weapon.mainhand from block ~ ~ ~ container.0 - item modify entity 00344d47-0004-0004-0004-000f04ce104d weapon.mainhand {"function":"minecraft:set_item", "item":f"minecraft:{to_id}"} - function gm4_liquid_tanks:smart_item_fill - tag @s add gm4_lt_fill - -execute if items block ~ ~ ~ container.0 #gm4_washing_tanks:armour[dyed_color] run function gm4_washing_tanks:washing_recipes/armour: - scoreboard players set $item_value gm4_lt_value -1 - item replace entity 00344d47-0004-0004-0004-000f04ce104d weapon.mainhand from block ~ ~ ~ container.0 - item modify entity 00344d47-0004-0004-0004-000f04ce104d weapon.mainhand {"function":"minecraft:set_components", "components":{"!minecraft:dyed_color":{}}} - function gm4_liquid_tanks:smart_item_fill - tag @s add gm4_lt_fill diff --git a/gm4_washing_tanks/backport_71/data/gm4_washing_tanks/function/washing_recipes/harness.mcfunction b/gm4_washing_tanks/backport_71/data/gm4_washing_tanks/function/washing_recipes/harness.mcfunction deleted file mode 100644 index 47401df8b2..0000000000 --- a/gm4_washing_tanks/backport_71/data/gm4_washing_tanks/function/washing_recipes/harness.mcfunction +++ /dev/null @@ -1 +0,0 @@ -# empty function - overrides future 1.21.6+ function supporting the harness item, which fails to load in 1.21.5 diff --git a/gm4_washing_tanks/beet.yaml b/gm4_washing_tanks/beet.yaml index b1fbc76723..d78c0df6c7 100644 --- a/gm4_washing_tanks/beet.yaml +++ b/gm4_washing_tanks/beet.yaml @@ -4,13 +4,6 @@ version: 1.5.X data_pack: load: . - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 71 - min_format: 1 - max_format: 71 - directory: backport_71 require: - bolt diff --git a/gm4_washing_tanks/data/gm4_washing_tanks/tags/item/harness.json b/gm4_washing_tanks/data/gm4_washing_tanks/tags/item/harness.json index 450e9d2e37..6060a61233 100644 --- a/gm4_washing_tanks/data/gm4_washing_tanks/tags/item/harness.json +++ b/gm4_washing_tanks/data/gm4_washing_tanks/tags/item/harness.json @@ -1,19 +1,19 @@ { "values": [ - { "id": "minecraft:orange_harness", "required": false }, - { "id": "minecraft:magenta_harness", "required": false }, - { "id": "minecraft:light_blue_harness", "required": false }, - { "id": "minecraft:yellow_harness", "required": false }, - { "id": "minecraft:lime_harness", "required": false }, - { "id": "minecraft:pink_harness", "required": false }, - { "id": "minecraft:gray_harness", "required": false }, - { "id": "minecraft:light_gray_harness", "required": false }, - { "id": "minecraft:cyan_harness", "required": false }, - { "id": "minecraft:purple_harness", "required": false }, - { "id": "minecraft:blue_harness", "required": false }, - { "id": "minecraft:brown_harness", "required": false }, - { "id": "minecraft:green_harness", "required": false }, - { "id": "minecraft:red_harness", "required": false }, - { "id": "minecraft:black_harness", "required": false } + "minecraft:orange_harness", + "minecraft:magenta_harness", + "minecraft:light_blue_harness", + "minecraft:yellow_harness", + "minecraft:lime_harness", + "minecraft:pink_harness", + "minecraft:gray_harness", + "minecraft:light_gray_harness", + "minecraft:cyan_harness", + "minecraft:purple_harness", + "minecraft:blue_harness", + "minecraft:brown_harness", + "minecraft:green_harness", + "minecraft:red_harness", + "minecraft:black_harness" ] } diff --git a/gm4_weighted_armour/data/gm4_helious_shamir/loot_table/band.json b/gm4_weighted_armour/data/gm4_helious_shamir/loot_table/band.json index 44139c383e..913c70dbe1 100644 --- a/gm4_weighted_armour/data/gm4_helious_shamir/loot_table/band.json +++ b/gm4_weighted_armour/data/gm4_helious_shamir/loot_table/band.json @@ -10,7 +10,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:custom_model_data": "shamir/helious" + "minecraft:custom_model_data": {"strings":["gm4_weighted_armour:shamir/helious"]} } }, { diff --git a/gm4_xp_storage/README.md b/gm4_xp_storage/README.md deleted file mode 100644 index ce3fe5a7eb..0000000000 --- a/gm4_xp_storage/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# XP Storage - -Stand on top of an Ender Chest to store Experience, stand below to retrieve it! - -A player depositing and extracting XP in an Enderchest - -### Features -- Turns any Ender Chest into an XP Bank -- Each players XP bank is separate, like a normal Ender Chest, and works across dimensions -- There is no practical limit to the max XP stored! diff --git a/gm4_xp_storage/assets/translations.csv b/gm4_xp_storage/assets/translations.csv deleted file mode 100644 index 6fd46e1391..0000000000 --- a/gm4_xp_storage/assets/translations.csv +++ /dev/null @@ -1,6 +0,0 @@ -key,en_us -text.gm4.xp_storage.stored_experience,Stored Experience: -text.gm4.xp_storage.stored_experience.points,%s Points -text.gm4.guidebook.module_desc.xp_storage,"Stand on top of an Ender Chest to store Experience, stand below to retrieve it!" -text.gm4.guidebook.xp_storage.description,"In addition to items, ender chests can hold experience levels.\n\nStanding on an ender chest deposits XP, while standing below withdraws it." -text.gm4.guidebook.xp_storage.no_mending,Experience orbs stored in ender chests cannot be transfered to tools with mending; it is a direct transfer. diff --git a/gm4_xp_storage/beet.yaml b/gm4_xp_storage/beet.yaml deleted file mode 100644 index cd4d5e499b..0000000000 --- a/gm4_xp_storage/beet.yaml +++ /dev/null @@ -1,33 +0,0 @@ -id: gm4_xp_storage -name: XP Storage -version: 1.7.X - -data_pack: - load: . - -pipeline: - - gm4.plugins.extend.module - -meta: - gm4: - versioning: - schedule_loops: - - main - - tick - website: - description: Stand on top of an Ender Chest to store Experience, stand below to retrieve it! - recommended: [] - notes: [] - modrinth: - project_id: jIY8HJPO - video: https://www.youtube.com/watch?v=hgq-5waSpVU - wiki: https://wiki.gm4.co/wiki/XP_Storage - credits: - Creator: - - Sparks - Updated by: - - Bloo - - Sparks - - SpecialBuilder32 - Icon Design: - - Sparks diff --git a/gm4_xp_storage/data/gm4_xp_storage/advancement/join.json b/gm4_xp_storage/data/gm4_xp_storage/advancement/join.json deleted file mode 100644 index 54b4678199..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/advancement/join.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "criteria": { - "join": { - "trigger": "minecraft:location" - } - }, - "rewards": { - "function": "gm4_xp_storage:init_xp" - } -} diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/deposit_mode_check.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/deposit_mode_check.mcfunction deleted file mode 100644 index 16086591eb..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/deposit_mode_check.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# Check if player dumps 1 or all levels -# @s = players on top of ender chest -# at @s -# run from main - -scoreboard players set $played_sound gm4_xp_data 0 - -# players who were not sneaking on an ender-chest last pulse and are now sneaking run dump-all -execute if entity @s[predicate=gm4_xp_storage:sneaking] run scoreboard players set xp_dump_all_counter gm4_xp_calc 1 -execute if entity @s[predicate=gm4_xp_storage:sneaking,level=1..] run function gm4_xp_storage:dump_all - -# players who are not sneaking deposit a single level -execute if entity @s[predicate=!gm4_xp_storage:sneaking,level=1..] run function gm4_xp_storage:dump_level diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/dump_all.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/dump_all.mcfunction deleted file mode 100644 index 84288ecd7f..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/dump_all.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# Deposit all levels -# @s = sneaking players on top of ender chest -# at @s -# run from deposit_mode_check and dump_all - -function gm4_xp_storage:dump_level - -# infinite recursion fail-safe -scoreboard players add xp_dump_all_counter gm4_xp_calc 1 - -# loop function until levels is 1 -execute if score xp_dump_all_counter gm4_xp_calc matches 1..50 unless entity @s[level=0] run function gm4_xp_storage:dump_all diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/dump_level.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/dump_level.mcfunction deleted file mode 100644 index 9c810eebea..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/dump_level.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# Deposit 1 level -# @s = players on top of ender chest -# at @s -# run from deposit_mode_check and dump_all - -execute store result score @s gm4_xp_calc run xp query @s points -execute unless entity @s[level=0] run scoreboard players add @s gm4_xp_calc 1 -scoreboard players set loop_counter gm4_xp_calc 0 -execute if score @s gm4_xp_calc matches 1.. run function gm4_xp_storage:xp_deposit_loop -scoreboard players reset loop_counter gm4_xp_calc - -title @s actionbar [{"translate":"text.gm4.xp_storage.stored_experience","fallback":"Stored Experience: ","color":"green"},{"translate":"text.gm4.xp_storage.stored_experience.points","fallback":"%s Points","with":[{"score":{"name":"@s","objective":"gm4_stored_xp"}}],"color":"dark_green"}] -execute if score $played_sound gm4_xp_data matches 0 run playsound minecraft:entity.experience_orb.pickup block @s -scoreboard players set $played_sound gm4_xp_data 1 diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/init.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/init.mcfunction deleted file mode 100644 index be88e3f9a0..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/init.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -scoreboard objectives add gm4_stored_xp dummy -scoreboard objectives add gm4_xp_calc dummy -scoreboard objectives add gm4_xp_data dummy - -execute unless score xp_storage gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"XP Storage"} -execute unless score xp_storage gm4_earliest_version < xp_storage gm4_modules run scoreboard players operation xp_storage gm4_earliest_version = xp_storage gm4_modules -scoreboard players set xp_storage gm4_modules 1 - -schedule function gm4_xp_storage:main 1t -schedule function gm4_xp_storage:tick 1t - - - -#$moduleUpdateList diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/init_xp.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/init_xp.mcfunction deleted file mode 100644 index 6e33d5706c..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/init_xp.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# Set initial stored xp -# @s = new player -# at @s -# run from advancement join - -execute unless score @s gm4_stored_xp matches 1.. run scoreboard players set @s gm4_stored_xp 0 diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/main.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/main.mcfunction deleted file mode 100644 index af4d7b170a..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/main.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -schedule function gm4_xp_storage:main 16t - -execute as @a[gamemode=!spectator] at @s if block ~ ~-0.1 ~ ender_chest run function gm4_xp_storage:deposit_mode_check -execute as @a[gamemode=!spectator] at @s anchored eyes run function gm4_xp_storage:point_report_ray diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/point_report.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/point_report.mcfunction deleted file mode 100644 index 5dd8cf509c..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/point_report.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# Show stored experience in actionbar -# @s = players looking at ender chest -# at @s -# run from point_report_ray - -title @s actionbar [{"translate":"text.gm4.xp_storage.stored_experience","fallback":"Stored Experience: ","color":"green"},{"translate":"text.gm4.xp_storage.stored_experience.points","fallback":"%s Points","with":[{"score":{"name":"@s","objective":"gm4_stored_xp"}}],"color":"dark_green"}] - -tag @s add gm4_xp_storage_found_echest diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/point_report_ray.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/point_report_ray.mcfunction deleted file mode 100644 index 916eac0da1..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/point_report_ray.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# Find player looking at ender chest -# @s = all players -# at @s -# run from main - -execute positioned ^ ^ ^.5 if block ~ ~ ~ ender_chest run function gm4_xp_storage:point_report -execute positioned ^ ^ ^1.5 if block ~ ~ ~ ender_chest run function gm4_xp_storage:point_report -execute positioned ^ ^ ^2.5 if block ~ ~ ~ ender_chest run function gm4_xp_storage:point_report -execute positioned ^ ^ ^3.5 if block ~ ~ ~ ender_chest run function gm4_xp_storage:point_report - -tag @s remove gm4_xp_storage_found_echest diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/tick.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/tick.mcfunction deleted file mode 100644 index 25b10243be..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/tick.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -execute as @a[gamemode=!spectator] at @s if block ~ ~2 ~ ender_chest run function gm4_xp_storage:withdraw - -schedule function gm4_xp_storage:tick 1t diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/withdraw.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/withdraw.mcfunction deleted file mode 100644 index 7a90237cff..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/withdraw.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# Withdraw xp -# @s = players directly below ender chest -# at @s -# run from tick - -title @s actionbar [{"translate":"text.gm4.xp_storage.stored_experience","fallback":"Stored Experience: ","color":"green"},{"translate":"text.gm4.xp_storage.stored_experience.points","fallback":"%s Points","with":[{"score":{"name":"@s","objective":"gm4_stored_xp"}}],"color":"dark_green"}] -execute if score @s gm4_stored_xp matches 5.. run experience add @s 5 points -execute if score @s gm4_stored_xp matches 5.. run scoreboard players remove @s gm4_stored_xp 5 -execute if score @s gm4_stored_xp matches 1..4 run experience add @s 1 points -execute if score @s gm4_stored_xp matches 1..4 run scoreboard players remove @s gm4_stored_xp 1 - -# play xp effect -execute if score @s gm4_stored_xp matches 1.. run summon experience_orb ~ ~1.8 ~ {Age:5995,Value:0} diff --git a/gm4_xp_storage/data/gm4_xp_storage/function/xp_deposit_loop.mcfunction b/gm4_xp_storage/data/gm4_xp_storage/function/xp_deposit_loop.mcfunction deleted file mode 100644 index 78d671772a..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/function/xp_deposit_loop.mcfunction +++ /dev/null @@ -1,43 +0,0 @@ -# Calculate deposited xp -# @s = players on top of ender chest -# at @s -# run from dump_level and xp_deposit_loop - -# deposit 64 points if possible -execute if score @s gm4_xp_calc matches 64.. run experience add @s -64 points -execute if score @s gm4_xp_calc matches 64.. run scoreboard players add @s gm4_stored_xp 64 -execute if score @s gm4_xp_calc matches 64.. run scoreboard players remove @s gm4_xp_calc 64 - -# deposit 32 points if possible -execute if score @s gm4_xp_calc matches 32.. run experience add @s -32 points -execute if score @s gm4_xp_calc matches 32.. run scoreboard players add @s gm4_stored_xp 32 -execute if score @s gm4_xp_calc matches 32.. run scoreboard players remove @s gm4_xp_calc 32 - -# deposit 16 points if possible -execute if score @s gm4_xp_calc matches 16.. run experience add @s -16 points -execute if score @s gm4_xp_calc matches 16.. run scoreboard players add @s gm4_stored_xp 16 -execute if score @s gm4_xp_calc matches 16.. run scoreboard players remove @s gm4_xp_calc 16 - -# deposit 8 points if possible -execute if score @s gm4_xp_calc matches 8.. run experience add @s -8 points -execute if score @s gm4_xp_calc matches 8.. run scoreboard players add @s gm4_stored_xp 8 -execute if score @s gm4_xp_calc matches 8.. run scoreboard players remove @s gm4_xp_calc 8 - -# deposit 4 points if possible -execute if score @s gm4_xp_calc matches 4.. run experience add @s -4 points -execute if score @s gm4_xp_calc matches 4.. run scoreboard players add @s gm4_stored_xp 4 -execute if score @s gm4_xp_calc matches 4.. run scoreboard players remove @s gm4_xp_calc 4 - -# deposit 2 points if possible -execute if score @s gm4_xp_calc matches 2.. run experience add @s -2 points -execute if score @s gm4_xp_calc matches 2.. run scoreboard players add @s gm4_stored_xp 2 -execute if score @s gm4_xp_calc matches 2.. run scoreboard players remove @s gm4_xp_calc 2 - -# deposit 1 points if possible -execute if score @s gm4_xp_calc matches 1.. run experience add @s -1 points -execute if score @s gm4_xp_calc matches 1.. run scoreboard players add @s gm4_stored_xp 1 -execute if score @s gm4_xp_calc matches 1.. run scoreboard players remove @s gm4_xp_calc 1 - -# repeat loop -execute unless score @s gm4_xp_calc matches 0 unless score loop_counter gm4_xp_calc matches 100.. run function gm4_xp_storage:xp_deposit_loop -scoreboard players add loop_counter gm4_xp_calc 1 diff --git a/gm4_xp_storage/data/gm4_xp_storage/guidebook/xp_storage.json b/gm4_xp_storage/data/gm4_xp_storage/guidebook/xp_storage.json deleted file mode 100644 index a09a1c69ed..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/guidebook/xp_storage.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "id": "xp_storage", - "name": "XP Storage", - "module_type": "module", - "icon": { - "id": "minecraft:ender_chest" - }, - "criteria": { - "obtain_ender_chest": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:ender_chest" - ] - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [ - [ - "obtain_ender_chest" - ] - ], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.xp_storage.description", - "fallback": "In addition to items, ender chests can hold experience levels.\n\nStanding on an ender chest deposits XP, while standing below withdraws it." - } - ], - [ - { - "translate": "text.gm4.guidebook.xp_storage.no_mending", - "fallback": "Experience orbs stored in ender chests cannot be transfered to tools with mending; it is a direct transfer." - } - ] - ] - } - ] -} diff --git a/gm4_xp_storage/data/gm4_xp_storage/predicate/sneaking.json b/gm4_xp_storage/data/gm4_xp_storage/predicate/sneaking.json deleted file mode 100644 index d5074b8e36..0000000000 --- a/gm4_xp_storage/data/gm4_xp_storage/predicate/sneaking.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "flags": { - "is_sneaking": true - } - } -} diff --git a/gm4_xp_storage/images/xp_storage.webp b/gm4_xp_storage/images/xp_storage.webp deleted file mode 100644 index 08cce69710..0000000000 Binary files a/gm4_xp_storage/images/xp_storage.webp and /dev/null differ diff --git a/gm4_xp_storage/pack.png b/gm4_xp_storage/pack.png deleted file mode 100644 index 38dff070c7..0000000000 Binary files a/gm4_xp_storage/pack.png and /dev/null differ diff --git a/gm4_xp_storage/pack.svg b/gm4_xp_storage/pack.svg deleted file mode 100644 index cb9663196e..0000000000 --- a/gm4_xp_storage/pack.svg +++ /dev/null @@ -1,659 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gm4_zauber_cauldrons/beet.yaml b/gm4_zauber_cauldrons/beet.yaml index e61a2c3af4..f8a7641c05 100644 --- a/gm4_zauber_cauldrons/beet.yaml +++ b/gm4_zauber_cauldrons/beet.yaml @@ -16,7 +16,6 @@ pipeline: - gm4.plugins.extend.module - gm4.plugins.include.lib_forceload - gm4.plugins.include.lib_brewing - - gm4.plugins.include.lib_trades - gm4.plugins.include.lib_potion_tracking meta: @@ -26,7 +25,6 @@ meta: required: lib_forceload: 1.5.0 lib_brewing: 1.4.0 - lib_trades: 1.6.0 lib_potion_tracking: 1.3.0 schedule_loops: - main diff --git a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_create.json b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_create.json index ac8d98dbf2..dd3ede1449 100644 --- a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_create.json +++ b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_create.json @@ -3,7 +3,7 @@ "icon": { "id": "cauldron", "components": { - "minecraft:custom_model_data": "gui/advancement/zauber_cauldrons_create" + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:gui/advancement/zauber_cauldrons_create"]} } }, "title": { diff --git a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_drink_all_magicol.json b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_drink_all_magicol.json index 6fef7f5fd8..7f61a5e46a 100644 --- a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_drink_all_magicol.json +++ b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_drink_all_magicol.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:potion", "components": { - "minecraft:custom_model_data": "gui/advancement/zauber_cauldrons_drink_all_magicol" + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:gui/advancement/zauber_cauldrons_drink_all_magicol"]} } }, "title": { diff --git a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_drink_multi_use_bottle.json b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_drink_multi_use_bottle.json index 13e4e65c62..47f20a4078 100644 --- a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_drink_multi_use_bottle.json +++ b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_drink_multi_use_bottle.json @@ -3,7 +3,7 @@ "icon": { "id": "glass_bottle", "components": { - "minecraft:custom_model_data": "gui/advancement/zauber_cauldron_drink_multi_use_bottle" + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:gui/advancement/zauber_cauldron_drink_multi_use_bottle"]} } }, "title": { diff --git a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_full_armor.json b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_full_armor.json index 4543ffc010..73bab53df8 100644 --- a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_full_armor.json +++ b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_full_armor.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:golden_chestplate", "components": { - "minecraft:custom_model_data": "gui/advancement/zauber_cauldrons_full_armor" + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:gui/advancement/zauber_cauldrons_full_armor"]} } }, "title": { diff --git a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_make_magicol.json b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_make_magicol.json index bbc99866ad..bd25a409a3 100644 --- a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_make_magicol.json +++ b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_make_magicol.json @@ -3,7 +3,7 @@ "icon": { "id": "clock", "components": { - "minecraft:custom_model_data": "gui/advancement/zauber_cauldrons_make_magicol" + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:gui/advancement/zauber_cauldrons_make_magicol"]} } }, "title": { diff --git a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_paint_biome.json b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_paint_biome.json index 128e99e830..ead875c4cc 100644 --- a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_paint_biome.json +++ b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_paint_biome.json @@ -3,7 +3,7 @@ "icon": { "id": "grass_block", "components": { - "minecraft:custom_model_data": "gui/advancement/zauber_cauldrons_paint_biome" + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:gui/advancement/zauber_cauldrons_paint_biome"]} } }, "title": { diff --git a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_rabbit.json b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_rabbit.json index 6ac32e41bc..2396d2df57 100644 --- a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_rabbit.json +++ b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_rabbit.json @@ -3,7 +3,7 @@ "icon": { "id": "rabbit_foot", "components": { - "minecraft:custom_model_data": "gui/advancement/zauber_cauldrons_rabbit" + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:gui/advancement/zauber_cauldrons_rabbit"]} } }, "title": { diff --git a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_wormhole.json b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_wormhole.json index a9b9a10d45..154d7fea38 100644 --- a/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_wormhole.json +++ b/gm4_zauber_cauldrons/data/gm4/advancement/zauber_cauldrons_wormhole.json @@ -3,7 +3,7 @@ "icon": { "id": "chorus_fruit", "components": { - "minecraft:custom_model_data": "gui/advancement/zauber_cauldrons_wormhole" + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:gui/advancement/zauber_cauldrons_wormhole"]} } }, "title": { diff --git a/gm4_zauber_cauldrons/data/gm4_trades/tags/function/register_trades.json b/gm4_zauber_cauldrons/data/gm4_trades/tags/function/register_trades.json deleted file mode 100644 index 6c696ffd21..0000000000 --- a/gm4_zauber_cauldrons/data/gm4_trades/tags/function/register_trades.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_zauber_cauldrons:wandering_trader/register_trades" - ] -} diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/cauldron/setup/create.mcfunction b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/cauldron/setup/create.mcfunction index 524d8e91b8..8bf6a83d80 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/cauldron/setup/create.mcfunction +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/cauldron/setup/create.mcfunction @@ -8,7 +8,7 @@ advancement grant @s only gm4:zauber_cauldrons_create playsound minecraft:entity.illusioner.prepare_mirror master @a[distance=..8] ~.5 ~.5 ~.5 1 1.6 # summon texture display -summon minecraft:item_display ~.5 ~.5 ~.125 {CustomName:'"gm4_zc_texture"',item:{id:"minecraft:structure_void",count:1,components:{"minecraft:custom_model_data":"block/zauber_cauldron"}},item_display:"thirdperson_righthand",Tags:["gm4_zc_texture","smithed.entity","smithed.strict"]} +summon minecraft:item_display ~.5 ~.5 ~.125 {CustomName:'"gm4_zc_texture"',item:{id:"minecraft:structure_void",count:1,components:{"minecraft:custom_model_data":{"strings":["gm4_zauber_cauldrons:block/zauber_cauldron"]}}},item_display:"thirdperson_righthand",Tags:["gm4_zc_texture","smithed.entity","smithed.strict"]} # start creation animation summon area_effect_cloud ~.5 ~.5 ~.5 {Radius:0,Age:-40,CustomName:'"gm4_zc_creation_animation"',Tags:["gm4_zc_creation_animation"],custom_particle:{type:"minecraft:block",block_state:"minecraft:air"}} diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/wandering_trader/register_trades.mcfunction b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/wandering_trader/register_trades.mcfunction deleted file mode 100644 index a56e13a8ad..0000000000 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/function/wandering_trader/register_trades.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# Adds trades to be added to wandering traders via lib_trades -# @s = a wandering trader -# at @s -# called via function tag #gm4_trades:register_trades - -execute if predicate gm4_zauber_cauldrons:wandering_trader/enchanted_prismarine_shard_chance run summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_new_trade_option"],Items:[{},{},{}],body_armor_item:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{pool:"gm4_zauber_cauldrons:precursors",options:{maxUses:2,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_new_trade_option] horse.0 loot gm4_zauber_cauldrons:wandering_trader/enchanted_prismarine_shard -tag @e[type=trader_llama,tag=gm4_trade_option] remove gm4_new_trade_option -execute if predicate gm4_zauber_cauldrons:wandering_trader/golden_apple_chance run summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_new_trade_option"],Items:[{},{},{}],body_armor_item:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{pool:"gm4_zauber_cauldrons:precursors",options:{maxUses:4,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_new_trade_option] horse.0 loot gm4_zauber_cauldrons:wandering_trader/golden_apple -tag @e[type=trader_llama,tag=gm4_trade_option] remove gm4_new_trade_option -execute if predicate gm4_zauber_cauldrons:wandering_trader/prismarine_crystals_chance run summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_new_trade_option"],Items:[{},{},{}],body_armor_item:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{pool:"gm4_zauber_cauldrons:precursors",options:{maxUses:8,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_new_trade_option] horse.0 loot gm4_zauber_cauldrons:wandering_trader/prismarine_crystals -tag @e[type=trader_llama,tag=gm4_trade_option] remove gm4_new_trade_option diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/bottled_vex.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/bottled_vex.json index a2c216f238..34d46e8216 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/bottled_vex.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/bottled_vex.json @@ -11,7 +11,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "item/magic_in_a_bottle" + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:item/magic_in_a_bottle"]} } }, { diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/enchanted_prismarine_shard.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/enchanted_prismarine_shard.json index 8ec67bd79f..978a304b42 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/enchanted_prismarine_shard.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/enchanted_prismarine_shard.json @@ -11,7 +11,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "item/enchanted_prismarine_shard" + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:item/enchanted_prismarine_shard"]} } }, { diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/wormhole.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/wormhole.json index e7650d24c2..10cfdeec52 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/wormhole.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/loot_table/items/wormhole.json @@ -11,7 +11,7 @@ "function": "minecraft:set_components", "components": { "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "item/wormhole_in_a_bottle", + "minecraft:custom_model_data": {"strings":["gm4_zauber_cauldrons:item/wormhole_in_a_bottle"]}, "minecraft:potion_contents": { "potion": "minecraft:thick", "custom_color": 8587123 diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/cauldron/clear_night.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/cauldron/clear_night.json index 64890c3fed..cdcd586129 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/cauldron/clear_night.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/cauldron/clear_night.json @@ -3,6 +3,7 @@ "terms": [ { "condition": "minecraft:time_check", + "clock": "minecraft:overworld", "value": { "min": 13000, "max": 23000 diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/function/util_below.mcfunction b/gm4_zauber_liquids/data/gm4_zauber_liquids/function/util_below.mcfunction index 05113cdb16..4ad38ac879 100644 --- a/gm4_zauber_liquids/data/gm4_zauber_liquids/function/util_below.mcfunction +++ b/gm4_zauber_liquids/data/gm4_zauber_liquids/function/util_below.mcfunction @@ -4,27 +4,27 @@ tag @s add gm4_processing_tank #harming -execute if score @s[tag=gm4_lt_zauber_harming_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] run function gm4_zauber_liquids:util/harming +execute if score @s[tag=gm4_lt_zauber_harming_potion] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] run function gm4_zauber_liquids:util/harming #healing -execute if score @s[tag=gm4_lt_zauber_healing_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] run function gm4_zauber_liquids:util/healing +execute if score @s[tag=gm4_lt_zauber_healing_potion] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] run function gm4_zauber_liquids:util/healing #leaping -execute if score @s[tag=gm4_lt_zauber_leaping_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:jump_boost'}]}] run function gm4_zauber_liquids:util/leaping +execute if score @s[tag=gm4_lt_zauber_leaping_potion] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:jump_boost'}]}] run function gm4_zauber_liquids:util/leaping #poison -execute if score @s[tag=gm4_lt_zauber_poison_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:poison'}]}] run function gm4_zauber_liquids:util/poison +execute if score @s[tag=gm4_lt_zauber_poison_potion] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:poison'}]}] run function gm4_zauber_liquids:util/poison #regeneration -execute if score @s[tag=gm4_lt_zauber_regeneration_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:regeneration'}]}] run function gm4_zauber_liquids:util/regeneration +execute if score @s[tag=gm4_lt_zauber_regeneration_potion] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:regeneration'}]}] run function gm4_zauber_liquids:util/regeneration #speed -execute if score @s[tag=gm4_lt_zauber_swiftness_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:speed'}]}] run function gm4_zauber_liquids:util/swiftness +execute if score @s[tag=gm4_lt_zauber_swiftness_potion] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:speed'}]}] run function gm4_zauber_liquids:util/swiftness #strength -execute if score @s[tag=gm4_lt_zauber_strength_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:strength'}]}] run function gm4_zauber_liquids:util/strength +execute if score @s[tag=gm4_lt_zauber_strength_potion] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[nbt=!{active_effects:[{id:'minecraft:strength'}]}] run function gm4_zauber_liquids:util/strength #wormhole -execute if score @s[tag=gm4_lt_zauber_wormhole_potion] gm4_lt_value matches 1.. as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[tag=!gm4_zl_wormhole_ignore] run function gm4_zauber_liquids:util/wormhole +execute if score @s[tag=gm4_lt_zauber_wormhole_potion] gm4_lt_value matches 1.. as @e[type=!#gm4:non_living,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0] unless entity @s[gamemode=spectator] if entity @s[tag=!gm4_zl_wormhole_ignore] run function gm4_zauber_liquids:util/wormhole tag @s remove gm4_processing_tank diff --git a/gm4_ziprails/data/gm4/advancement/ziprails.json b/gm4_ziprails/data/gm4/advancement/ziprails.json index e4efb5a3de..d2c9c3f98d 100644 --- a/gm4_ziprails/data/gm4/advancement/ziprails.json +++ b/gm4_ziprails/data/gm4/advancement/ziprails.json @@ -3,7 +3,7 @@ "icon": { "id": "minecraft:minecart", "components": { - "minecraft:custom_model_data": "gui/advancement/ziprails" + "minecraft:custom_model_data": {"strings":["gm4_ziprails:gui/advancement/ziprails"]} } }, "title": { diff --git a/lib_brewing/mod.mcdoc b/lib_brewing/mod.mcdoc new file mode 100644 index 0000000000..8c7c604122 --- /dev/null +++ b/lib_brewing/mod.mcdoc @@ -0,0 +1,11 @@ +use ::java::util::slot::SlottedItem +use ::java::world::item::ItemStack + +dispatch minecraft:storage[gm4_brewing:temp] to struct { + Items?: [SlottedItem], + insert?: (ItemStack | SlottedItem), +} + +dispatch mcdoc:marker_data[gm4_brewing] to struct { + previous_items?: [SlottedItem], +} diff --git a/lib_custom_crafters/LICENSE.md b/lib_custom_crafters/LICENSE.md deleted file mode 100644 index 9b7e27766e..0000000000 --- a/lib_custom_crafters/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021 Gamemode 4 Development - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/lib_custom_crafters/README.md b/lib_custom_crafters/README.md deleted file mode 100644 index 8b514c779f..0000000000 --- a/lib_custom_crafters/README.md +++ /dev/null @@ -1,111 +0,0 @@ -# Custom Crafters -This library, based upon the old Gamemode 4 Module of the same name, adds for a dropper-based custom crafter for custom item crafting purposes. The use of a dropper instead of a barrel ensures that the crafter can be used without a resource pack. Structured as a library, and gamemode 4 modules that require custom item crafting can include this library and come with the custom crafter features bundled. - -## How to Use -Custom Crafters have a function tag used to check recipes: `#gm4_custom_crafters:check_recipes`. Data packs should use this to set up recipes to be crafted in a custom crafter. Custom Crafters run every 16 ticks automatically checking for recipes and replacing them with their appropriate output. - -Below are specific details in implementing a `check_recipes` function. Custom Crafters will only run recipe checks if all slots have the same item count. - -### Check that no other recipes have been completed - -`execute if score $crafted gm4_crafting matches 0 store result score $crafted gm4_crafting` -### Check the slot count -This should be set to the number of filled slots. For example if a recipe has 2 empty slots, the slot count should be 7 (9-2). - -`if score $slot_count gm4_crafting matches ` - -### Check the stack size -This should be set to the maximum count of the input items. For example if you have a recipe that will create 4 items for each single recipe (like log -> planks), then this should be set to `..16`, since 16*4 = 64, which is the maximum stack size for planks. This means only up to 16 items in each slot will work for this recipe. - -`if score $stack_size gm4_crafting matches ..` - -### Check the Items -This checks the `Items` block data (moved to storage for efficiency), which represents the recipe input. Note that `count` should not be checked here, since multi-crafting is supported by setting the `stack_size` - -`if data storage gm4_custom_crafters:temp/crafter {Items:[<...>]}` - -Note that the Custom Crafter automatically supports recipes placed anywhere in the grid, as long as the storage check assumes the recipe is inputted with alignment to the top-left. So for example, crafting a crafting table from planks will work in any 2x2 corner, but the storage check to check the items needs to check slots 0, 1, 3, and 4. The code will automatically shift the recipe in storage before the recipe checks are performed. - -### Loot Replace -`run loot replace block ~ ~ ~ container.0 loot MODULE_NAMESPACE:crafting/RECIPE_NAME` - -- afformentioned loot table: -```json -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "name": "LOOT_TABLE_TO_ITEM", - "functions": [ - { - "function": "minecraft:set_count", - "count": "MULTIPLIER" - } - ] - } - ] - } - ] -} - -``` -- It is convention to put the recipe output in the last slot, but this loot table can be flexible, as long as it replaces all 9 slots. Loot tables pools are run in order, so multiple items can be outputted (such as emptying a water bucket and replacing it with an empty bucket). - -### Set the Multiplier -When setting the outputs with the loot table, the count determines how much the item stack will be multiplied by. For example setting the count to 4 will output 4 of that item per recipe (like the log -> planks example from earlier). - -## Recipe Check Function Example -a function that is called by `#gm4_custom_crafters:check_recipes`: -```mcfunction -# 1 white wool -> 3 string (shapeless) -execute if score $crafted gm4_crafting matches 0 store result score $crafted gm4_crafting if score $slot_count gm4_crafting matches 1 if score $stack_size gm4_crafting matches ..21 if data storage gm4_custom_crafters:temp/crafter {Items:[{id:"minecraft:white_wool"}]} run loot replace block ~ ~ ~ container.0 loot gm4_craft:crafting/string -``` -the loot table `gm4_craft:crafting/string`: -```json -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:string", - "functions": [ - { - "function": "minecraft:set_count", - "count": 3 - } - ] - } - ] - } - ] -} -``` -In the example above, the `stack_size` is set to 21 because the output for a single craft is 3 string and the maximum stack size for string is 64, so 64/3 = 21.3 maximum input items (then round down since 22 would exceed the max stack size of string). The loot table ensures that all items are deleted and the last slot of the dropper is replaced with the output for one craft. - -## License -This library, and the contents of the `lib_custom_crafters` directory on the [github repository](https://github.com/Gamemode4Dev/GM4_data packs), is licensed under the MIT License. diff --git a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_bottom.png b/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_bottom.png deleted file mode 100644 index 9719ac46d7..0000000000 Binary files a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_bottom.png and /dev/null differ diff --git a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_bottom_front.png b/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_bottom_front.png deleted file mode 100644 index 8eaf71bc49..0000000000 Binary files a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_bottom_front.png and /dev/null differ diff --git a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_front.png b/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_front.png deleted file mode 100644 index 9594671991..0000000000 Binary files a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_front.png and /dev/null differ diff --git a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_side.png b/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_side.png deleted file mode 100644 index 73531fc323..0000000000 Binary files a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_side.png and /dev/null differ diff --git a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_side_front.png b/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_side_front.png deleted file mode 100644 index 4dd3070d29..0000000000 Binary files a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_side_front.png and /dev/null differ diff --git a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_top.png b/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_top.png deleted file mode 100644 index 9a2aae8e9d..0000000000 Binary files a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_top.png and /dev/null differ diff --git a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_top_out.png b/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_top_out.png deleted file mode 100644 index 1140903bcd..0000000000 Binary files a/lib_custom_crafters/assets/gm4_custom_crafters/textures/block/custom_crafter_top_out.png and /dev/null differ diff --git a/lib_custom_crafters/assets/gm4_custom_crafters/textures/gui/container/custom_crafter.png b/lib_custom_crafters/assets/gm4_custom_crafters/textures/gui/container/custom_crafter.png deleted file mode 100644 index f5111cad39..0000000000 Binary files a/lib_custom_crafters/assets/gm4_custom_crafters/textures/gui/container/custom_crafter.png and /dev/null differ diff --git a/lib_custom_crafters/assets/gm4_custom_crafters/textures/gui/guidebook/custom_crafters.png b/lib_custom_crafters/assets/gm4_custom_crafters/textures/gui/guidebook/custom_crafters.png deleted file mode 100644 index aa3bda99f9..0000000000 Binary files a/lib_custom_crafters/assets/gm4_custom_crafters/textures/gui/guidebook/custom_crafters.png and /dev/null differ diff --git a/lib_custom_crafters/assets/translations.csv b/lib_custom_crafters/assets/translations.csv deleted file mode 100644 index cf77e3f271..0000000000 --- a/lib_custom_crafters/assets/translations.csv +++ /dev/null @@ -1,9 +0,0 @@ -key,en_us -block.gm4.custom_crafter,Custom Crafter -container.gm4.custom_crafter,Custom Crafter -advancement.gm4.custom_crafters.title,Clever Crafting -advancement.gm4.custom_crafters.description,Construct a Custom Crafter from a Dropper -text.gm4.guidebook.module_desc.custom_crafters,Craft new items with a custom crafter! -text.gm4.guidebook.custom_crafters.description,Custom crafters can be created to craft new items. Iron and a dropper is needed to make this machine. -text.gm4.guidebook.custom_crafters.creation,"Arrange this recipe in a dropper, then use a crafting table on it." -text.gm4.guidebook.custom_crafters.crafting,Custom crafters can also be crafted in a custom crafter: diff --git a/lib_custom_crafters/beet.yaml b/lib_custom_crafters/beet.yaml deleted file mode 100644 index d2bcc09402..0000000000 --- a/lib_custom_crafters/beet.yaml +++ /dev/null @@ -1,97 +0,0 @@ -id: gm4_custom_crafters -name: Gamemode 4 Custom Crafters -version: 3.4.X -description: A dropper-based custom crafter for custom item crafting purposes. - -data_pack: - load: - data: data - -resource_pack: - load: - assets: assets - -require: - - gm4.plugins.resource_pack - - gm4_guidebook.generate_guidebooks.load_page_data - - gm4_guidebook.generate_guidebooks.load_custom_recipes - - gm4.plugins.player_heads - - beet.contrib.model_merging - - beet.contrib.babelbox - -pipeline: - - lib_custom_crafters.generate_item_tags - - gm4.plugins.module.gm4_root_advancement - - gm4_guidebook.generate_guidebooks - - gm4.plugins.resource_pack.build - - mecha - - gm4.plugins.extend.library - - gm4.plugins.include.lib_machines - - gm4.plugins.include.lib_forceload - -meta: - gm4: - versioning: - required: - lib_machines: 1.4.0 - lib_forceload: 1.5.0 - schedule_loops: [main] - extra_version_injections: - functions: - - versioning/check_item_tags - - check_recipes - - machine/verify_destroy - - machine/verify_place_down - advancements: - - create_custom_crafter - model_data: - - item: player_head - reference: item/custom_crafter - model: block/custom_crafter - - item: crafting_table - template: legacy_machine_block - broadcast: - - reference: block/custom_crafter - textures: - bottom: block/custom_crafter_bottom - top: block/custom_crafter_top_out - front: block/custom_crafter_side - side: block/custom_crafter_side - - reference: block/custom_crafter_side - textures: - bottom: block/custom_crafter_bottom - top: block/custom_crafter_top - front: block/custom_crafter_front - side: block/custom_crafter_side - - reference: block/custom_crafter_down - textures: - bottom: block/custom_crafter_bottom_front - top: block/custom_crafter_top - front: block/custom_crafter_side - side: block/custom_crafter_side - - item: crafting_table - reference: gui/advancement/custom_crafters - template: - name: advancement - forward: block/custom_crafter - gui_fonts: - - translation: gui.gm4.custom_crafter - container: dropper - texture: gui/container/custom_crafter - smithed: - pack_id: gm4_lib_custom_crafters - credits: - Custom Crafters Creators: - - Bloo - - Sparks - - SpecialBuilder32 - Textures by: - - Kyrius - mecha: - layout: preserve - nbt_compact: True - cmd_compact: True - babelbox: - load: assets/translations.csv - namespace: gm4_translations - dialect: excel diff --git a/lib_custom_crafters/data/gm4/advancement/custom_crafters.json b/lib_custom_crafters/data/gm4/advancement/custom_crafters.json deleted file mode 100644 index 313c852918..0000000000 --- a/lib_custom_crafters/data/gm4/advancement/custom_crafters.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "display": { - "icon": { - "id": "crafting_table", - "components": { - "minecraft:custom_model_data": "gui/advancement/custom_crafters" - } - }, - "title": { - "translate": "advancement.gm4.custom_crafters.title", - "fallback": "Clever Crafting" - }, - "description": { - "translate": "advancement.gm4.custom_crafters.description", - "fallback": "Construct a Custom Crafter from a Dropper", - "color": "gray" - } - }, - "parent": "gm4:root", - "criteria": { - "build_crafter": { - "trigger": "minecraft:impossible" - } - } -} diff --git a/lib_custom_crafters/data/gm4/recipe/custom_crafter.json b/lib_custom_crafters/data/gm4/recipe/custom_crafter.json deleted file mode 100644 index 7da5b56dfb..0000000000 --- a/lib_custom_crafters/data/gm4/recipe/custom_crafter.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "redstone", - "pattern": [ - "ILI", - "CTC", - "CDC" - ], - "key": { - "I": "minecraft:iron_ingot", - "L": "minecraft:light_blue_dye", - "C": "minecraft:cobblestone", - "T": "minecraft:crafting_table", - "D": "minecraft:dropper" - }, - "result": { - "id": "minecraft:player_head", - "components": { - "minecraft:custom_model_data": "gm4_custom_crafters:item/custom_crafter", - "minecraft:profile": "$gm4_custom_crafters:custom_crafter", - "minecraft:custom_data": "{gm4_machines:{id:'custom_crafter'}}", - "minecraft:custom_name": {"translate":"block.gm4.custom_crafter","fallback":"Custom Crafter","color":"white","italic":false} - } - } -} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/advancement/create_custom_crafter.json b/lib_custom_crafters/data/gm4_custom_crafters/advancement/create_custom_crafter.json deleted file mode 100644 index 1890e79b4c..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/advancement/create_custom_crafter.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "criteria": { - "use_crafting_table_on_dropper": { - "trigger": "minecraft:any_block_use", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "flags": { - "is_sneaking": false - } - } - } - ], - "location": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:crafting_table" - ] - } - }, - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{Items:[{Slot:0b,id:\"minecraft:iron_ingot\",count:1},{Slot:1b,id:\"minecraft:light_blue_dye\",count:1},{Slot:2b,id:\"minecraft:iron_ingot\",count:1},{Slot:3b,id:\"minecraft:cobblestone\",count:1},{Slot:5b,id:\"minecraft:cobblestone\",count:1},{Slot:6b,id:\"minecraft:cobblestone\",count:1},{Slot:8b,id:\"minecraft:cobblestone\",count:1}]}" - } - } - } - ] - } - } - }, - "rewards": { - "function": "gm4_custom_crafters:machine/craft_in_place/player_used_item" - } -} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/check_recipes.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/check_recipes.mcfunction deleted file mode 100644 index e1be6bab71..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/check_recipes.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# attempts to complete the custom crafter recipe -# @s = crafters containing a potential recipe -# located at @s -# run from #gm4_custom_crafters:check_recipes - -execute if score gm4_custom_crafters load.status matches 3 if score gm4_custom_crafters_minor load.status matches 0 if score $crafted gm4_crafting matches 0 store success score $crafted gm4_crafting if score $slot_count gm4_crafting matches 9 if score $stack_size gm4_crafting matches ..64 if data storage gm4_custom_crafters:temp/crafter {Items:[{Slot:0b,id:"minecraft:iron_ingot"},{Slot:1b,id:"minecraft:light_blue_dye"},{Slot:2b,id:"minecraft:iron_ingot"},{Slot:3b,id:"minecraft:cobblestone"},{Slot:4b,id:"minecraft:crafting_table"},{Slot:5b,id:"minecraft:cobblestone"},{Slot:6b,id:"minecraft:cobblestone"},{Slot:7b,id:"minecraft:dropper"},{Slot:8b,id:"minecraft:cobblestone"}]} run loot replace block ~ ~ ~ container.0 loot gm4_custom_crafters:crafting/custom_crafter diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/load.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/load.mcfunction deleted file mode 100644 index 720a16fe17..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/load.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -scoreboard objectives add gm4_crafting dummy -scoreboard objectives add gm4_count dummy - -schedule function gm4_custom_crafters:main 1t diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/craft_in_place/create.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/craft_in_place/create.mcfunction deleted file mode 100644 index 05551ff4fa..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/craft_in_place/create.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# creates the custom crafter in a dropper -# @s = player who opened the dropper while holding a crafting table -# located at align xyz of the dropper -# run from gm4_custom_crafters:machine/craft_in_place/find_dropper - -# get rotation of original dropper -execute if block ~ ~ ~ dropper[facing=down] run scoreboard players set $rotation gm4_machine_data 1 -execute if block ~ ~ ~ dropper[facing=up] run scoreboard players set $rotation gm4_machine_data 2 -execute if block ~ ~ ~ dropper[facing=south] run scoreboard players set $rotation gm4_machine_data 3 -execute if block ~ ~ ~ dropper[facing=west] run scoreboard players set $rotation gm4_machine_data 4 -execute if block ~ ~ ~ dropper[facing=north] run scoreboard players set $rotation gm4_machine_data 5 -execute if block ~ ~ ~ dropper[facing=east] run scoreboard players set $rotation gm4_machine_data 6 - -# replace original dropper to clear inv and force-close GUI -setblock ~ ~ ~ air - -# take 1 crafting table from survival/adventure players -clear @s[gamemode=!creative,gamemode=!spectator] crafting_table 1 - -# create custom crafter -execute positioned ~.5 ~.5 ~.5 run function gm4_custom_crafters:machine/create -advancement grant @s only gm4:custom_crafters diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/craft_in_place/find_dropper.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/craft_in_place/find_dropper.mcfunction deleted file mode 100644 index 854e67cfe7..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/craft_in_place/find_dropper.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# raycast to find the dropper -# @s = marker ray -# located ^ ^ ^0.X, X = number of iterations -# run from gm4_custom_crafters:machine/craft_in_place/player_used_item - -# check if a dropper is present -# | nested execute is needed as ANY dropper should match this search, but droppers with items in slot 4 or 7 should cancel the creation, not skip to the next raycast depth -execute if block ~ ~ ~ dropper align xyz unless entity @e[type=marker,tag=gm4_machine_marker,dx=0] run return run execute unless data block ~ ~ ~ Items[{Slot:4b}] unless data block ~ ~ ~ Items[{Slot:7b}] run function gm4_custom_crafters:machine/craft_in_place/create - -# advance -scoreboard players remove $ray gm4_count 1 -execute if score $ray gm4_count matches 0.. positioned ^ ^ ^0.013 run function gm4_custom_crafters:machine/craft_in_place/find_dropper diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/craft_in_place/player_used_item.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/craft_in_place/player_used_item.mcfunction deleted file mode 100644 index 8109f4d0dc..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/craft_in_place/player_used_item.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# creates the custom crafter in a dropper -# @s = player who opened the dropper while holding a crafting table -# located at @s -# run from advancement gm4_custom_crafters:create_custom_crafter - -advancement revoke @s only gm4_custom_crafters:create_custom_crafter - -# raycast to find dropper -scoreboard players set $ray gm4_count 500 -execute anchored eyes positioned ^ ^ ^ run function gm4_custom_crafters:machine/craft_in_place/find_dropper diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/create.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/create.mcfunction deleted file mode 100644 index 8ea1215f3f..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/create.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -# places the custom crafter down -# @s = player who placed the custom crafter -# located at the center of the placed block -# run from gm4_custom_crafters:machine/verify_place_down - -# place block depending on rotation -execute if score $rotation gm4_machine_data matches 1 run function gm4_custom_crafters:machine/rotate/down -execute if score $rotation gm4_machine_data matches 2 run function gm4_custom_crafters:machine/rotate/up -execute if score $rotation gm4_machine_data matches 3 run function gm4_custom_crafters:machine/rotate/south -execute if score $rotation gm4_machine_data matches 4 run function gm4_custom_crafters:machine/rotate/west -execute if score $rotation gm4_machine_data matches 5 run function gm4_custom_crafters:machine/rotate/north -execute if score $rotation gm4_machine_data matches 6 run function gm4_custom_crafters:machine/rotate/east - -# mark block as placed -playsound minecraft:block.barrel.close block @a[distance=..6] ~ ~ ~ 1 1.6 -scoreboard players set $placed_block gm4_machine_data 1 -scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 2 -tag @e[distance=..2] remove gm4_new_machine diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/destroy.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/destroy.mcfunction deleted file mode 100644 index 803e448f9f..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/destroy.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# destroys the custom crafter -# @s = custom crafter marker -# located at @s -# run from gm4_custom_crafters:machine/verify_destroy - -# kill entities related to machine block -execute positioned ~ ~0.5 ~ run kill @e[type=item_display,tag=gm4_custom_crafter_display,limit=1,distance=..0.01] -execute store result score $dropped_item gm4_machine_data run kill @e[type=item,distance=..1,nbt={Item:{id:"minecraft:dropper",count:1,components:{}}},limit=1,sort=nearest] -kill @s - -# drop item (unless broken in creative mode) -particle minecraft:block{block_state:"minecraft:crafting_table"} ~ ~ ~ .1 .25 .1 .05 30 normal @a -execute if score $dropped_item gm4_machine_data matches 1 run loot spawn ~ ~ ~ loot gm4_custom_crafters:items/custom_crafter diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/down.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/down.mcfunction deleted file mode 100644 index 6f0bade7bf..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/down.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the custom_crafter down based on rotation -# @s = player who placed the custom_crafter -# located at the center of the placed block -# run from gm4_custom_crafters:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=down]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:offscreen"},{"translate":"gui.gm4.custom_crafter","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:default","color":"#404040"}]]}} - -# summon display and marker entity -summon item_display ~ ~0.5 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_display",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter_down"}},item_display:head,brightness:{sky:15,block:15},Rotation:[180.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -summon marker ~ ~ ~ {Tags:["gm4_custom_crafter","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter",Rotation:[180.0f,0.0f]} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/east.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/east.mcfunction deleted file mode 100644 index d1b07727b4..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/east.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the custom_crafter down based on rotation -# @s = player who placed the custom_crafter -# located at the center of the placed block -# run from gm4_custom_crafters:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=east]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:offscreen"},{"translate":"gui.gm4.custom_crafter","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:default","color":"#404040"}]]}} - -# summon display and marker entity -summon item_display ~ ~0.5 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_display",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter_side"}},item_display:head,brightness:{sky:15,block:15},Rotation:[-90.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -summon marker ~ ~ ~ {Tags:["gm4_custom_crafter","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter",Rotation:[-90.0f,0.0f]} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/north.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/north.mcfunction deleted file mode 100644 index daa99a0d47..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/north.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the custom_crafter down based on rotation -# @s = player who placed the custom_crafter -# located at the center of the placed block -# run from gm4_custom_crafters:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=north]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:offscreen"},{"translate":"gui.gm4.custom_crafter","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:default","color":"#404040"}]]}} - -# summon display and marker entity -summon item_display ~ ~0.5 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_display",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter_side"}},item_display:head,brightness:{sky:15,block:15},Rotation:[180.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -summon marker ~ ~ ~ {Tags:["gm4_custom_crafter","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter",Rotation:[180.0f,0.0f]} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/south.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/south.mcfunction deleted file mode 100644 index 3f27c572b2..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/south.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the custom_crafter down based on rotation -# @s = player who placed the custom_crafter -# located at the center of the placed block -# run from gm4_custom_crafters:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=south]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:offscreen"},{"translate":"gui.gm4.custom_crafter","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:default","color":"#404040"}]]}} - -# summon display and marker entity -summon item_display ~ ~0.5 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_display",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter_side"}},item_display:head,brightness:{sky:15,block:15},Rotation:[0.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -summon marker ~ ~ ~ {Tags:["gm4_custom_crafter","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter",Rotation:[0.0f,0.0f]} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/up.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/up.mcfunction deleted file mode 100644 index fa41cd8b58..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/up.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the custom_crafter down based on rotation -# @s = player who placed the custom_crafter -# located at the center of the placed block -# run from gm4_custom_crafters:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=up]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:offscreen"},{"translate":"gui.gm4.custom_crafter","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:default","color":"#404040"}]]}} - -# summon display and marker entity -summon item_display ~ ~0.5 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_display",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter"}},item_display:head,brightness:{sky:15,block:15},Rotation:[0.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -summon marker ~ ~ ~ {Tags:["gm4_custom_crafter","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter",Rotation:[0.0f,0.0f]} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/west.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/west.mcfunction deleted file mode 100644 index e9fcb80550..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/rotate/west.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# places the custom_crafter down based on rotation -# @s = player who placed the custom_crafter -# located at the center of the placed block -# run from gm4_custom_crafters:machine/create - -# place dropper -setblock ~ ~ ~ dropper[facing=west]{CustomName:{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter"},[{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:offscreen"},{"translate":"gui.gm4.custom_crafter","fallback":"","font":"gm4:container_gui","color":"white"},{"text":" ","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:half_invert"},{"translate":"container.gm4.custom_crafter","fallback":"Custom Crafter","font":"gm4:default","color":"#404040"}]]}} - -# summon display and marker entity -summon item_display ~ ~0.5 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_display","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_display",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter_side"}},item_display:head,brightness:{sky:15,block:15},Rotation:[90.0f,0.0f],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -summon marker ~ ~ ~ {Tags:["gm4_custom_crafter","gm4_machine_marker","smithed.block","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter",Rotation:[90.0f,0.0f]} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/verify_destroy.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/verify_destroy.mcfunction deleted file mode 100644 index 19cb6cbf82..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/verify_destroy.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# verifies that the destroyed machine was from this module -# @s = machine block marker -# located at @s -# run from #gm4_machines:destroy - -execute if score gm4_custom_crafters load.status matches 3 if score gm4_custom_crafters_minor load.status matches 0 if entity @s[tag=gm4_custom_crafter] run function gm4_custom_crafters:machine/destroy -# note that the load checks above are NOT required for a normal module; it's only included here because this is in a library diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/verify_place_down.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/machine/verify_place_down.mcfunction deleted file mode 100644 index cb73b840a1..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/machine/verify_place_down.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# verifies that the placed down machine was from this module -# @s = player who placed down the machine -# located at the machine block marker (at the center of the placed down block) -# run from #gm4_machines:place_down - -execute if score $placed_block gm4_machine_data matches 0 if score gm4_custom_crafters load.status matches 3 if score gm4_custom_crafters_minor load.status matches 0 if data storage gm4_machines:temp {id:"custom_crafter"} run function gm4_custom_crafters:machine/create -# note that the load checks above are NOT required for a normal module; it's only included here because this is in a library diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/main.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/main.mcfunction deleted file mode 100644 index 5813d1bf00..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/main.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# runs every 16 ticks -# @s = none -# located at world spawn -# run from gm4_custom_crafters:load - -# process custom crafters -execute as @e[type=marker,tag=gm4_custom_crafter] at @s if block ~ ~ ~ dropper[triggered=false]{Items:[{}]} run function gm4_custom_crafters:process - -schedule function gm4_custom_crafters:main 16t diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process.mcfunction deleted file mode 100644 index 4352c1b47b..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# processes custom crafters -# @s = gm4_custom_crafter unless block ~ ~ ~ dropper{Items:[]} -# located at @s -# run from gm4_custom_crafters:main - -# store all block data into storage -data modify storage gm4_custom_crafters:temp/crafter Items set from block ~ ~ ~ Items - -# check if the crafter should run recipe checks -execute if entity @s[tag=gm4_custom_crafters_crafted] run function gm4_custom_crafters:process_input/check_cache -execute unless entity @s[tag=gm4_custom_crafters_crafted] run function gm4_custom_crafters:process_input/recipe_validity_check - -# clean up -data remove storage gm4_custom_crafters:temp/crafter Items diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/attempt_craft.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/attempt_craft.mcfunction deleted file mode 100644 index 8819f582aa..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/attempt_craft.mcfunction +++ /dev/null @@ -1,42 +0,0 @@ -# attempts to craft items -# @s = crafters containing a potential recipe -# located at @s -# run from gm4_custom_crafters:process_input/recipe_validity_check - -# shift items to be top-left aligned -data modify storage gm4_custom_crafters:temp/crafter original_items set from storage gm4_custom_crafters:temp/crafter Items -execute unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:0b}] unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:1b}] unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:2b}] run function gm4_custom_crafters:process_input/shift/shift_up -execute unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:0b}] unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:3b}] unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:6b}] run function gm4_custom_crafters:process_input/shift/shift_left - -# check if any items in the crafter fall under any item tags -scoreboard players operation $loop gm4_crafting = $slot_count gm4_crafting -function gm4_custom_crafters:process_input/check_item -data modify storage gm4_custom_crafters:temp/crafter Items set from storage gm4_custom_crafters:temp/crafter new_items -data remove storage gm4_custom_crafters:temp/crafter new_items - -# get total input id length -execute store result score $id_0 gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[{Slot:0b}].id -scoreboard players operation $id_total gm4_crafting = $id_0 gm4_crafting -execute store result score $id_1 gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[{Slot:1b}].id -scoreboard players operation $id_total gm4_crafting += $id_1 gm4_crafting -execute store result score $id_2 gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[{Slot:2b}].id -scoreboard players operation $id_total gm4_crafting += $id_2 gm4_crafting -execute store result score $id_3 gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[{Slot:3b}].id -scoreboard players operation $id_total gm4_crafting += $id_3 gm4_crafting -execute store result score $id_4 gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[{Slot:4b}].id -scoreboard players operation $id_total gm4_crafting += $id_4 gm4_crafting -execute store result score $id_5 gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[{Slot:5b}].id -scoreboard players operation $id_total gm4_crafting += $id_5 gm4_crafting -execute store result score $id_6 gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[{Slot:6b}].id -scoreboard players operation $id_total gm4_crafting += $id_6 gm4_crafting -execute store result score $id_7 gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[{Slot:7b}].id -scoreboard players operation $id_total gm4_crafting += $id_7 gm4_crafting -execute store result score $id_8 gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[{Slot:8b}].id -scoreboard players operation $id_total gm4_crafting += $id_8 gm4_crafting - -# allow crafters with valid contents to run recipe checks -scoreboard players set $crafted gm4_crafting 0 -function #gm4_custom_crafters:check_recipes - -# check if one of the recipes succeeded -execute unless score $crafted gm4_crafting matches 0 run function gm4_custom_crafters:process_output/finish_crafting diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/check_cache.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/check_cache.mcfunction deleted file mode 100644 index d63dee899e..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/check_cache.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# checks if the contents of the dropper has changed -# @s = gm4_custom_crafter unless block ~ ~ ~ dropper{Items:[]} -# located at @s -# run from gm4_custom_crafters:process - -# check if the contents of the dropper is the same as the last time something was crafted -scoreboard players set $diff gm4_crafting 0 -data modify storage gm4_custom_crafters:temp/crafter check set from storage gm4_custom_crafters:temp/crafter Items -execute store success score $diff gm4_crafting run data modify storage gm4_custom_crafters:temp/crafter check set from entity @s data.gm4_custom_crafters.cached_output - -# remove tag if the contents changed -execute if score $diff gm4_crafting matches 1 run tag @s remove gm4_custom_crafters_crafted - -# clean up -data remove storage gm4_custom_crafters:temp/crafter check -execute if score $diff gm4_crafting matches 1 run data remove entity @s data.gm4_custom_crafters.cached_output diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/check_item.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/check_item.mcfunction deleted file mode 100644 index 64efcb550f..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/check_item.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -# checks each slot for special item tags -# @s = crafters containing a potential recipe -# located at @s -# run from gm4_custom_crafters:process_input/attempt_craft - -# update item -data modify storage gm4_custom_crafters:temp/crafter item set from storage gm4_custom_crafters:temp/crafter Items[-1] - -data modify entity 344d47-4-4-4-f04ce104d equipment.mainhand set from storage gm4_custom_crafters:temp/crafter item -execute as 344d47-4-4-4-f04ce104d run function #gm4_custom_crafters:custom_item_checks -data remove entity 344d47-4-4-4-f04ce104d equipment.mainhand -data modify storage gm4_custom_crafters:temp/crafter new_items append from storage gm4_custom_crafters:temp/crafter item - -# clean up storage -data remove storage gm4_custom_crafters:temp/crafter item -data remove storage gm4_custom_crafters:temp/crafter Items[-1] - -# loop for all items -scoreboard players remove $loop gm4_crafting 1 -execute if score $loop gm4_crafting matches 1.. run function gm4_custom_crafters:process_input/check_item diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/check_item_tags.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/check_item_tags.mcfunction deleted file mode 100644 index e8c7281cdf..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/check_item_tags.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks each slot for item tags -# @s = crafter armor stand -# located at the center of the block -# run from gm4_custom_crafters:process_input/check_item via #gm4_custom_crafter:custom_item_checks - -# generated by generate_item_tags.py diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/recipe_validity_check.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/recipe_validity_check.mcfunction deleted file mode 100644 index df213d0af8..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/recipe_validity_check.mcfunction +++ /dev/null @@ -1,45 +0,0 @@ -# checks for recipes in a custom crafter -# @s = gm4_custom_crafter unless block ~ ~ ~ dropper{Items:[]} -# located at @s -# run from gm4_custom_crafters:process - -# get number of full slots -execute store result score $slot_count gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items - -# get number of items from first array element -execute store result score $first_stack_size gm4_crafting run data get block ~ ~ ~ Items[0].count - -# check if each slot with an item in it has the same stack size -execute if score $slot_count gm4_crafting matches 2.. store result score $stack_size gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[1].count -execute if score $slot_count gm4_crafting matches 2.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 3.. store result score $stack_size gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[2].count -execute if score $slot_count gm4_crafting matches 3.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 4.. store result score $stack_size gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[3].count -execute if score $slot_count gm4_crafting matches 4.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 5.. store result score $stack_size gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[4].count -execute if score $slot_count gm4_crafting matches 5.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 6.. store result score $stack_size gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[5].count -execute if score $slot_count gm4_crafting matches 6.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 7.. store result score $stack_size gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[6].count -execute if score $slot_count gm4_crafting matches 7.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 8.. store result score $stack_size gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[7].count -execute if score $slot_count gm4_crafting matches 8.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -execute if score $slot_count gm4_crafting matches 9.. store result score $stack_size gm4_crafting run data get storage gm4_custom_crafters:temp/crafter Items[8].count -execute if score $slot_count gm4_crafting matches 9.. unless score $stack_size gm4_crafting = $first_stack_size gm4_crafting run scoreboard players set $first_stack_size gm4_crafting 0 - -scoreboard players operation $stack_size gm4_crafting = $first_stack_size gm4_crafting - -# attempt to craft items in crafters with valid contents -execute if score $stack_size gm4_crafting matches 1.. run function gm4_custom_crafters:process_input/attempt_craft - -# storage cleanup -data remove storage gm4_custom_crafters:temp/crafter Items -data remove storage gm4_custom_crafters:temp/crafter original_items -data remove storage gm4_custom_crafters:temp/output Items diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/left_1.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/left_1.mcfunction deleted file mode 100644 index bf5f84fa67..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/left_1.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# virtually shifts the items left once -# @s = crafters with an empty left column -# located at @s -# run from gm4_custom_crafters:process_input/shift/shift_left - -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:1b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:1b}].Slot set value 0b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:4b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:4b}].Slot set value 3b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:7b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:7b}].Slot set value 6b - -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:2b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:2b}].Slot set value 1b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:5b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:5b}].Slot set value 4b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:8b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:8b}].Slot set value 7b diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/left_2.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/left_2.mcfunction deleted file mode 100644 index 31c13eae5e..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/left_2.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# virtually shifts the items left twice -# @s = crafters with two empty left columns -# located at @s -# run from gm4_custom_crafters:process_input/shift/shift_left - -scoreboard players set $shifted gm4_crafting 1 - -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:2b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:2b}].Slot set value 0b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:5b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:5b}].Slot set value 3b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:8b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:8b}].Slot set value 6b diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/shift_left.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/shift_left.mcfunction deleted file mode 100644 index e44623ea0a..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/shift_left.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# checks how many times to shift left -# @s = crafters with an empty left column -# located at @s -# run from gm4_custom_crafters:process_input/attempt_craft - -scoreboard players set $shifted gm4_crafting 0 -execute unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:1b}] unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:4b}] unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:7b}] run function gm4_custom_crafters:process_input/shift/left_2 -execute if score $shifted gm4_crafting matches 0 run function gm4_custom_crafters:process_input/shift/left_1 diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/shift_up.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/shift_up.mcfunction deleted file mode 100644 index f014377f10..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/shift_up.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# checks how many times to shift up -# @s = crafters with an empty top row -# located at @s -# run from gm4_custom_crafters:process_input/attempt_craft - -scoreboard players set $shifted gm4_crafting 0 -execute unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:3b}] unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:4b}] unless data storage gm4_custom_crafters:temp/crafter Items[{Slot:5b}] run function gm4_custom_crafters:process_input/shift/up_2 -execute if score $shifted gm4_crafting matches 0 run function gm4_custom_crafters:process_input/shift/up_1 diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/up_1.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/up_1.mcfunction deleted file mode 100644 index 4dc22f6c82..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/up_1.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -# virtually shifts the items up once -# @s = crafters with an empty top row -# located at @s -# run from gm4_custom_crafters:process_input/shift/shift_up - -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:3b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:3b}].Slot set value 0b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:4b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:4b}].Slot set value 1b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:5b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:5b}].Slot set value 2b - -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:6b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:6b}].Slot set value 3b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:7b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:7b}].Slot set value 4b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:8b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:8b}].Slot set value 5b diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/up_2.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/up_2.mcfunction deleted file mode 100644 index 75df4be699..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_input/shift/up_2.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# virtually shifts the items up twice -# @s = crafters with two empty top rows -# located at @s -# run from gm4_custom_crafters:process_input/shift/shift_up - -scoreboard players set $shifted gm4_crafting 1 - -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:6b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:6b}].Slot set value 0b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:7b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:7b}].Slot set value 1b -execute if data storage gm4_custom_crafters:temp/crafter Items[{Slot:8b}] run data modify storage gm4_custom_crafters:temp/crafter Items[{Slot:8b}].Slot set value 2b diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_output/apply_multiplier.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_output/apply_multiplier.mcfunction deleted file mode 100644 index 8de19dc8e8..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_output/apply_multiplier.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# multiplies items by their specific multiplier -# @s = crafters containing a recipe result -# located at @s -# run from gm4_custom_crafters:process_output/finish_crafting - -# multiply items by their multiplier data -execute store result score $stack_multiplier gm4_crafting run data get storage gm4_custom_crafters:temp/output Items[-1].count -scoreboard players operation $new_stack_size gm4_crafting = $stack_size gm4_crafting -scoreboard players operation $new_stack_size gm4_crafting *= $stack_multiplier gm4_crafting -execute store result storage gm4_custom_crafters:temp/output Items[-1].count byte 1 run scoreboard players get $new_stack_size gm4_crafting - -# move modified item into new storage -data modify storage gm4_custom_crafters:temp/output NewItems append from storage gm4_custom_crafters:temp/output Items[-1] - -# loop for all items in the storage -data remove storage gm4_custom_crafters:temp/output Items[-1] -execute if data storage gm4_custom_crafters:temp/output Items[-1] run function gm4_custom_crafters:process_output/apply_multiplier diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/process_output/finish_crafting.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/process_output/finish_crafting.mcfunction deleted file mode 100644 index b940299614..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/process_output/finish_crafting.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -# multiplies items by their specific multiplier -# @s = crafters containing a recipe result -# located at @s -# run from gm4_custom_crafters:process_input/attempt_craft - -# apply multiplier for all items -data modify storage gm4_custom_crafters:temp/output Items set from block ~ ~ ~ Items -function gm4_custom_crafters:process_output/apply_multiplier -# insert multiplied items into block -data modify block ~ ~ ~ Items set from storage gm4_custom_crafters:temp/output NewItems - -# store current contents -data modify entity @s data.gm4_custom_crafters.cached_output set from block ~ ~ ~ Items -tag @s add gm4_custom_crafters_crafted - -# clean up -data remove storage gm4_custom_crafters:temp/output NewItems -data remove storage gm4_custom_crafters:temp/output Items diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/upgrade_paths/3.1.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/upgrade_paths/3.1.mcfunction deleted file mode 100644 index bd24e02a21..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/upgrade_paths/3.1.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -execute as @e[type=armor_stand,tag=gm4_custom_crafter_stand,nbt={equipment:{head:{id:"minecraft:crafting_table",count:1,components:{"minecraft:custom_model_data":{floats:[3420001F]}}}}}] at @s align y run summon item_display ~ ~1.0 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_stand",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter"}},Rotation:[0.0f,0.0f],item_display:head,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -execute as @e[type=armor_stand,tag=gm4_custom_crafter_stand,nbt={equipment:{head:{id:"minecraft:crafting_table",count:1,components:{"minecraft:custom_model_data":{floats:[3420007F]}}}}}] at @s align y run summon item_display ~ ~1.0 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_stand",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter_down"}},Rotation:[180.0f,0.0f],item_display:head,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} - -execute as @e[type=armor_stand,tag=gm4_custom_crafter_stand,y_rotation=-90,nbt={equipment:{head:{id:"minecraft:crafting_table",count:1,components:{"minecraft:custom_model_data":{floats:[3420006F]}}}}}] at @s align y run summon item_display ~ ~1.0 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_stand",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter_side"}},Rotation:[-90.0f,0.0f],item_display:head,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -execute as @e[type=armor_stand,tag=gm4_custom_crafter_stand,y_rotation=180,nbt={equipment:{head:{id:"minecraft:crafting_table",count:1,components:{"minecraft:custom_model_data":{floats:[3420006F]}}}}}] at @s align y run summon item_display ~ ~1.0 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_stand",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter_side"}},Rotation:[180.0f,0.0f],item_display:head,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -execute as @e[type=armor_stand,tag=gm4_custom_crafter_stand,y_rotation=0,nbt={equipment:{head:{id:"minecraft:crafting_table",count:1,components:{"minecraft:custom_model_data":{floats:[3420006F]}}}}}] at @s align y run summon item_display ~ ~1.0 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_stand",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter_side"}},Rotation:[0.0f,0.0f],item_display:head,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} -execute as @e[type=armor_stand,tag=gm4_custom_crafter_stand,y_rotation=90,nbt={equipment:{head:{id:"minecraft:crafting_table",count:1,components:{"minecraft:custom_model_data":{floats:[3420006F]}}}}}] at @s align y run summon item_display ~ ~1.0 ~ {Tags:["gm4_no_edit","gm4_custom_crafter_display","gm4_machine_stand","smithed.entity","smithed.strict","gm4_new_machine"],CustomName:"gm4_custom_crafter_stand",item:{id:"crafting_table",count:1,components:{"minecraft:custom_model_data":"block/custom_crafter_side"}},Rotation:[90.0f,0.0f],item_display:head,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0.001f,0f],scale:[0.438,0.438,0.438]}} - -execute as @e[type=armor_stand,tag=gm4_custom_crafter_stand] at @s align xyz if entity @e[type=item_display,tag=gm4_custom_crafter_display,dy=0.001] run kill @s diff --git a/lib_custom_crafters/data/gm4_custom_crafters/function/versioning/check_item_tags.mcfunction b/lib_custom_crafters/data/gm4_custom_crafters/function/versioning/check_item_tags.mcfunction deleted file mode 100644 index ae7bdd8f7e..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/function/versioning/check_item_tags.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# checks each slot for item tags -# @s = crafter armor stand -# located at the center of the block -# run from gm4_custom_crafters:process_input/check_item via #gm4_custom_crafter:custom_item_checks - -execute if score gm4_custom_crafters load.status matches 3 if score gm4_custom_crafters_minor load.status matches 0 run function gm4_custom_crafters:process_input/check_item_tags diff --git a/lib_custom_crafters/data/gm4_custom_crafters/gm4_recipes/custom_crafter.json b/lib_custom_crafters/data/gm4_custom_crafters/gm4_recipes/custom_crafter.json deleted file mode 100644 index 60d44e7ebb..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/gm4_recipes/custom_crafter.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "input": { - "type": "shaped", - "recipe": [ - "IBI", - "CTC", - "CDC" - ], - "key": { - "I": { - "item": "minecraft:iron_ingot" - }, - "B": { - "item": "minecraft:light_blue_dye" - }, - "C": { - "item": "minecraft:cobblestone" - }, - "T": { - "item": "minecraft:crafting_table" - }, - "D": { - "item": "minecraft:dropper" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_custom_crafters:items/custom_crafter", - "count": 1 - } - } -} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/gm4_recipes/custom_crafter_dropper.json b/lib_custom_crafters/data/gm4_custom_crafters/gm4_recipes/custom_crafter_dropper.json deleted file mode 100644 index 2a7a83b7b0..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/gm4_recipes/custom_crafter_dropper.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "display", - "input": { - "type": "shaped", - "recipe": [ - "IBI", - "C C", - "C C" - ], - "key": { - "I": { - "item": "minecraft:iron_ingot" - }, - "B": { - "item": "minecraft:light_blue_dye" - }, - "C": { - "item": "minecraft:cobblestone" - } - } - }, - "output": { - "result": { - "type": "loot_table", - "name": "gm4_custom_crafters:items/custom_crafter", - "count": 1 - } - } -} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/guidebook/custom_crafters.json b/lib_custom_crafters/data/gm4_custom_crafters/guidebook/custom_crafters.json deleted file mode 100644 index 09d91e02e5..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/guidebook/custom_crafters.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "id": "custom_crafters", - "name": "Custom Crafters", - "module_type": "base", - "description": "Craft new items with a custom crafter!", - "wiki_link": "https://wiki.gm4.co/Custom_Crafters", - "icon": { - "id": "minecraft:crafting_table" - }, - "criteria": { - "obtain_iron_ingot": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_ingot" - ] - } - ] - } - }, - "obtain_dropper": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "minecraft:dropper" - ] - } - ] - } - }, - "create_custom_crafter": { - "trigger": "minecraft:tick", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type_specific": { - "type": "player", - "advancements": { - "gm4:custom_crafters": true - } - } - } - } - ] - } - }, - "open_custom_crafter": { - "trigger": "minecraft:default_block_use", - "conditions": { - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:dropper" - ], - "nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}" - } - } - } - ] - } - } - }, - "sections": [ - { - "name": "description", - "enable": [], - "requirements": [], - "pages": [ - [ - { - "insert": "title" - }, - { - "translate": "text.gm4.guidebook.custom_crafters.description", - "fallback": "Custom crafters can be created to craft new items. Iron and a dropper is needed to make this machine." - } - ] - ] - }, - { - "name": "creation", - "enable": [], - "requirements": [ - [ - "obtain_dropper" - ], - [ - "obtain_iron_ingot" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.custom_crafters.creation", - "fallback": "Arrange this recipe in a dropper, then use a crafting table on it." - }, - "\n", - { - "insert": "recipe", - "recipe": "gm4_custom_crafters:custom_crafter_dropper" - } - ] - ] - }, - { - "name": "crafting", - "enable": [], - "requirements": [ - [ - "open_custom_crafter", - "create_custom_crafter" - ] - ], - "pages": [ - [ - { - "translate": "text.gm4.guidebook.custom_crafters.crafting", - "fallback": "Custom crafters can also be crafted in a custom crafter:" - }, - "\n", - { - "insert": "recipe", - "recipe": "gm4_custom_crafters:custom_crafter" - } - ] - ], - "grants": [ - "creation" - ] - } - ] -} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/loot_table/crafting/custom_crafter.json b/lib_custom_crafters/data/gm4_custom_crafters/loot_table/crafting/custom_crafter.json deleted file mode 100644 index b465f4e16d..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/loot_table/crafting/custom_crafter.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 8, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4:air" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:loot_table", - "value": "gm4_custom_crafters:items/custom_crafter", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ] - } - ] - } - ] -} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/loot_table/items/custom_crafter.json b/lib_custom_crafters/data/gm4_custom_crafters/loot_table/items/custom_crafter.json deleted file mode 100644 index 7997894ed3..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/loot_table/items/custom_crafter.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "minecraft:player_head", - "functions": [ - { - "function": "set_components", - "components": { - "minecraft:custom_model_data": "gm4_custom_crafters:item/custom_crafter", - "minecraft:profile": "$gm4_custom_crafters:custom_crafter" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_machines:{id:'custom_crafter'}}" - }, - { - "function": "set_name", - "name": [ - { - "translate": "block.gm4.custom_crafter", - "fallback": "Custom Crafter", - "color": "white", - "italic": false - } - ] - } - ] - } - ] - } - ] -} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/skins/custom_crafter.png b/lib_custom_crafters/data/gm4_custom_crafters/skins/custom_crafter.png deleted file mode 100644 index 13edd79911..0000000000 Binary files a/lib_custom_crafters/data/gm4_custom_crafters/skins/custom_crafter.png and /dev/null differ diff --git a/lib_custom_crafters/data/gm4_custom_crafters/structure/test_platform.nbt b/lib_custom_crafters/data/gm4_custom_crafters/structure/test_platform.nbt deleted file mode 100644 index 7af1267ea2..0000000000 Binary files a/lib_custom_crafters/data/gm4_custom_crafters/structure/test_platform.nbt and /dev/null differ diff --git a/lib_custom_crafters/data/gm4_custom_crafters/tags/function/check_recipes.json b/lib_custom_crafters/data/gm4_custom_crafters/tags/function/check_recipes.json deleted file mode 100644 index 6c469b6b0b..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/tags/function/check_recipes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_custom_crafters:check_recipes" - ] -} diff --git a/lib_custom_crafters/data/gm4_custom_crafters/tags/function/custom_item_checks.json b/lib_custom_crafters/data/gm4_custom_crafters/tags/function/custom_item_checks.json deleted file mode 100644 index ba4a593e02..0000000000 --- a/lib_custom_crafters/data/gm4_custom_crafters/tags/function/custom_item_checks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_custom_crafters:versioning/check_item_tags" - ] -} diff --git a/lib_custom_crafters/data/gm4_machines/tags/function/destroy.json b/lib_custom_crafters/data/gm4_machines/tags/function/destroy.json deleted file mode 100644 index 521ffec7cc..0000000000 --- a/lib_custom_crafters/data/gm4_machines/tags/function/destroy.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_custom_crafters:machine/verify_destroy" - ] -} diff --git a/lib_custom_crafters/data/gm4_machines/tags/function/place_down.json b/lib_custom_crafters/data/gm4_machines/tags/function/place_down.json deleted file mode 100644 index c775692f87..0000000000 --- a/lib_custom_crafters/data/gm4_machines/tags/function/place_down.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_custom_crafters:machine/verify_place_down" - ] -} diff --git a/lib_custom_crafters/generate_item_tags.py b/lib_custom_crafters/generate_item_tags.py deleted file mode 100644 index 63e3c1c944..0000000000 --- a/lib_custom_crafters/generate_item_tags.py +++ /dev/null @@ -1,34 +0,0 @@ -from beet import Context, Function, Predicate -from beet.contrib.vanilla import Vanilla - -def beet_default(ctx: Context): - """Creates a predicate for every vanilla item tag and a function checking all of these predicates.""" - vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '1.21.5' - item_tags = vanilla.data.item_tags - item_tags = [ - id.removeprefix("minecraft:") - for id in item_tags - if "enchantable/sword" not in id - ] - - for id in item_tags: - ctx.data[f"gm4_custom_crafters:vanilla_item_tags/{id}"] = Predicate({ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "items": f"#minecraft:{id}" - } - } - } - }) - - ctx.data[f"gm4_custom_crafters:process_input/check_item_tags"] = Function([ - "# checks each slot for item tags", - "# @s = 344d47-4-4-4-f04ce104d forceload armorstand", - f"# run from gm4_custom_crafters:process_input/check_item via #gm4_custom_crafter:custom_item_checks", - "", - *[f"execute if predicate gm4_custom_crafters:vanilla_item_tags/{id} run data modify storage gm4_custom_crafters:temp/crafter item.item_tags.minecraft.\"{id}\" set value 1b" for id in item_tags], - ]) diff --git a/lib_custom_crafters/pack.png b/lib_custom_crafters/pack.png deleted file mode 100644 index aa3bda99f9..0000000000 Binary files a/lib_custom_crafters/pack.png and /dev/null differ diff --git a/lib_custom_crafters/pack.svg b/lib_custom_crafters/pack.svg deleted file mode 100644 index f0ef061f84..0000000000 --- a/lib_custom_crafters/pack.svg +++ /dev/null @@ -1,192 +0,0 @@ - - - - diff --git a/lib_lore/example_use/data/gm4_example_pack/functions/remove_examples.mcfunction b/lib_lore/example_use/data/gm4_example_pack/functions/remove_examples.mcfunction index 8139000270..53f77aff4c 100644 --- a/lib_lore/example_use/data/gm4_example_pack/functions/remove_examples.mcfunction +++ b/lib_lore/example_use/data/gm4_example_pack/functions/remove_examples.mcfunction @@ -29,7 +29,7 @@ data modify entity @e[type=item,limit=1,sort=nearest] Item.components."minecraft ## Removes lore from one item, and transfers it to another item # set inputs -summon item ~ ~ ~ {Tags:["item_1"],Item:{components:{"minecraft:lore":[{"text":"This line and the ones after will be searched for the TARGET_LINE"},{"text":"FILLER_LINE"},{"text":"TARGET_LINE"},{"text":"The line after this line will be removed, since start is 2 (2 after TARGET_LINE)"},{"text":"This line will be removed and appended to another item"},{"text":"This line will be removed and appended to another item since extra is -1"},{"text":"This line will be removed and appended to another item since extra is -1"}]}}} +summon item ~ ~ ~ {Tags:["item_1"],Item:{id:"stone",components:{"minecraft:lore":[{"text":"This line and the ones after will be searched for the TARGET_LINE"},{"text":"FILLER_LINE"},{"text":"TARGET_LINE"},{"text":"The line after this line will be removed, since start is 2 (2 after TARGET_LINE)"},{"text":"This line will be removed and appended to another item"},{"text":"This line will be removed and appended to another item since extra is -1"},{"text":"This line will be removed and appended to another item since extra is -1"}]}}} data modify storage gm4_lore:temp Source set from entity @e[type=item,tag=item_1,limit=1] Item.components."minecraft:lore" data modify storage gm4_lore:temp Target set value {"text":"TARGET_LINE"} scoreboard players set $start gm4_lore 2 diff --git a/lib_lore/mod.mcdoc b/lib_lore/mod.mcdoc new file mode 100644 index 0000000000..ae79eeb3a1 --- /dev/null +++ b/lib_lore/mod.mcdoc @@ -0,0 +1,13 @@ +use ::java::util::text::Text + +dispatch minecraft:storage[gm4_lore:temp] to struct { + /// A list of the lore that will be modified, typically this would be extracted directly from the item being modified, but can be set manually to a desired set of lore. + Source?: [Text], + /// A single json item (i.e. a single 'line' of lore) that will be found during the operations. This sets the line of lore to be searched, removed, inserted after, or replaced. + Target?: Text, + /// A list of the lore that will be inserted or replaced. This should not be set when simply searching or removing and will be ignored if set while using the search or remove operation. + Input?: [Text], + TempSource?: [Text], + TempInput?: [Text], + Dump?: [Text], +} diff --git a/lib_machines/mod.mcdoc b/lib_machines/mod.mcdoc new file mode 100644 index 0000000000..ff222f676d --- /dev/null +++ b/lib_machines/mod.mcdoc @@ -0,0 +1,10 @@ +use ::java::util::slot::SlottedItem + +dispatch minecraft:storage[gm4_machines:temp] to struct { + id?: string, + Items?: [SlottedItem], +} + +dispatch mcdoc:custom_data[gm4_machines] to struct { + id: string, +} diff --git a/lib_potion_tracking/mod.mcdoc b/lib_potion_tracking/mod.mcdoc new file mode 100644 index 0000000000..9f088306a7 --- /dev/null +++ b/lib_potion_tracking/mod.mcdoc @@ -0,0 +1,5 @@ +use ::java::world::entity::projectile::throwable::Potion + +dispatch minecraft:storage[gm4_potion_tracking:temp] to struct { + entity_data?: Potion, +} diff --git a/lib_trades/LICENSE.md b/lib_trades/LICENSE.md deleted file mode 100644 index 9b7e27766e..0000000000 --- a/lib_trades/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021 Gamemode 4 Development - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/lib_trades/README.md b/lib_trades/README.md deleted file mode 100644 index d116b96f97..0000000000 --- a/lib_trades/README.md +++ /dev/null @@ -1,82 +0,0 @@ -# lib_trades - -*lib_trades* is a mcfunction library that allows other data packs to easily add trades to Wandering Traders or to any Villager-like entity of their choice. The main focus of this library was to make it easy to use but still powerful enough to provide a satisfying interface. - -# Terminology and Functioning -To discuss the versatile nature of this library, a few terms should be known to the user: -- *trader*: A Villager-like mob (as of Minecraft 1.19 `wandering_trader` and `villager`) is called a *trader*. -- *trade option*: A single trade inside a trader's trade GUI is called a *trade option* (e.g. 5 Emeralds for one Bookshelf). -- *trade pool*: A virtual collection of trade options is called a *trade pool*. A trade pool occupies a single slot within a trader's trade GUI. - -The following paragraphs outline the functioning of these in an in-game environment. - -## Traders -Traders can be any entity that holds Villager-Style trades, including a trade GUI. As of Minecraft 1.19, these are `wandering_trader` and `villager` type entities. -*lib_trades* enables the user to add trades to these mobs in a standardized and simplified manner. This allows multiple data packs to use traders without having to worry about adding too many trades (which makes the trade GUI very long and hard to use) or causing conflicts by overwriting each other's trades.
- -Furthermore, this library allows trades to be generated from loot tables, enabling the versatile features of loot tables, such as random item counts or random item selection, within villager trades. Hardcoding trades, i.e. adding a trade without having to create a loot table for the trade, is also possible.
- -All meta-nbt for trades (such as experience rewards or max uses) is also exposed by the library and can be configured by the user. - -## Trade Options -A trade option represents a single trade and therefore consists of: -- an item being sold by the trader -- an item being bought by the trader -- a secondary item being bought by the trader -- trade meta data (such as max uses or experience rewards) -- a trade pool it belongs to - -When a trader is spawned and modified, its trade GUI will show a list of trade options. - -## Trade Pools -Trade pools are a virtual collection of trade options. From each trade pool added to a trader, one trade option is picked uniform-randomly to be on offer within the trader's trade GUI. -A trade pool consists of: -- some trade options that list this trade pool's id as their trade pool - -Trade pools are a virtual concept and are not visible to the player (apart from the fact that trade options are grouped into trade pools). - -# How to Use -*lib_trades* offers two ways to integrate itself into other data packs, via naturally spawned Wandering Traders or as a way to add trades to custom traders spawned by other data packs. These two use cases differ in the way the foreign data pack hooks into *lib_trades*. - -## Naturally Spawned Wandering Traders -To add trades to naturally spawning wandering traders, the foreign data pack must simply register its trades by adding a trade registration function to the function tag `#gm4_trades:register_trades`. See the *Registering Trades* section below on how to register trades.
- -All `wandering_trader` type entities that satisfy `[tag=!gm4_trader,tag=!smithed.entity]` and that have the `Offers.Recipes` NBT are automatically modified by the library every 10 seconds to receive registered trades. These tags can also be used to stop *lib_trades* from modifying a Wandering Trader in case this is unwanted. - -## Targeting External Traders -To add trades to traders spawned by a foreign data pack manually, a hook-in point is provided by *lib_trades*. This is **not required** for naturally spawned Wandering Traders, see the above section on naturally spawned Wandering Traders.
- -Adding trades to external trades is a two step process: -1. Load the desired trades -2. Call the hook-in point - -Details on how to load trades can found in the *Loading Trades* section below. Once the trades have been loaded, the function tag `#gm4_trades:modify_external_trader` must be called **as** the trader that should have the trades added to it. The two steps should happen right after each other and must happen within the same tick and in order. - -## Loading Trades -To load trades, a function that spawns trade options must be provided (splitting your trades over multiple functions is allowed, as long as all trade options are spawned within the same tick). "Loading Trades" equates to calling this function.
- -For each trade option a `trader_llama` entity must be spawned, the following NBT is recommended as a base:
-```summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[]}```
- -The tag `gm4_trade_option` is mandatory and is used by the library to identify available trade options. If the llama has to be targeted again after being spawned in (e.g. for populating its inventory using `/loot` or `/item replace`), the addition of a temporary tag is recommended. - -The `trader_llama` holds all information about the trade within its own NBT, following a special format: -- `Items[{Slot:0b}]` || `horse.0`: Contents of the `sell` tag of the trade option. -- `Items[{Slot:1b}]` || `horse.1`: Contents of the `buy` tag of the trade option. -- `Items[{Slot:2b}]` || `horse.2`: Contents of the `buyB` tag of the trade option. -- `body_armour_item.components."minecraft:custom_data".gm4_trades.options`: Trade option meta NBT, e.g. `maxUses`, `rewardXp`. All vanilla trade option meta tags are supported. Any custom tags inserted here are ignored, but not deleted.
- -These slots can, but don't have to, be filled explicitly in the summon command and may therefore be populated by loot tables using `/loot`, allowing the use of powerful loot table tools for trade generation. - -The item in `body_armour_item` has two special tags that are used to store trade option meta NBT: -- `body_armour_item.components."minecraft:custom_data".gm4_trades.options` holds vanilla metadata, as explained above. -- `body_armour_item.components."minecraft:custom_data".gm4_trades.pool` holds a string known as the trade option's "trade pool name". This should be a namespaced string, which identifies multiple trade options that should be shown as one trade option on the Wandering Trader. Trade options with an omitted `pool` tag are considered to be in an unnamed trade pool each and are always displayed as their own, standalone trade option in the Wandering Trader. - -Not summoning a `trader_llama` for a trade option will result in the trade option being omitted. - -## Registering Trades -Registering trades is only necessary when naturally spawned Wandering Traders are supposed to receive them, it is **not** necessary for adding trades to external traders.
-To register trades, the function that loads the trades must be added to the `#gm4_trades:register_trades` function tag. - -## License -This library, and the contents of the `lib_forceload` directory on the [github repository](https://github.com/Gamemode4Dev/GM4_data packs), is licensed under the MIT License. diff --git a/lib_trades/beet.yaml b/lib_trades/beet.yaml deleted file mode 100644 index 28ee2ad17b..0000000000 --- a/lib_trades/beet.yaml +++ /dev/null @@ -1,24 +0,0 @@ -id: gm4_trades -name: Gamemode 4 Trades -version: 1.6.X -description: Allows other datapacks to easily add trades to Wandering Traders or to any Villager-like entity. - -data_pack: - load: - data: data - -pipeline: - - gm4.plugins.extend.library - -meta: - gm4: - versioning: - schedule_loops: [main] - extra_version_injections: - functions: - - wandering_trader/resolve_modify_external - smithed: - pack_id: gm4_lib_trades - credits: - Creator: - - Bloo diff --git a/lib_trades/data/gm4_trades/function/load.mcfunction b/lib_trades/data/gm4_trades/function/load.mcfunction deleted file mode 100644 index 4913638993..0000000000 --- a/lib_trades/data/gm4_trades/function/load.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -scoreboard objectives add gm4_trades_data dummy - -schedule function gm4_trades:main 1t replace -schedule clear gm4_trades-1.0:main diff --git a/lib_trades/data/gm4_trades/function/main.mcfunction b/lib_trades/data/gm4_trades/function/main.mcfunction deleted file mode 100644 index c585cf3dd3..0000000000 --- a/lib_trades/data/gm4_trades/function/main.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# MAIN -# scheduled from gm4_trades:load - -# execute on wandering traders -execute as @e[type=wandering_trader,tag=!gm4_trader,tag=!smithed.entity] if data entity @s Offers.Recipes at @s run function gm4_trades:wandering_trader/modify - -# loop -schedule function gm4_trades:main 10s diff --git a/lib_trades/data/gm4_trades/function/wandering_trader/append_trade.mcfunction b/lib_trades/data/gm4_trades/function/wandering_trader/append_trade.mcfunction deleted file mode 100644 index beba66839c..0000000000 --- a/lib_trades/data/gm4_trades/function/wandering_trader/append_trade.mcfunction +++ /dev/null @@ -1,25 +0,0 @@ -# adds trades from storage into wandering traders -# @s = a wandering trader without the gm4_trader tag (aka without the new trades) -# at @s -# run from gm4_trades:wandering_trader/create_pool - -# select random trade -data modify storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data set from entity @e[type=trader_llama,tag=gm4_pooled_trade_option,limit=1,sort=random] {} - -# interpret trade data (equipment.body: metadata; Items[{Slot:0b}]: sell; Items[{Slot:1b}]: buy; Items[{Slot:2b}]: buyB) -data modify storage gm4_trades:temp/wandering_trader/next_trade trade set from storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data.equipment.body.components."minecraft:custom_data".gm4_trades.options -data modify storage gm4_trades:temp/wandering_trader/next_trade trade.sell set from storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data.Items[{Slot:0b}] -data modify storage gm4_trades:temp/wandering_trader/next_trade trade.buy set from storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data.Items[{Slot:1b}] -data modify storage gm4_trades:temp/wandering_trader/next_trade trade.buyB set from storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data.Items[{Slot:2b}] - -# kill llama without drops and clean up loot table -execute as @e[type=trader_llama,tag=gm4_pooled_trade_option] run data merge entity @s {Health:0,DeathTime:19} -data remove storage gm4_trades:temp/wandering_trader/unprocessed_trade_data llama_data - -# add trade -data modify entity @s Offers.Recipes append from storage gm4_trades:temp/wandering_trader/next_trade trade -data remove storage gm4_trades:temp/wandering_trader/next_trade trade - -# try to create another pool if more trade options exists -scoreboard players reset $pools_differ gm4_trades_data -execute if entity @e[type=trader_llama,tag=gm4_trade_option,limit=1] run function gm4_trades:wandering_trader/create_pool diff --git a/lib_trades/data/gm4_trades/function/wandering_trader/create_pool.mcfunction b/lib_trades/data/gm4_trades/function/wandering_trader/create_pool.mcfunction deleted file mode 100644 index ad61211b34..0000000000 --- a/lib_trades/data/gm4_trades/function/wandering_trader/create_pool.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# opens a new trade pool -# @s = a wandering trader without the gm4_trader tag (aka without the new trades) -# at position of wandering trader -# run from gm4_trades:wandering_trader/modify and gm4_trades:wandering_trader/modify_external - -# start pooling at an unpooled option -execute as @e[type=trader_llama,tag=gm4_trade_option,limit=1,sort=arbitrary] run function gm4_trades:wandering_trader/pool/initialize - -# add pooled trades to trader -function gm4_trades:wandering_trader/append_trade diff --git a/lib_trades/data/gm4_trades/function/wandering_trader/modify.mcfunction b/lib_trades/data/gm4_trades/function/wandering_trader/modify.mcfunction deleted file mode 100644 index f25eea0f45..0000000000 --- a/lib_trades/data/gm4_trades/function/wandering_trader/modify.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -# collects trades added by various datapacks and adds them to the trader. Marks the trader as having received those trades. -# @s = a wandering trader without the gm4_trader tag (aka without the new trades) -# at @s -# scheduled from gm4_trades:main - -# generate trades -function #gm4_trades:register_trades - -# read-in trade pools -function gm4_trades:wandering_trader/create_pool - -# remember trader was edited -tag @s add gm4_trader - -# reset fake player -scoreboard players reset $pools_differ gm4_trades_data diff --git a/lib_trades/data/gm4_trades/function/wandering_trader/modify_external.mcfunction b/lib_trades/data/gm4_trades/function/wandering_trader/modify_external.mcfunction deleted file mode 100644 index 985c6dace7..0000000000 --- a/lib_trades/data/gm4_trades/function/wandering_trader/modify_external.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# Hook-in point for other datapacks to add trades to a targeted villager-like mob. Trades must be loaded first (see README for more details). -# @s = a villager-like mob to receive trades -# at @s -# called by function tag gm4_trades:modify_external_trader - -# read-in trade pools -function gm4_trades:wandering_trader/create_pool - -# remember trader was edited -tag @s add gm4_trader - -# reset fake player -scoreboard players reset $pools_differ gm4_trades_data diff --git a/lib_trades/data/gm4_trades/function/wandering_trader/pool/collect_trades.mcfunction b/lib_trades/data/gm4_trades/function/wandering_trader/pool/collect_trades.mcfunction deleted file mode 100644 index e98df921ba..0000000000 --- a/lib_trades/data/gm4_trades/function/wandering_trader/pool/collect_trades.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# compares all trade options against this pools name and marks matching ones as belonging to this pool -# @s = the next trade option in line -# at position of wandering trader -# run from gm4_trades:wandering_trader/pool/initialize, loops itself - -# remember this option was processed -tag @s add gm4_processed_trade_option - -# compare current fixed pool id to pool id of next unprocessed trade option ($pools_differ == 1 if next trade does not exist or is in different trade pool ;;; == 0 if pool names match) -scoreboard players set $pools_differ gm4_trades_data 1 -data modify storage gm4_trades:temp/wandering_trader/comparison pool set from storage gm4_trades:temp/wandering_trader/current_tradepool pool -execute if data entity @s equipment.body.components."minecraft:custom_data".gm4_trades.pool store success score $pools_differ gm4_trades_data run data modify storage gm4_trades:temp/wandering_trader/comparison pool set from entity @s equipment.body.components."minecraft:custom_data".gm4_trades.pool -data remove storage gm4_trades:temp/wandering_trader/comparison pool - -# if trade pools didnt differ, keep looping until they do. -execute if score $pools_differ gm4_trades_data matches 0 run tag @s add gm4_pooled_trade_option -execute as @e[type=trader_llama,tag=gm4_trade_option,tag=!gm4_processed_trade_option,limit=1,sort=arbitrary] run function gm4_trades:wandering_trader/pool/collect_trades diff --git a/lib_trades/data/gm4_trades/function/wandering_trader/pool/initialize.mcfunction b/lib_trades/data/gm4_trades/function/wandering_trader/pool/initialize.mcfunction deleted file mode 100644 index 44a41aea24..0000000000 --- a/lib_trades/data/gm4_trades/function/wandering_trader/pool/initialize.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -# initializes the newly created pool with a pool name -# @s = the first trade option in the pool (arbitrary sorting) -# at position of wandering trader -# run from gm4_trades:wandering_trader/create_pool - -# mark trade option as pooled and processed, to prevent self comparison -tag @s add gm4_pooled_trade_option -tag @s add gm4_processed_trade_option - -# read current trade pool name space -data modify storage gm4_trades:temp/wandering_trader/current_tradepool pool set from entity @s equipment.body.components."minecraft:custom_data".gm4_trades.pool - -# compare to next trade option's pool -execute as @e[type=trader_llama,tag=gm4_trade_option,tag=!gm4_pooled_trade_option,limit=1,sort=arbitrary] run function gm4_trades:wandering_trader/pool/collect_trades - -# clean up tag and storage (tag cleanup is very important here!) -tag @e[type=trader_llama,tag=gm4_trade_option] remove gm4_processed_trade_option -data remove storage gm4_trades:temp/wandering_trader/current_tradepool pool diff --git a/lib_trades/data/gm4_trades/function/wandering_trader/resolve_modify_external.mcfunction b/lib_trades/data/gm4_trades/function/wandering_trader/resolve_modify_external.mcfunction deleted file mode 100644 index dc205576d4..0000000000 --- a/lib_trades/data/gm4_trades/function/wandering_trader/resolve_modify_external.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# Datapack hook-in point. Validates the library version in case multiple versions are installed. -# run from function tag gm4_trades:modify_external_trader - -execute if score gm4_trades load.status matches 1 if score gm4_trades_minor load.status matches 3 run function gm4_trades:wandering_trader/modify_external diff --git a/lib_trades/data/gm4_trades/tags/function/modify_external_trader.json b/lib_trades/data/gm4_trades/tags/function/modify_external_trader.json deleted file mode 100644 index dd1630c1b2..0000000000 --- a/lib_trades/data/gm4_trades/tags/function/modify_external_trader.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gm4_trades:wandering_trader/resolve_modify_external" - ] -} diff --git a/lib_trades/data/gm4_trades/tags/function/register_trades.json b/lib_trades/data/gm4_trades/tags/function/register_trades.json deleted file mode 100644 index a956ec088a..0000000000 --- a/lib_trades/data/gm4_trades/tags/function/register_trades.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "values": [ - ] -} diff --git a/lib_trades/example_use/data/example_pack/functions/wandering_trader/register_trade.mcfunction b/lib_trades/example_use/data/example_pack/functions/wandering_trader/register_trade.mcfunction deleted file mode 100644 index 8fdd34c56d..0000000000 --- a/lib_trades/example_use/data/example_pack/functions/wandering_trader/register_trade.mcfunction +++ /dev/null @@ -1,34 +0,0 @@ -# Adds trades to be added to wandering traders. The base randomly will select one trade from each trade pool to be added to a wandering trader. -# @s = a wandering trader -# at @s -# called via function tag #gm4_trades:register_trades - -# a trade option with hardcoded buy, buyB, sell and options. The 'pool' tag is omitted, resulting in an unnamed pool. Therefore this trade will always be listed as its own option, and other packs can not add items to this trade pool. -# Items[{Slot:2b}] is used for the item being sold (by the wandering trader), Items[{Slot:3b}] for the item being bought (by the wandering trader) and Items[{Slot:4b}] for the secondary buy item. -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{id:"minecraft:grass_block",count:1,Slot:2b},{id:"minecraft:emerald",count:1,Slot:3b},{id:"minecraft:wheat_seeds",count:1,Slot:4b}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:8,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}} - -# another hardcoded trade as in line 7, but this one only appears for traders in the end -execute if predicate example_pack:the_end run summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{id:"minecraft:end_stone",count:1,Slot:2b},{id:"minecraft:emerald",count:1,Slot:3b},{}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{pool:"example_pack:foo_trades",options:{maxUses:8,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}} - -# a trade in the trade pool "example_pack:foo_trades" -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{id:"minecraft:spawner",count:1,Slot:2b},{id:"minecraft:emerald",count:64,Slot:3b},{}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{pool:"example_pack:foo_trades",options:{maxUses:1,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}} - -# a trade that uses a loot table for the sell and the buy option -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_new_trade_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:24,rewardXp:0b}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_new_trade_option] horse.0 loot example_pack:blocks -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_new_trade_option] horse.1 loot example_pack:shinies -tag @e[type=trader_llama] remove gm4_new_trade_option - -# another trade in the trade pool "example_pack:foo_trades" -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_new_trade_option"],Items:[{id:"minecraft:rotten_flesh",count:1,Slot:2b}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{pool:"example_pack:foo_trades",options:{maxUses:1,rewardXp:1b,xp:24,priceMultiplier:0.1f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_new_trade_option] horse.0 loot example_pack:spawn_eggs -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_new_trade_option] horse.1 loot example_pack:shinies -tag @e[type=trader_llama] remove gm4_new_trade_option - -# a trade in the trade pool "example_pack:bar_trades" -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option"],Items:[{id:"minecraft:slime_block",count:1,Slot:2b},{id:"minecraft:emerald",count:1,Slot:3b},{}],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{pool:"example_pack:bar_trades",options:{maxUses:1,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}} - -# a trade in the trade pool "example_pack:bar_trades", that uses one loot table to populate the entire trade -summon trader_llama ~ 0 ~ {Silent:1b,NoGravity:1b,Invulnerable:1b,ChestedHorse:1b,Variant:0,Strength:1,DespawnDelay:1,Tags:["gm4_trade_option","gm4_new_trade_option"],Items:[],equipment:{body:{id:"minecraft:light_blue_carpet",count:1,components:{"minecraft:custom_data":{gm4_trades:{options:{maxUses:2,rewardXp:1b,xp:1,priceMultiplier:0.05f}}}}}}} -loot replace entity @e[type=trader_llama,limit=1,tag=gm4_new_trade_option] horse.0 loot example_pack:pickaxe_trade -tag @e[type=trader_llama] remove gm4_new_trade_option diff --git a/lib_trades/example_use/data/example_pack/loot_tables/blocks.json b/lib_trades/example_use/data/example_pack/loot_tables/blocks.json deleted file mode 100644 index 81f43900dd..0000000000 --- a/lib_trades/example_use/data/example_pack/loot_tables/blocks.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:stone" - }, - { - "type": "minecraft:item", - "name": "minecraft:diorite" - }, - { - "type": "minecraft:item", - "name": "minecraft:granite" - }, - { - "type": "minecraft:item", - "name": "minecraft:andesite" - } - ] - } - ] -} diff --git a/lib_trades/example_use/data/example_pack/loot_tables/pickaxe_trade.json b/lib_trades/example_use/data/example_pack/loot_tables/pickaxe_trade.json deleted file mode 100644 index aa9e1530da..0000000000 --- a/lib_trades/example_use/data/example_pack/loot_tables/pickaxe_trade.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:diamond_chestplate" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 8 - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:diamond" - } - ] - } - ] -} diff --git a/lib_trades/example_use/data/example_pack/loot_tables/shinies.json b/lib_trades/example_use/data/example_pack/loot_tables/shinies.json deleted file mode 100644 index 971c0f0df3..0000000000 --- a/lib_trades/example_use/data/example_pack/loot_tables/shinies.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:gold_ingot" - }, - { - "type": "minecraft:item", - "name": "minecraft:gold_nugget" - } - ] - } - ] -} diff --git a/lib_trades/example_use/data/example_pack/loot_tables/spawn_eggs.json b/lib_trades/example_use/data/example_pack/loot_tables/spawn_eggs.json deleted file mode 100644 index 50cf1a6d0a..0000000000 --- a/lib_trades/example_use/data/example_pack/loot_tables/spawn_eggs.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:zombie_spawn_egg" - }, - { - "type": "minecraft:item", - "name": "minecraft:enderman_spawn_egg" - }, - { - "type": "minecraft:item", - "name": "minecraft:skeleton_spawn_egg" - }, - { - "type": "minecraft:item", - "name": "minecraft:creeper_spawn_egg" - } - ] - } - ] -} diff --git a/lib_trades/example_use/data/example_pack/predicates/the_end.json b/lib_trades/example_use/data/example_pack/predicates/the_end.json deleted file mode 100644 index 45fc07068f..0000000000 --- a/lib_trades/example_use/data/example_pack/predicates/the_end.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "condition": "minecraft:location_check", - "predicate": { - "dimension": "minecraft:the_end" - } -} diff --git a/lib_trades/example_use/data/gm4_trades/tags/functions/register_trades.json b/lib_trades/example_use/data/gm4_trades/tags/functions/register_trades.json deleted file mode 100644 index 6c681d9f9e..0000000000 --- a/lib_trades/example_use/data/gm4_trades/tags/functions/register_trades.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "example_pack:wandering_trader/register_trade" - ] -} \ No newline at end of file diff --git a/lib_trades/example_use/data/load/tags/functions/example_pack.json b/lib_trades/example_use/data/load/tags/functions/example_pack.json deleted file mode 100644 index eb3747527d..0000000000 --- a/lib_trades/example_use/data/load/tags/functions/example_pack.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#load:gm4_trades" - ] -} diff --git a/lib_trades/example_use/data/load/tags/functions/load.json b/lib_trades/example_use/data/load/tags/functions/load.json deleted file mode 100644 index ee22d9cc75..0000000000 --- a/lib_trades/example_use/data/load/tags/functions/load.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#load:example_pack" - ] -} diff --git a/lib_trades/example_use/pack.mcmeta b/lib_trades/example_use/pack.mcmeta deleted file mode 100644 index fbc78e6519..0000000000 --- a/lib_trades/example_use/pack.mcmeta +++ /dev/null @@ -1,22 +0,0 @@ -{ - "pack": { - "pack_format": 6, - "description": [ - "Example Pack", - "\n", - { - "text": "An usage example of lib_trades", - "color": "gold" - } - ] - }, - "credits": { - "Creator": [ - [ - "Bloo", - "https://twitter.com/Bloo_dev" - ] - ] - } -} - diff --git a/lib_trades/pack.png b/lib_trades/pack.png deleted file mode 100644 index c64d0ce5e3..0000000000 Binary files a/lib_trades/pack.png and /dev/null differ diff --git a/lib_trades/pack.svg b/lib_trades/pack.svg deleted file mode 100644 index 3997b8d94b..0000000000 --- a/lib_trades/pack.svg +++ /dev/null @@ -1,222 +0,0 @@ - - - - diff --git a/lib_trees/data/gm4_trees/function/sapling/place_sapling.mcfunction b/lib_trees/data/gm4_trees/function/sapling/place_sapling.mcfunction index 5de5244476..3e79fc4b11 100644 --- a/lib_trees/data/gm4_trees/function/sapling/place_sapling.mcfunction +++ b/lib_trees/data/gm4_trees/function/sapling/place_sapling.mcfunction @@ -11,4 +11,4 @@ scoreboard players set $ray gm4_tree_data 500 execute store success score $found_sapling gm4_tree_data anchored eyes positioned ^ ^ ^ run function gm4_trees:sapling/find_sapling # if no sapling was found, check blocks adjacent to the looking vector -execute unless score $found_sapling gm4_trades_data matches 1 anchored eyes positioned ^ ^ ^ run function gm4_trees:sapling/find_adjacent_sapling +execute unless score $found_sapling gm4_tree_data matches 1 anchored eyes positioned ^ ^ ^ run function gm4_trees:sapling/find_adjacent_sapling diff --git a/lib_trees/example_use/data/gm4_trees_example/loot_tables/items/apple_tree_sapling.json b/lib_trees/example_use/data/gm4_trees_example/loot_tables/items/apple_tree_sapling.json index da89480ccd..5536b1bca6 100644 --- a/lib_trees/example_use/data/gm4_trees_example/loot_tables/items/apple_tree_sapling.json +++ b/lib_trees/example_use/data/gm4_trees_example/loot_tables/items/apple_tree_sapling.json @@ -10,10 +10,10 @@ "functions": [ { "function": "minecraft:set_name", + "target": "item_name", "name": { "text": "Apple Tree Sapling", - "italic": false, - "color": "white" + "italic": false } }, { diff --git a/lib_trees/mod.mcdoc b/lib_trees/mod.mcdoc new file mode 100644 index 0000000000..eb073fd51a --- /dev/null +++ b/lib_trees/mod.mcdoc @@ -0,0 +1,11 @@ +dispatch minecraft:storage[gm4_trees:temp] to struct { + sapling?: struct { + type: string, + }, +} + +dispatch mcdoc:custom_data[gm4_trees] to struct { + item?: struct { + type: string, + }, +} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/badlands.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/badlands.json deleted file mode 100644 index f0fc8e318d..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/badlands.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/badlands", - "creature_spawn_probability": 0.03, - "downfall": 0.0, - "effects": { - "fog_color": 12638463, - "foliage_color": 10387789, - "grass_color": 9470285, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/badlands", - "#minecraft:lakes/in_biome/badlands", - "#minecraft:local_modifications/in_biome/badlands", - "#minecraft:underground_structures/in_biome/badlands", - "#minecraft:surface_structures/in_biome/badlands", - "#minecraft:strongholds/in_biome/badlands", - "#minecraft:underground_ores/in_biome/badlands", - "#minecraft:underground_decoration/in_biome/badlands", - "#minecraft:fluid_springs/in_biome/badlands", - "#minecraft:vegetal_decoration/in_biome/badlands", - "#minecraft:top_layer_modification/in_biome/badlands" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:armadillo", - "maxCount": 2, - "minCount": 1, - "weight": 6 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/bamboo_jungle.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/bamboo_jungle.json deleted file mode 100644 index e7f1a262a6..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/bamboo_jungle.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/bamboo_jungle", - "downfall": 0.9, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.bamboo_jungle" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7842047, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/bamboo_jungle", - "#minecraft:lakes/in_biome/bamboo_jungle", - "#minecraft:local_modifications/in_biome/bamboo_jungle", - "#minecraft:underground_structures/in_biome/bamboo_jungle", - "#minecraft:surface_structures/in_biome/bamboo_jungle", - "#minecraft:strongholds/in_biome/bamboo_jungle", - "#minecraft:underground_ores/in_biome/bamboo_jungle", - "#minecraft:underground_decoration/in_biome/bamboo_jungle", - "#minecraft:fluid_springs/in_biome/bamboo_jungle", - "#minecraft:vegetal_decoration/in_biome/bamboo_jungle", - "#minecraft:top_layer_modification/in_biome/bamboo_jungle" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:parrot", - "maxCount": 2, - "minCount": 1, - "weight": 40 - }, - { - "type": "minecraft:panda", - "maxCount": 2, - "minCount": 1, - "weight": 80 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:ocelot", - "maxCount": 1, - "minCount": 1, - "weight": 2 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.95 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/basalt_deltas.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/basalt_deltas.json deleted file mode 100644 index d08eb025fd..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/basalt_deltas.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/basalt_deltas", - "downfall": 0.0, - "effects": { - "additions_sound": { - "sound": "minecraft:ambient.basalt_deltas.additions", - "tick_chance": 0.0111 - }, - "ambient_sound": "minecraft:ambient.basalt_deltas.loop", - "fog_color": 6840176, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.basalt_deltas.mood", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.nether.basalt_deltas" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "particle": { - "options": { - "type": "minecraft:white_ash" - }, - "probability": 0.118093334 - }, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/basalt_deltas", - "#minecraft:lakes/in_biome/basalt_deltas", - "#minecraft:local_modifications/in_biome/basalt_deltas", - "#minecraft:underground_structures/in_biome/basalt_deltas", - "#minecraft:surface_structures/in_biome/basalt_deltas", - "#minecraft:strongholds/in_biome/basalt_deltas", - "#minecraft:underground_ores/in_biome/basalt_deltas", - "#minecraft:underground_decoration/in_biome/basalt_deltas", - "#minecraft:fluid_springs/in_biome/basalt_deltas", - "#minecraft:vegetal_decoration/in_biome/basalt_deltas", - "#minecraft:top_layer_modification/in_biome/basalt_deltas" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [ - { - "type": "minecraft:strider", - "maxCount": 2, - "minCount": 1, - "weight": 60 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:ghast", - "maxCount": 1, - "minCount": 1, - "weight": 40 - }, - { - "type": "minecraft:magma_cube", - "maxCount": 5, - "minCount": 2, - "weight": 100 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/beach.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/beach.json deleted file mode 100644 index 172f115cbd..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/beach.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/beach", - "downfall": 0.4, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 7907327, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/beach", - "#minecraft:lakes/in_biome/beach", - "#minecraft:local_modifications/in_biome/beach", - "#minecraft:underground_structures/in_biome/beach", - "#minecraft:surface_structures/in_biome/beach", - "#minecraft:strongholds/in_biome/beach", - "#minecraft:underground_ores/in_biome/beach", - "#minecraft:underground_decoration/in_biome/beach", - "#minecraft:fluid_springs/in_biome/beach", - "#minecraft:vegetal_decoration/in_biome/beach", - "#minecraft:top_layer_modification/in_biome/beach" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:turtle", - "maxCount": 5, - "minCount": 2, - "weight": 5 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.8 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/birch_forest.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/birch_forest.json deleted file mode 100644 index 44c5a15db7..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/birch_forest.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/birch_forest", - "downfall": 0.6, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.forest" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8037887, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/birch_forest", - "#minecraft:lakes/in_biome/birch_forest", - "#minecraft:local_modifications/in_biome/birch_forest", - "#minecraft:underground_structures/in_biome/birch_forest", - "#minecraft:surface_structures/in_biome/birch_forest", - "#minecraft:strongholds/in_biome/birch_forest", - "#minecraft:underground_ores/in_biome/birch_forest", - "#minecraft:underground_decoration/in_biome/birch_forest", - "#minecraft:fluid_springs/in_biome/birch_forest", - "#minecraft:vegetal_decoration/in_biome/birch_forest", - "#minecraft:top_layer_modification/in_biome/birch_forest" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.6 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/cherry_grove.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/cherry_grove.json deleted file mode 100644 index b89b4c3eff..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/cherry_grove.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/cherry_grove", - "downfall": 0.8, - "effects": { - "fog_color": 12638463, - "foliage_color": 11983713, - "grass_color": 11983713, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.cherry_grove" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 6141935, - "water_fog_color": 6141935 - }, - "features": [ - "#minecraft:raw_generation/in_biome/cherry_grove", - "#minecraft:lakes/in_biome/cherry_grove", - "#minecraft:local_modifications/in_biome/cherry_grove", - "#minecraft:underground_structures/in_biome/cherry_grove", - "#minecraft:surface_structures/in_biome/cherry_grove", - "#minecraft:strongholds/in_biome/cherry_grove", - "#minecraft:underground_ores/in_biome/cherry_grove", - "#minecraft:underground_decoration/in_biome/cherry_grove", - "#minecraft:fluid_springs/in_biome/cherry_grove", - "#minecraft:vegetal_decoration/in_biome/cherry_grove", - "#minecraft:top_layer_modification/in_biome/cherry_grove" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:pig", - "maxCount": 2, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:rabbit", - "maxCount": 6, - "minCount": 2, - "weight": 2 - }, - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 2, - "weight": 2 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/cold_ocean.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/cold_ocean.json deleted file mode 100644 index 29b02227e6..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/cold_ocean.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/cold_ocean", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 4020182, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/cold_ocean", - "#minecraft:lakes/in_biome/cold_ocean", - "#minecraft:local_modifications/in_biome/cold_ocean", - "#minecraft:underground_structures/in_biome/cold_ocean", - "#minecraft:surface_structures/in_biome/cold_ocean", - "#minecraft:strongholds/in_biome/cold_ocean", - "#minecraft:underground_ores/in_biome/cold_ocean", - "#minecraft:underground_decoration/in_biome/cold_ocean", - "#minecraft:fluid_springs/in_biome/cold_ocean", - "#minecraft:vegetal_decoration/in_biome/cold_ocean", - "#minecraft:top_layer_modification/in_biome/cold_ocean" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:cod", - "maxCount": 6, - "minCount": 3, - "weight": 15 - }, - { - "type": "minecraft:salmon", - "maxCount": 5, - "minCount": 1, - "weight": 15 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 4, - "minCount": 1, - "weight": 3 - } - ] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/crimson_forest.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/crimson_forest.json deleted file mode 100644 index d5e64cc99b..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/crimson_forest.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/crimson_forest", - "downfall": 0.0, - "effects": { - "additions_sound": { - "sound": "minecraft:ambient.crimson_forest.additions", - "tick_chance": 0.0111 - }, - "ambient_sound": "minecraft:ambient.crimson_forest.loop", - "fog_color": 3343107, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.crimson_forest.mood", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.nether.crimson_forest" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.025 - }, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/crimson_forest", - "#minecraft:lakes/in_biome/crimson_forest", - "#minecraft:local_modifications/in_biome/crimson_forest", - "#minecraft:underground_structures/in_biome/crimson_forest", - "#minecraft:surface_structures/in_biome/crimson_forest", - "#minecraft:strongholds/in_biome/crimson_forest", - "#minecraft:underground_ores/in_biome/crimson_forest", - "#minecraft:underground_decoration/in_biome/crimson_forest", - "#minecraft:fluid_springs/in_biome/crimson_forest", - "#minecraft:vegetal_decoration/in_biome/crimson_forest", - "#minecraft:top_layer_modification/in_biome/crimson_forest" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [ - { - "type": "minecraft:strider", - "maxCount": 2, - "minCount": 1, - "weight": 60 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:zombified_piglin", - "maxCount": 4, - "minCount": 2, - "weight": 1 - }, - { - "type": "minecraft:hoglin", - "maxCount": 4, - "minCount": 3, - "weight": 9 - }, - { - "type": "minecraft:piglin", - "maxCount": 4, - "minCount": 3, - "weight": 5 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/dark_forest.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/dark_forest.json deleted file mode 100644 index 2f3b8e4346..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/dark_forest.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/dark_forest", - "downfall": 0.8, - "effects": { - "dry_foliage_color": 8082228, - "fog_color": 12638463, - "grass_color_modifier": "dark_forest", - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.forest" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7972607, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/dark_forest", - "#minecraft:lakes/in_biome/dark_forest", - "#minecraft:local_modifications/in_biome/dark_forest", - "#minecraft:underground_structures/in_biome/dark_forest", - "#minecraft:surface_structures/in_biome/dark_forest", - "#minecraft:strongholds/in_biome/dark_forest", - "#minecraft:underground_ores/in_biome/dark_forest", - "#minecraft:underground_decoration/in_biome/dark_forest", - "#minecraft:fluid_springs/in_biome/dark_forest", - "#minecraft:vegetal_decoration/in_biome/dark_forest", - "#minecraft:top_layer_modification/in_biome/dark_forest" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.7 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_cold_ocean.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_cold_ocean.json deleted file mode 100644 index 1111e28903..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_cold_ocean.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/deep_cold_ocean", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 4020182, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/deep_cold_ocean", - "#minecraft:lakes/in_biome/deep_cold_ocean", - "#minecraft:local_modifications/in_biome/deep_cold_ocean", - "#minecraft:underground_structures/in_biome/deep_cold_ocean", - "#minecraft:surface_structures/in_biome/deep_cold_ocean", - "#minecraft:strongholds/in_biome/deep_cold_ocean", - "#minecraft:underground_ores/in_biome/deep_cold_ocean", - "#minecraft:underground_decoration/in_biome/deep_cold_ocean", - "#minecraft:fluid_springs/in_biome/deep_cold_ocean", - "#minecraft:vegetal_decoration/in_biome/deep_cold_ocean", - "#minecraft:top_layer_modification/in_biome/deep_cold_ocean" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:cod", - "maxCount": 6, - "minCount": 3, - "weight": 15 - }, - { - "type": "minecraft:salmon", - "maxCount": 5, - "minCount": 1, - "weight": 15 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 4, - "minCount": 1, - "weight": 3 - } - ] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_dark.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_dark.json deleted file mode 100644 index 6115364853..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_dark.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/deep_dark", - "downfall": 0.4, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.deep_dark" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7907327, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/deep_dark", - "#minecraft:lakes/in_biome/deep_dark", - "#minecraft:local_modifications/in_biome/deep_dark", - "#minecraft:underground_structures/in_biome/deep_dark", - "#minecraft:surface_structures/in_biome/deep_dark", - "#minecraft:strongholds/in_biome/deep_dark", - "#minecraft:underground_ores/in_biome/deep_dark", - "#minecraft:underground_decoration/in_biome/deep_dark", - "#minecraft:fluid_springs/in_biome/deep_dark", - "#minecraft:vegetal_decoration/in_biome/deep_dark", - "#minecraft:top_layer_modification/in_biome/deep_dark" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.8 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_frozen_ocean.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_frozen_ocean.json deleted file mode 100644 index 07e42a81af..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_frozen_ocean.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/deep_frozen_ocean", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 3750089, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/deep_frozen_ocean", - "#minecraft:lakes/in_biome/deep_frozen_ocean", - "#minecraft:local_modifications/in_biome/deep_frozen_ocean", - "#minecraft:underground_structures/in_biome/deep_frozen_ocean", - "#minecraft:surface_structures/in_biome/deep_frozen_ocean", - "#minecraft:strongholds/in_biome/deep_frozen_ocean", - "#minecraft:underground_ores/in_biome/deep_frozen_ocean", - "#minecraft:underground_decoration/in_biome/deep_frozen_ocean", - "#minecraft:fluid_springs/in_biome/deep_frozen_ocean", - "#minecraft:vegetal_decoration/in_biome/deep_frozen_ocean", - "#minecraft:top_layer_modification/in_biome/deep_frozen_ocean" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:polar_bear", - "maxCount": 2, - "minCount": 1, - "weight": 1 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:salmon", - "maxCount": 5, - "minCount": 1, - "weight": 15 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 4, - "minCount": 1, - "weight": 1 - } - ] - }, - "temperature": 0.5, - "temperature_modifier": "frozen" -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_lukewarm_ocean.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_lukewarm_ocean.json deleted file mode 100644 index 50ae6f73a0..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_lukewarm_ocean.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/deep_lukewarm_ocean", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 4566514, - "water_fog_color": 267827 - }, - "features": [ - "#minecraft:raw_generation/in_biome/deep_lukewarm_ocean", - "#minecraft:lakes/in_biome/deep_lukewarm_ocean", - "#minecraft:local_modifications/in_biome/deep_lukewarm_ocean", - "#minecraft:underground_structures/in_biome/deep_lukewarm_ocean", - "#minecraft:surface_structures/in_biome/deep_lukewarm_ocean", - "#minecraft:strongholds/in_biome/deep_lukewarm_ocean", - "#minecraft:underground_ores/in_biome/deep_lukewarm_ocean", - "#minecraft:underground_decoration/in_biome/deep_lukewarm_ocean", - "#minecraft:fluid_springs/in_biome/deep_lukewarm_ocean", - "#minecraft:vegetal_decoration/in_biome/deep_lukewarm_ocean", - "#minecraft:top_layer_modification/in_biome/deep_lukewarm_ocean" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:cod", - "maxCount": 6, - "minCount": 3, - "weight": 8 - }, - { - "type": "minecraft:pufferfish", - "maxCount": 3, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:tropical_fish", - "maxCount": 8, - "minCount": 8, - "weight": 25 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 4, - "minCount": 1, - "weight": 8 - }, - { - "type": "minecraft:dolphin", - "maxCount": 2, - "minCount": 1, - "weight": 2 - } - ] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_ocean.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_ocean.json deleted file mode 100644 index 9910217bdb..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/deep_ocean.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/deep_ocean", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/deep_ocean", - "#minecraft:lakes/in_biome/deep_ocean", - "#minecraft:local_modifications/in_biome/deep_ocean", - "#minecraft:underground_structures/in_biome/deep_ocean", - "#minecraft:surface_structures/in_biome/deep_ocean", - "#minecraft:strongholds/in_biome/deep_ocean", - "#minecraft:underground_ores/in_biome/deep_ocean", - "#minecraft:underground_decoration/in_biome/deep_ocean", - "#minecraft:fluid_springs/in_biome/deep_ocean", - "#minecraft:vegetal_decoration/in_biome/deep_ocean", - "#minecraft:top_layer_modification/in_biome/deep_ocean" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:cod", - "maxCount": 6, - "minCount": 3, - "weight": 10 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 4, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:dolphin", - "maxCount": 2, - "minCount": 1, - "weight": 1 - } - ] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/desert.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/desert.json deleted file mode 100644 index ce71f44e9d..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/desert.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/desert", - "downfall": 0.0, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.desert" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/desert", - "#minecraft:lakes/in_biome/desert", - "#minecraft:local_modifications/in_biome/desert", - "#minecraft:underground_structures/in_biome/desert", - "#minecraft:surface_structures/in_biome/desert", - "#minecraft:strongholds/in_biome/desert", - "#minecraft:underground_ores/in_biome/desert", - "#minecraft:underground_decoration/in_biome/desert", - "#minecraft:fluid_springs/in_biome/desert", - "#minecraft:vegetal_decoration/in_biome/desert", - "#minecraft:top_layer_modification/in_biome/desert" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:rabbit", - "maxCount": 3, - "minCount": 2, - "weight": 12 - }, - { - "type": "minecraft:camel", - "maxCount": 1, - "minCount": 1, - "weight": 1 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 19 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:husk", - "maxCount": 4, - "minCount": 4, - "weight": 80 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/dripstone_caves.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/dripstone_caves.json deleted file mode 100644 index 4d29662165..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/dripstone_caves.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/dripstone_caves", - "downfall": 0.4, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.dripstone_caves" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7907327, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/dripstone_caves", - "#minecraft:lakes/in_biome/dripstone_caves", - "#minecraft:local_modifications/in_biome/dripstone_caves", - "#minecraft:underground_structures/in_biome/dripstone_caves", - "#minecraft:surface_structures/in_biome/dripstone_caves", - "#minecraft:strongholds/in_biome/dripstone_caves", - "#minecraft:underground_ores/in_biome/dripstone_caves", - "#minecraft:underground_decoration/in_biome/dripstone_caves", - "#minecraft:fluid_springs/in_biome/dripstone_caves", - "#minecraft:vegetal_decoration/in_biome/dripstone_caves", - "#minecraft:top_layer_modification/in_biome/dripstone_caves" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 4, - "minCount": 4, - "weight": 95 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.8 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/end_barrens.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/end_barrens.json deleted file mode 100644 index 54868f9838..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/end_barrens.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/end_barrens", - "downfall": 0.5, - "effects": { - "fog_color": 10518688, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 0, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/end_barrens", - "#minecraft:lakes/in_biome/end_barrens", - "#minecraft:local_modifications/in_biome/end_barrens", - "#minecraft:underground_structures/in_biome/end_barrens", - "#minecraft:surface_structures/in_biome/end_barrens", - "#minecraft:strongholds/in_biome/end_barrens", - "#minecraft:underground_ores/in_biome/end_barrens", - "#minecraft:underground_decoration/in_biome/end_barrens", - "#minecraft:fluid_springs/in_biome/end_barrens", - "#minecraft:vegetal_decoration/in_biome/end_barrens", - "#minecraft:top_layer_modification/in_biome/end_barrens" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 4, - "weight": 10 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/end_highlands.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/end_highlands.json deleted file mode 100644 index 6fc918fd76..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/end_highlands.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/end_highlands", - "downfall": 0.5, - "effects": { - "fog_color": 10518688, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 0, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/end_highlands", - "#minecraft:lakes/in_biome/end_highlands", - "#minecraft:local_modifications/in_biome/end_highlands", - "#minecraft:underground_structures/in_biome/end_highlands", - "#minecraft:surface_structures/in_biome/end_highlands", - "#minecraft:strongholds/in_biome/end_highlands", - "#minecraft:underground_ores/in_biome/end_highlands", - "#minecraft:underground_decoration/in_biome/end_highlands", - "#minecraft:fluid_springs/in_biome/end_highlands", - "#minecraft:vegetal_decoration/in_biome/end_highlands", - "#minecraft:top_layer_modification/in_biome/end_highlands" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 4, - "weight": 10 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/end_midlands.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/end_midlands.json deleted file mode 100644 index 0567ffb6bf..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/end_midlands.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/end_midlands", - "downfall": 0.5, - "effects": { - "fog_color": 10518688, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 0, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/end_midlands", - "#minecraft:lakes/in_biome/end_midlands", - "#minecraft:local_modifications/in_biome/end_midlands", - "#minecraft:underground_structures/in_biome/end_midlands", - "#minecraft:surface_structures/in_biome/end_midlands", - "#minecraft:strongholds/in_biome/end_midlands", - "#minecraft:underground_ores/in_biome/end_midlands", - "#minecraft:underground_decoration/in_biome/end_midlands", - "#minecraft:fluid_springs/in_biome/end_midlands", - "#minecraft:vegetal_decoration/in_biome/end_midlands", - "#minecraft:top_layer_modification/in_biome/end_midlands" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 4, - "weight": 10 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/eroded_badlands.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/eroded_badlands.json deleted file mode 100644 index 4059ab97c3..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/eroded_badlands.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/eroded_badlands", - "creature_spawn_probability": 0.03, - "downfall": 0.0, - "effects": { - "fog_color": 12638463, - "foliage_color": 10387789, - "grass_color": 9470285, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/eroded_badlands", - "#minecraft:lakes/in_biome/eroded_badlands", - "#minecraft:local_modifications/in_biome/eroded_badlands", - "#minecraft:underground_structures/in_biome/eroded_badlands", - "#minecraft:surface_structures/in_biome/eroded_badlands", - "#minecraft:strongholds/in_biome/eroded_badlands", - "#minecraft:underground_ores/in_biome/eroded_badlands", - "#minecraft:underground_decoration/in_biome/eroded_badlands", - "#minecraft:fluid_springs/in_biome/eroded_badlands", - "#minecraft:vegetal_decoration/in_biome/eroded_badlands", - "#minecraft:top_layer_modification/in_biome/eroded_badlands" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:armadillo", - "maxCount": 2, - "minCount": 1, - "weight": 6 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/flower_forest.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/flower_forest.json deleted file mode 100644 index cff2119f7a..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/flower_forest.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/flower_forest", - "downfall": 0.8, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.flower_forest" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7972607, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/flower_forest", - "#minecraft:lakes/in_biome/flower_forest", - "#minecraft:local_modifications/in_biome/flower_forest", - "#minecraft:underground_structures/in_biome/flower_forest", - "#minecraft:surface_structures/in_biome/flower_forest", - "#minecraft:strongholds/in_biome/flower_forest", - "#minecraft:underground_ores/in_biome/flower_forest", - "#minecraft:underground_decoration/in_biome/flower_forest", - "#minecraft:fluid_springs/in_biome/flower_forest", - "#minecraft:vegetal_decoration/in_biome/flower_forest", - "#minecraft:top_layer_modification/in_biome/flower_forest" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:rabbit", - "maxCount": 3, - "minCount": 2, - "weight": 4 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.7 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/forest.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/forest.json deleted file mode 100644 index 259ea80bac..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/forest.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/forest", - "downfall": 0.8, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.forest" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7972607, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/forest", - "#minecraft:lakes/in_biome/forest", - "#minecraft:local_modifications/in_biome/forest", - "#minecraft:underground_structures/in_biome/forest", - "#minecraft:surface_structures/in_biome/forest", - "#minecraft:strongholds/in_biome/forest", - "#minecraft:underground_ores/in_biome/forest", - "#minecraft:underground_decoration/in_biome/forest", - "#minecraft:fluid_springs/in_biome/forest", - "#minecraft:vegetal_decoration/in_biome/forest", - "#minecraft:top_layer_modification/in_biome/forest" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:wolf", - "maxCount": 4, - "minCount": 4, - "weight": 5 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.7 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/frozen_ocean.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/frozen_ocean.json deleted file mode 100644 index 6924270d4e..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/frozen_ocean.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/frozen_ocean", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8364543, - "water_color": 3750089, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/frozen_ocean", - "#minecraft:lakes/in_biome/frozen_ocean", - "#minecraft:local_modifications/in_biome/frozen_ocean", - "#minecraft:underground_structures/in_biome/frozen_ocean", - "#minecraft:surface_structures/in_biome/frozen_ocean", - "#minecraft:strongholds/in_biome/frozen_ocean", - "#minecraft:underground_ores/in_biome/frozen_ocean", - "#minecraft:underground_decoration/in_biome/frozen_ocean", - "#minecraft:fluid_springs/in_biome/frozen_ocean", - "#minecraft:vegetal_decoration/in_biome/frozen_ocean", - "#minecraft:top_layer_modification/in_biome/frozen_ocean" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:polar_bear", - "maxCount": 2, - "minCount": 1, - "weight": 1 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:salmon", - "maxCount": 5, - "minCount": 1, - "weight": 15 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 4, - "minCount": 1, - "weight": 1 - } - ] - }, - "temperature": 0.0, - "temperature_modifier": "frozen" -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/frozen_peaks.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/frozen_peaks.json deleted file mode 100644 index 57e79f23d5..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/frozen_peaks.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/frozen_peaks", - "downfall": 0.9, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.frozen_peaks" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8756735, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/frozen_peaks", - "#minecraft:lakes/in_biome/frozen_peaks", - "#minecraft:local_modifications/in_biome/frozen_peaks", - "#minecraft:underground_structures/in_biome/frozen_peaks", - "#minecraft:surface_structures/in_biome/frozen_peaks", - "#minecraft:strongholds/in_biome/frozen_peaks", - "#minecraft:underground_ores/in_biome/frozen_peaks", - "#minecraft:underground_decoration/in_biome/frozen_peaks", - "#minecraft:fluid_springs/in_biome/frozen_peaks", - "#minecraft:vegetal_decoration/in_biome/frozen_peaks", - "#minecraft:top_layer_modification/in_biome/frozen_peaks" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:goat", - "maxCount": 3, - "minCount": 1, - "weight": 5 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": -0.7 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/frozen_river.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/frozen_river.json deleted file mode 100644 index e6e90f4f25..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/frozen_river.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/frozen_river", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8364543, - "water_color": 3750089, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/frozen_river", - "#minecraft:lakes/in_biome/frozen_river", - "#minecraft:local_modifications/in_biome/frozen_river", - "#minecraft:underground_structures/in_biome/frozen_river", - "#minecraft:surface_structures/in_biome/frozen_river", - "#minecraft:strongholds/in_biome/frozen_river", - "#minecraft:underground_ores/in_biome/frozen_river", - "#minecraft:underground_decoration/in_biome/frozen_river", - "#minecraft:fluid_springs/in_biome/frozen_river", - "#minecraft:vegetal_decoration/in_biome/frozen_river", - "#minecraft:top_layer_modification/in_biome/frozen_river" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 1 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:salmon", - "maxCount": 5, - "minCount": 1, - "weight": 5 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 4, - "minCount": 1, - "weight": 2 - } - ] - }, - "temperature": 0.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/grove.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/grove.json deleted file mode 100644 index a4ad47fc4c..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/grove.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/grove", - "downfall": 0.8, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.grove" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8495359, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/grove", - "#minecraft:lakes/in_biome/grove", - "#minecraft:local_modifications/in_biome/grove", - "#minecraft:underground_structures/in_biome/grove", - "#minecraft:surface_structures/in_biome/grove", - "#minecraft:strongholds/in_biome/grove", - "#minecraft:underground_ores/in_biome/grove", - "#minecraft:underground_decoration/in_biome/grove", - "#minecraft:fluid_springs/in_biome/grove", - "#minecraft:vegetal_decoration/in_biome/grove", - "#minecraft:top_layer_modification/in_biome/grove" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:wolf", - "maxCount": 1, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:rabbit", - "maxCount": 3, - "minCount": 2, - "weight": 8 - }, - { - "type": "minecraft:fox", - "maxCount": 4, - "minCount": 2, - "weight": 4 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": -0.2 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/ice_spikes.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/ice_spikes.json deleted file mode 100644 index 7efe4494c8..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/ice_spikes.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/ice_spikes", - "creature_spawn_probability": 0.07, - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8364543, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/ice_spikes", - "#minecraft:lakes/in_biome/ice_spikes", - "#minecraft:local_modifications/in_biome/ice_spikes", - "#minecraft:underground_structures/in_biome/ice_spikes", - "#minecraft:surface_structures/in_biome/ice_spikes", - "#minecraft:strongholds/in_biome/ice_spikes", - "#minecraft:underground_ores/in_biome/ice_spikes", - "#minecraft:underground_decoration/in_biome/ice_spikes", - "#minecraft:fluid_springs/in_biome/ice_spikes", - "#minecraft:vegetal_decoration/in_biome/ice_spikes", - "#minecraft:top_layer_modification/in_biome/ice_spikes" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:rabbit", - "maxCount": 3, - "minCount": 2, - "weight": 10 - }, - { - "type": "minecraft:polar_bear", - "maxCount": 2, - "minCount": 1, - "weight": 1 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 20 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:stray", - "maxCount": 4, - "minCount": 4, - "weight": 80 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/jagged_peaks.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/jagged_peaks.json deleted file mode 100644 index 3f64bba000..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/jagged_peaks.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/jagged_peaks", - "downfall": 0.9, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.jagged_peaks" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8756735, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/jagged_peaks", - "#minecraft:lakes/in_biome/jagged_peaks", - "#minecraft:local_modifications/in_biome/jagged_peaks", - "#minecraft:underground_structures/in_biome/jagged_peaks", - "#minecraft:surface_structures/in_biome/jagged_peaks", - "#minecraft:strongholds/in_biome/jagged_peaks", - "#minecraft:underground_ores/in_biome/jagged_peaks", - "#minecraft:underground_decoration/in_biome/jagged_peaks", - "#minecraft:fluid_springs/in_biome/jagged_peaks", - "#minecraft:vegetal_decoration/in_biome/jagged_peaks", - "#minecraft:top_layer_modification/in_biome/jagged_peaks" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:goat", - "maxCount": 3, - "minCount": 1, - "weight": 5 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": -0.7 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/jungle.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/jungle.json deleted file mode 100644 index dda810da19..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/jungle.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/jungle", - "downfall": 0.9, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.jungle" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7842047, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/jungle", - "#minecraft:lakes/in_biome/jungle", - "#minecraft:local_modifications/in_biome/jungle", - "#minecraft:underground_structures/in_biome/jungle", - "#minecraft:surface_structures/in_biome/jungle", - "#minecraft:strongholds/in_biome/jungle", - "#minecraft:underground_ores/in_biome/jungle", - "#minecraft:underground_decoration/in_biome/jungle", - "#minecraft:fluid_springs/in_biome/jungle", - "#minecraft:vegetal_decoration/in_biome/jungle", - "#minecraft:top_layer_modification/in_biome/jungle" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:parrot", - "maxCount": 2, - "minCount": 1, - "weight": 40 - }, - { - "type": "minecraft:panda", - "maxCount": 2, - "minCount": 1, - "weight": 1 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:ocelot", - "maxCount": 3, - "minCount": 1, - "weight": 2 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.95 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/lukewarm_ocean.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/lukewarm_ocean.json deleted file mode 100644 index 09fe106eba..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/lukewarm_ocean.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/lukewarm_ocean", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 4566514, - "water_fog_color": 267827 - }, - "features": [ - "#minecraft:raw_generation/in_biome/lukewarm_ocean", - "#minecraft:lakes/in_biome/lukewarm_ocean", - "#minecraft:local_modifications/in_biome/lukewarm_ocean", - "#minecraft:underground_structures/in_biome/lukewarm_ocean", - "#minecraft:surface_structures/in_biome/lukewarm_ocean", - "#minecraft:strongholds/in_biome/lukewarm_ocean", - "#minecraft:underground_ores/in_biome/lukewarm_ocean", - "#minecraft:underground_decoration/in_biome/lukewarm_ocean", - "#minecraft:fluid_springs/in_biome/lukewarm_ocean", - "#minecraft:vegetal_decoration/in_biome/lukewarm_ocean", - "#minecraft:top_layer_modification/in_biome/lukewarm_ocean" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:cod", - "maxCount": 6, - "minCount": 3, - "weight": 15 - }, - { - "type": "minecraft:pufferfish", - "maxCount": 3, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:tropical_fish", - "maxCount": 8, - "minCount": 8, - "weight": 25 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 2, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:dolphin", - "maxCount": 2, - "minCount": 1, - "weight": 2 - } - ] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/lush_caves.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/lush_caves.json deleted file mode 100644 index 8854da513e..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/lush_caves.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/lush_caves", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.lush_caves" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/lush_caves", - "#minecraft:lakes/in_biome/lush_caves", - "#minecraft:local_modifications/in_biome/lush_caves", - "#minecraft:underground_structures/in_biome/lush_caves", - "#minecraft:surface_structures/in_biome/lush_caves", - "#minecraft:strongholds/in_biome/lush_caves", - "#minecraft:underground_ores/in_biome/lush_caves", - "#minecraft:underground_decoration/in_biome/lush_caves", - "#minecraft:fluid_springs/in_biome/lush_caves", - "#minecraft:vegetal_decoration/in_biome/lush_caves", - "#minecraft:top_layer_modification/in_biome/lush_caves" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [ - { - "type": "minecraft:axolotl", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:tropical_fish", - "maxCount": 8, - "minCount": 8, - "weight": 25 - } - ], - "water_creature": [] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/mangrove_swamp.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/mangrove_swamp.json deleted file mode 100644 index 8a36659c81..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/mangrove_swamp.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/mangrove_swamp", - "downfall": 0.9, - "effects": { - "dry_foliage_color": 8082228, - "fog_color": 12638463, - "foliage_color": 9285927, - "grass_color_modifier": "swamp", - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.swamp" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7907327, - "water_color": 3832426, - "water_fog_color": 5077600 - }, - "features": [ - "#minecraft:raw_generation/in_biome/mangrove_swamp", - "#minecraft:lakes/in_biome/mangrove_swamp", - "#minecraft:local_modifications/in_biome/mangrove_swamp", - "#minecraft:underground_structures/in_biome/mangrove_swamp", - "#minecraft:surface_structures/in_biome/mangrove_swamp", - "#minecraft:strongholds/in_biome/mangrove_swamp", - "#minecraft:underground_ores/in_biome/mangrove_swamp", - "#minecraft:underground_decoration/in_biome/mangrove_swamp", - "#minecraft:fluid_springs/in_biome/mangrove_swamp", - "#minecraft:vegetal_decoration/in_biome/mangrove_swamp", - "#minecraft:top_layer_modification/in_biome/mangrove_swamp" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:frog", - "maxCount": 5, - "minCount": 2, - "weight": 10 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 70 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:slime", - "maxCount": 1, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:bogged", - "maxCount": 4, - "minCount": 4, - "weight": 30 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:tropical_fish", - "maxCount": 8, - "minCount": 8, - "weight": 25 - } - ], - "water_creature": [] - }, - "temperature": 0.8 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/meadow.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/meadow.json deleted file mode 100644 index 200468a137..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/meadow.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/meadow", - "downfall": 0.8, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.meadow" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 937679, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/meadow", - "#minecraft:lakes/in_biome/meadow", - "#minecraft:local_modifications/in_biome/meadow", - "#minecraft:underground_structures/in_biome/meadow", - "#minecraft:surface_structures/in_biome/meadow", - "#minecraft:strongholds/in_biome/meadow", - "#minecraft:underground_ores/in_biome/meadow", - "#minecraft:underground_decoration/in_biome/meadow", - "#minecraft:fluid_springs/in_biome/meadow", - "#minecraft:vegetal_decoration/in_biome/meadow", - "#minecraft:top_layer_modification/in_biome/meadow" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:donkey", - "maxCount": 2, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:rabbit", - "maxCount": 6, - "minCount": 2, - "weight": 2 - }, - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 2, - "weight": 2 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/mushroom_fields.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/mushroom_fields.json deleted file mode 100644 index b9368a9c8c..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/mushroom_fields.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/mushroom_fields", - "downfall": 1.0, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 7842047, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/mushroom_fields", - "#minecraft:lakes/in_biome/mushroom_fields", - "#minecraft:local_modifications/in_biome/mushroom_fields", - "#minecraft:underground_structures/in_biome/mushroom_fields", - "#minecraft:surface_structures/in_biome/mushroom_fields", - "#minecraft:strongholds/in_biome/mushroom_fields", - "#minecraft:underground_ores/in_biome/mushroom_fields", - "#minecraft:underground_decoration/in_biome/mushroom_fields", - "#minecraft:fluid_springs/in_biome/mushroom_fields", - "#minecraft:vegetal_decoration/in_biome/mushroom_fields", - "#minecraft:top_layer_modification/in_biome/mushroom_fields" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:mooshroom", - "maxCount": 8, - "minCount": 4, - "weight": 8 - } - ], - "misc": [], - "monster": [], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.9 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/nether_wastes.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/nether_wastes.json deleted file mode 100644 index 1af0667226..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/nether_wastes.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/nether_wastes", - "downfall": 0.0, - "effects": { - "additions_sound": { - "sound": "minecraft:ambient.nether_wastes.additions", - "tick_chance": 0.0111 - }, - "ambient_sound": "minecraft:ambient.nether_wastes.loop", - "fog_color": 3344392, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.nether_wastes.mood", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.nether.nether_wastes" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/nether_wastes", - "#minecraft:lakes/in_biome/nether_wastes", - "#minecraft:local_modifications/in_biome/nether_wastes", - "#minecraft:underground_structures/in_biome/nether_wastes", - "#minecraft:surface_structures/in_biome/nether_wastes", - "#minecraft:strongholds/in_biome/nether_wastes", - "#minecraft:underground_ores/in_biome/nether_wastes", - "#minecraft:underground_decoration/in_biome/nether_wastes", - "#minecraft:fluid_springs/in_biome/nether_wastes", - "#minecraft:vegetal_decoration/in_biome/nether_wastes", - "#minecraft:top_layer_modification/in_biome/nether_wastes" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [ - { - "type": "minecraft:strider", - "maxCount": 2, - "minCount": 1, - "weight": 60 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:ghast", - "maxCount": 4, - "minCount": 4, - "weight": 50 - }, - { - "type": "minecraft:zombified_piglin", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:magma_cube", - "maxCount": 4, - "minCount": 4, - "weight": 2 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 4, - "weight": 1 - }, - { - "type": "minecraft:piglin", - "maxCount": 4, - "minCount": 4, - "weight": 15 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/ocean.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/ocean.json deleted file mode 100644 index cf5b1995a3..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/ocean.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/ocean", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/ocean", - "#minecraft:lakes/in_biome/ocean", - "#minecraft:local_modifications/in_biome/ocean", - "#minecraft:underground_structures/in_biome/ocean", - "#minecraft:surface_structures/in_biome/ocean", - "#minecraft:strongholds/in_biome/ocean", - "#minecraft:underground_ores/in_biome/ocean", - "#minecraft:underground_decoration/in_biome/ocean", - "#minecraft:fluid_springs/in_biome/ocean", - "#minecraft:vegetal_decoration/in_biome/ocean", - "#minecraft:top_layer_modification/in_biome/ocean" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:cod", - "maxCount": 6, - "minCount": 3, - "weight": 10 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 4, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:dolphin", - "maxCount": 2, - "minCount": 1, - "weight": 1 - } - ] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/old_growth_birch_forest.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/old_growth_birch_forest.json deleted file mode 100644 index 18806e6ae4..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/old_growth_birch_forest.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/old_growth_birch_forest", - "downfall": 0.6, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.forest" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8037887, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/old_growth_birch_forest", - "#minecraft:lakes/in_biome/old_growth_birch_forest", - "#minecraft:local_modifications/in_biome/old_growth_birch_forest", - "#minecraft:underground_structures/in_biome/old_growth_birch_forest", - "#minecraft:surface_structures/in_biome/old_growth_birch_forest", - "#minecraft:strongholds/in_biome/old_growth_birch_forest", - "#minecraft:underground_ores/in_biome/old_growth_birch_forest", - "#minecraft:underground_decoration/in_biome/old_growth_birch_forest", - "#minecraft:fluid_springs/in_biome/old_growth_birch_forest", - "#minecraft:vegetal_decoration/in_biome/old_growth_birch_forest", - "#minecraft:top_layer_modification/in_biome/old_growth_birch_forest" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.6 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/old_growth_pine_taiga.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/old_growth_pine_taiga.json deleted file mode 100644 index 0cf87db88b..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/old_growth_pine_taiga.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/old_growth_pine_taiga", - "downfall": 0.8, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.old_growth_taiga" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8168447, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/old_growth_pine_taiga", - "#minecraft:lakes/in_biome/old_growth_pine_taiga", - "#minecraft:local_modifications/in_biome/old_growth_pine_taiga", - "#minecraft:underground_structures/in_biome/old_growth_pine_taiga", - "#minecraft:surface_structures/in_biome/old_growth_pine_taiga", - "#minecraft:strongholds/in_biome/old_growth_pine_taiga", - "#minecraft:underground_ores/in_biome/old_growth_pine_taiga", - "#minecraft:underground_decoration/in_biome/old_growth_pine_taiga", - "#minecraft:fluid_springs/in_biome/old_growth_pine_taiga", - "#minecraft:vegetal_decoration/in_biome/old_growth_pine_taiga", - "#minecraft:top_layer_modification/in_biome/old_growth_pine_taiga" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:wolf", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:rabbit", - "maxCount": 3, - "minCount": 2, - "weight": 4 - }, - { - "type": "minecraft:fox", - "maxCount": 4, - "minCount": 2, - "weight": 8 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 25 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.3 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/old_growth_spruce_taiga.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/old_growth_spruce_taiga.json deleted file mode 100644 index 9a0e247dcc..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/old_growth_spruce_taiga.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/old_growth_spruce_taiga", - "downfall": 0.8, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.old_growth_taiga" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8233983, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/old_growth_spruce_taiga", - "#minecraft:lakes/in_biome/old_growth_spruce_taiga", - "#minecraft:local_modifications/in_biome/old_growth_spruce_taiga", - "#minecraft:underground_structures/in_biome/old_growth_spruce_taiga", - "#minecraft:surface_structures/in_biome/old_growth_spruce_taiga", - "#minecraft:strongholds/in_biome/old_growth_spruce_taiga", - "#minecraft:underground_ores/in_biome/old_growth_spruce_taiga", - "#minecraft:underground_decoration/in_biome/old_growth_spruce_taiga", - "#minecraft:fluid_springs/in_biome/old_growth_spruce_taiga", - "#minecraft:vegetal_decoration/in_biome/old_growth_spruce_taiga", - "#minecraft:top_layer_modification/in_biome/old_growth_spruce_taiga" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:wolf", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:rabbit", - "maxCount": 3, - "minCount": 2, - "weight": 4 - }, - { - "type": "minecraft:fox", - "maxCount": 4, - "minCount": 2, - "weight": 8 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.25 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/pale_garden.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/pale_garden.json deleted file mode 100644 index dba07f900e..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/pale_garden.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/pale_garden", - "downfall": 0.8, - "effects": { - "dry_foliage_color": 10528412, - "fog_color": 8484720, - "foliage_color": 8883574, - "grass_color": 7832178, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [], - "music_volume": 0.0, - "sky_color": 12171705, - "water_color": 7768221, - "water_fog_color": 5597568 - }, - "features": [ - "#minecraft:raw_generation/in_biome/pale_garden", - "#minecraft:lakes/in_biome/pale_garden", - "#minecraft:local_modifications/in_biome/pale_garden", - "#minecraft:underground_structures/in_biome/pale_garden", - "#minecraft:surface_structures/in_biome/pale_garden", - "#minecraft:strongholds/in_biome/pale_garden", - "#minecraft:underground_ores/in_biome/pale_garden", - "#minecraft:underground_decoration/in_biome/pale_garden", - "#minecraft:fluid_springs/in_biome/pale_garden", - "#minecraft:vegetal_decoration/in_biome/pale_garden", - "#minecraft:top_layer_modification/in_biome/pale_garden" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.7 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/plains.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/plains.json deleted file mode 100644 index 4e9bf9a962..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/plains.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/plains", - "downfall": 0.4, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 7907327, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/plains", - "#minecraft:lakes/in_biome/plains", - "#minecraft:local_modifications/in_biome/plains", - "#minecraft:underground_structures/in_biome/plains", - "#minecraft:surface_structures/in_biome/plains", - "#minecraft:strongholds/in_biome/plains", - "#minecraft:underground_ores/in_biome/plains", - "#minecraft:underground_decoration/in_biome/plains", - "#minecraft:fluid_springs/in_biome/plains", - "#minecraft:vegetal_decoration/in_biome/plains", - "#minecraft:top_layer_modification/in_biome/plains" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:horse", - "maxCount": 6, - "minCount": 2, - "weight": 5 - }, - { - "type": "minecraft:donkey", - "maxCount": 3, - "minCount": 1, - "weight": 1 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.8 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/river.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/river.json deleted file mode 100644 index 179466d536..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/river.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/river", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/river", - "#minecraft:lakes/in_biome/river", - "#minecraft:local_modifications/in_biome/river", - "#minecraft:underground_structures/in_biome/river", - "#minecraft:surface_structures/in_biome/river", - "#minecraft:strongholds/in_biome/river", - "#minecraft:underground_ores/in_biome/river", - "#minecraft:underground_decoration/in_biome/river", - "#minecraft:fluid_springs/in_biome/river", - "#minecraft:vegetal_decoration/in_biome/river", - "#minecraft:top_layer_modification/in_biome/river" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 100 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:salmon", - "maxCount": 5, - "minCount": 1, - "weight": 5 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 4, - "minCount": 1, - "weight": 2 - } - ] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/savanna.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/savanna.json deleted file mode 100644 index f36a10ed0d..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/savanna.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/savanna", - "downfall": 0.0, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/savanna", - "#minecraft:lakes/in_biome/savanna", - "#minecraft:local_modifications/in_biome/savanna", - "#minecraft:underground_structures/in_biome/savanna", - "#minecraft:surface_structures/in_biome/savanna", - "#minecraft:strongholds/in_biome/savanna", - "#minecraft:underground_ores/in_biome/savanna", - "#minecraft:underground_decoration/in_biome/savanna", - "#minecraft:fluid_springs/in_biome/savanna", - "#minecraft:vegetal_decoration/in_biome/savanna", - "#minecraft:top_layer_modification/in_biome/savanna" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:horse", - "maxCount": 6, - "minCount": 2, - "weight": 1 - }, - { - "type": "minecraft:donkey", - "maxCount": 1, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:armadillo", - "maxCount": 3, - "minCount": 2, - "weight": 10 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/savanna_plateau.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/savanna_plateau.json deleted file mode 100644 index 44cf984a7b..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/savanna_plateau.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/savanna_plateau", - "downfall": 0.0, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/savanna_plateau", - "#minecraft:lakes/in_biome/savanna_plateau", - "#minecraft:local_modifications/in_biome/savanna_plateau", - "#minecraft:underground_structures/in_biome/savanna_plateau", - "#minecraft:surface_structures/in_biome/savanna_plateau", - "#minecraft:strongholds/in_biome/savanna_plateau", - "#minecraft:underground_ores/in_biome/savanna_plateau", - "#minecraft:underground_decoration/in_biome/savanna_plateau", - "#minecraft:fluid_springs/in_biome/savanna_plateau", - "#minecraft:vegetal_decoration/in_biome/savanna_plateau", - "#minecraft:top_layer_modification/in_biome/savanna_plateau" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:horse", - "maxCount": 6, - "minCount": 2, - "weight": 1 - }, - { - "type": "minecraft:donkey", - "maxCount": 1, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:armadillo", - "maxCount": 3, - "minCount": 2, - "weight": 10 - }, - { - "type": "minecraft:llama", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:wolf", - "maxCount": 8, - "minCount": 4, - "weight": 8 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/small_end_islands.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/small_end_islands.json deleted file mode 100644 index a3e2321c7f..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/small_end_islands.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/small_end_islands", - "downfall": 0.5, - "effects": { - "fog_color": 10518688, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 0, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/small_end_islands", - "#minecraft:lakes/in_biome/small_end_islands", - "#minecraft:local_modifications/in_biome/small_end_islands", - "#minecraft:underground_structures/in_biome/small_end_islands", - "#minecraft:surface_structures/in_biome/small_end_islands", - "#minecraft:strongholds/in_biome/small_end_islands", - "#minecraft:underground_ores/in_biome/small_end_islands", - "#minecraft:underground_decoration/in_biome/small_end_islands", - "#minecraft:fluid_springs/in_biome/small_end_islands", - "#minecraft:vegetal_decoration/in_biome/small_end_islands", - "#minecraft:top_layer_modification/in_biome/small_end_islands" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 4, - "weight": 10 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_beach.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_beach.json deleted file mode 100644 index 06cd6da3a8..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_beach.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/snowy_beach", - "downfall": 0.3, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8364543, - "water_color": 4020182, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/snowy_beach", - "#minecraft:lakes/in_biome/snowy_beach", - "#minecraft:local_modifications/in_biome/snowy_beach", - "#minecraft:underground_structures/in_biome/snowy_beach", - "#minecraft:surface_structures/in_biome/snowy_beach", - "#minecraft:strongholds/in_biome/snowy_beach", - "#minecraft:underground_ores/in_biome/snowy_beach", - "#minecraft:underground_decoration/in_biome/snowy_beach", - "#minecraft:fluid_springs/in_biome/snowy_beach", - "#minecraft:vegetal_decoration/in_biome/snowy_beach", - "#minecraft:top_layer_modification/in_biome/snowy_beach" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.05 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_plains.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_plains.json deleted file mode 100644 index 1f850cac0c..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_plains.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/snowy_plains", - "creature_spawn_probability": 0.07, - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8364543, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/snowy_plains", - "#minecraft:lakes/in_biome/snowy_plains", - "#minecraft:local_modifications/in_biome/snowy_plains", - "#minecraft:underground_structures/in_biome/snowy_plains", - "#minecraft:surface_structures/in_biome/snowy_plains", - "#minecraft:strongholds/in_biome/snowy_plains", - "#minecraft:underground_ores/in_biome/snowy_plains", - "#minecraft:underground_decoration/in_biome/snowy_plains", - "#minecraft:fluid_springs/in_biome/snowy_plains", - "#minecraft:vegetal_decoration/in_biome/snowy_plains", - "#minecraft:top_layer_modification/in_biome/snowy_plains" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:rabbit", - "maxCount": 3, - "minCount": 2, - "weight": 10 - }, - { - "type": "minecraft:polar_bear", - "maxCount": 2, - "minCount": 1, - "weight": 1 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 20 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:stray", - "maxCount": 4, - "minCount": 4, - "weight": 80 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_slopes.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_slopes.json deleted file mode 100644 index 46191fee21..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_slopes.json +++ /dev/null @@ -1,130 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/snowy_slopes", - "downfall": 0.9, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.snowy_slopes" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 8560639, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/snowy_slopes", - "#minecraft:lakes/in_biome/snowy_slopes", - "#minecraft:local_modifications/in_biome/snowy_slopes", - "#minecraft:underground_structures/in_biome/snowy_slopes", - "#minecraft:surface_structures/in_biome/snowy_slopes", - "#minecraft:strongholds/in_biome/snowy_slopes", - "#minecraft:underground_ores/in_biome/snowy_slopes", - "#minecraft:underground_decoration/in_biome/snowy_slopes", - "#minecraft:fluid_springs/in_biome/snowy_slopes", - "#minecraft:vegetal_decoration/in_biome/snowy_slopes", - "#minecraft:top_layer_modification/in_biome/snowy_slopes" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:rabbit", - "maxCount": 3, - "minCount": 2, - "weight": 4 - }, - { - "type": "minecraft:goat", - "maxCount": 3, - "minCount": 1, - "weight": 5 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": -0.3 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_taiga.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_taiga.json deleted file mode 100644 index 7930c07be2..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/snowy_taiga.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/snowy_taiga", - "downfall": 0.4, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8625919, - "water_color": 4020182, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/snowy_taiga", - "#minecraft:lakes/in_biome/snowy_taiga", - "#minecraft:local_modifications/in_biome/snowy_taiga", - "#minecraft:underground_structures/in_biome/snowy_taiga", - "#minecraft:surface_structures/in_biome/snowy_taiga", - "#minecraft:strongholds/in_biome/snowy_taiga", - "#minecraft:underground_ores/in_biome/snowy_taiga", - "#minecraft:underground_decoration/in_biome/snowy_taiga", - "#minecraft:fluid_springs/in_biome/snowy_taiga", - "#minecraft:vegetal_decoration/in_biome/snowy_taiga", - "#minecraft:top_layer_modification/in_biome/snowy_taiga" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:wolf", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:rabbit", - "maxCount": 3, - "minCount": 2, - "weight": 4 - }, - { - "type": "minecraft:fox", - "maxCount": 4, - "minCount": 2, - "weight": 8 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": -0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/soul_sand_valley.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/soul_sand_valley.json deleted file mode 100644 index 90efdd143e..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/soul_sand_valley.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/soul_sand_valley", - "downfall": 0.0, - "effects": { - "additions_sound": { - "sound": "minecraft:ambient.soul_sand_valley.additions", - "tick_chance": 0.0111 - }, - "ambient_sound": "minecraft:ambient.soul_sand_valley.loop", - "fog_color": 1787717, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.soul_sand_valley.mood", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.nether.soul_sand_valley" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "particle": { - "options": { - "type": "minecraft:ash" - }, - "probability": 0.00625 - }, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/soul_sand_valley", - "#minecraft:lakes/in_biome/soul_sand_valley", - "#minecraft:local_modifications/in_biome/soul_sand_valley", - "#minecraft:underground_structures/in_biome/soul_sand_valley", - "#minecraft:surface_structures/in_biome/soul_sand_valley", - "#minecraft:strongholds/in_biome/soul_sand_valley", - "#minecraft:underground_ores/in_biome/soul_sand_valley", - "#minecraft:underground_decoration/in_biome/soul_sand_valley", - "#minecraft:fluid_springs/in_biome/soul_sand_valley", - "#minecraft:vegetal_decoration/in_biome/soul_sand_valley", - "#minecraft:top_layer_modification/in_biome/soul_sand_valley" - ], - "has_precipitation": false, - "spawn_costs": { - "minecraft:enderman": { - "charge": 0.7, - "energy_budget": 0.15 - }, - "minecraft:ghast": { - "charge": 0.7, - "energy_budget": 0.15 - }, - "minecraft:skeleton": { - "charge": 0.7, - "energy_budget": 0.15 - }, - "minecraft:strider": { - "charge": 0.7, - "energy_budget": 0.15 - } - }, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [ - { - "type": "minecraft:strider", - "maxCount": 2, - "minCount": 1, - "weight": 60 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:skeleton", - "maxCount": 5, - "minCount": 5, - "weight": 20 - }, - { - "type": "minecraft:ghast", - "maxCount": 4, - "minCount": 4, - "weight": 50 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 4, - "weight": 1 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/sparse_jungle.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/sparse_jungle.json deleted file mode 100644 index c616dadfee..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/sparse_jungle.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/sparse_jungle", - "downfall": 0.8, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.sparse_jungle" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7842047, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/sparse_jungle", - "#minecraft:lakes/in_biome/sparse_jungle", - "#minecraft:local_modifications/in_biome/sparse_jungle", - "#minecraft:underground_structures/in_biome/sparse_jungle", - "#minecraft:surface_structures/in_biome/sparse_jungle", - "#minecraft:strongholds/in_biome/sparse_jungle", - "#minecraft:underground_ores/in_biome/sparse_jungle", - "#minecraft:underground_decoration/in_biome/sparse_jungle", - "#minecraft:fluid_springs/in_biome/sparse_jungle", - "#minecraft:vegetal_decoration/in_biome/sparse_jungle", - "#minecraft:top_layer_modification/in_biome/sparse_jungle" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:wolf", - "maxCount": 4, - "minCount": 2, - "weight": 8 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.95 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/stony_peaks.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/stony_peaks.json deleted file mode 100644 index 83fe9384ac..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/stony_peaks.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/stony_peaks", - "downfall": 0.3, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.stony_peaks" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7776511, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/stony_peaks", - "#minecraft:lakes/in_biome/stony_peaks", - "#minecraft:local_modifications/in_biome/stony_peaks", - "#minecraft:underground_structures/in_biome/stony_peaks", - "#minecraft:surface_structures/in_biome/stony_peaks", - "#minecraft:strongholds/in_biome/stony_peaks", - "#minecraft:underground_ores/in_biome/stony_peaks", - "#minecraft:underground_decoration/in_biome/stony_peaks", - "#minecraft:fluid_springs/in_biome/stony_peaks", - "#minecraft:vegetal_decoration/in_biome/stony_peaks", - "#minecraft:top_layer_modification/in_biome/stony_peaks" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 1.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/stony_shore.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/stony_shore.json deleted file mode 100644 index 45cb9a94cf..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/stony_shore.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/stony_shore", - "downfall": 0.3, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8233727, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/stony_shore", - "#minecraft:lakes/in_biome/stony_shore", - "#minecraft:local_modifications/in_biome/stony_shore", - "#minecraft:underground_structures/in_biome/stony_shore", - "#minecraft:surface_structures/in_biome/stony_shore", - "#minecraft:strongholds/in_biome/stony_shore", - "#minecraft:underground_ores/in_biome/stony_shore", - "#minecraft:underground_decoration/in_biome/stony_shore", - "#minecraft:fluid_springs/in_biome/stony_shore", - "#minecraft:vegetal_decoration/in_biome/stony_shore", - "#minecraft:top_layer_modification/in_biome/stony_shore" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.2 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/sunflower_plains.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/sunflower_plains.json deleted file mode 100644 index a295d2aabb..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/sunflower_plains.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/sunflower_plains", - "downfall": 0.4, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 7907327, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/sunflower_plains", - "#minecraft:lakes/in_biome/sunflower_plains", - "#minecraft:local_modifications/in_biome/sunflower_plains", - "#minecraft:underground_structures/in_biome/sunflower_plains", - "#minecraft:surface_structures/in_biome/sunflower_plains", - "#minecraft:strongholds/in_biome/sunflower_plains", - "#minecraft:underground_ores/in_biome/sunflower_plains", - "#minecraft:underground_decoration/in_biome/sunflower_plains", - "#minecraft:fluid_springs/in_biome/sunflower_plains", - "#minecraft:vegetal_decoration/in_biome/sunflower_plains", - "#minecraft:top_layer_modification/in_biome/sunflower_plains" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:horse", - "maxCount": 6, - "minCount": 2, - "weight": 5 - }, - { - "type": "minecraft:donkey", - "maxCount": 3, - "minCount": 1, - "weight": 1 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.8 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/swamp.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/swamp.json deleted file mode 100644 index 2d4aedf830..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/swamp.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/swamp", - "downfall": 0.9, - "effects": { - "dry_foliage_color": 8082228, - "fog_color": 12638463, - "foliage_color": 6975545, - "grass_color_modifier": "swamp", - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.swamp" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7907327, - "water_color": 6388580, - "water_fog_color": 2302743 - }, - "features": [ - "#minecraft:raw_generation/in_biome/swamp", - "#minecraft:lakes/in_biome/swamp", - "#minecraft:local_modifications/in_biome/swamp", - "#minecraft:underground_structures/in_biome/swamp", - "#minecraft:surface_structures/in_biome/swamp", - "#minecraft:strongholds/in_biome/swamp", - "#minecraft:underground_ores/in_biome/swamp", - "#minecraft:underground_decoration/in_biome/swamp", - "#minecraft:fluid_springs/in_biome/swamp", - "#minecraft:vegetal_decoration/in_biome/swamp", - "#minecraft:top_layer_modification/in_biome/swamp" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:frog", - "maxCount": 5, - "minCount": 2, - "weight": 10 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 70 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:slime", - "maxCount": 1, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:bogged", - "maxCount": 4, - "minCount": 4, - "weight": 30 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.8 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/taiga.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/taiga.json deleted file mode 100644 index 2e531498f8..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/taiga.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/taiga", - "downfall": 0.8, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8233983, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/taiga", - "#minecraft:lakes/in_biome/taiga", - "#minecraft:local_modifications/in_biome/taiga", - "#minecraft:underground_structures/in_biome/taiga", - "#minecraft:surface_structures/in_biome/taiga", - "#minecraft:strongholds/in_biome/taiga", - "#minecraft:underground_ores/in_biome/taiga", - "#minecraft:underground_decoration/in_biome/taiga", - "#minecraft:fluid_springs/in_biome/taiga", - "#minecraft:vegetal_decoration/in_biome/taiga", - "#minecraft:top_layer_modification/in_biome/taiga" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:wolf", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:rabbit", - "maxCount": 3, - "minCount": 2, - "weight": 4 - }, - { - "type": "minecraft:fox", - "maxCount": 4, - "minCount": 2, - "weight": 8 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.25 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/the_end.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/the_end.json deleted file mode 100644 index ef95b942e0..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/the_end.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/the_end", - "downfall": 0.5, - "effects": { - "fog_color": 10518688, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 0, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/the_end", - "#minecraft:lakes/in_biome/the_end", - "#minecraft:local_modifications/in_biome/the_end", - "#minecraft:underground_structures/in_biome/the_end", - "#minecraft:surface_structures/in_biome/the_end", - "#minecraft:strongholds/in_biome/the_end", - "#minecraft:underground_ores/in_biome/the_end", - "#minecraft:underground_decoration/in_biome/the_end", - "#minecraft:fluid_springs/in_biome/the_end", - "#minecraft:vegetal_decoration/in_biome/the_end", - "#minecraft:top_layer_modification/in_biome/the_end" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 4, - "weight": 10 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/the_void.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/the_void.json deleted file mode 100644 index 1a601e25a1..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/the_void.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/the_void", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/the_void", - "#minecraft:lakes/in_biome/the_void", - "#minecraft:local_modifications/in_biome/the_void", - "#minecraft:underground_structures/in_biome/the_void", - "#minecraft:surface_structures/in_biome/the_void", - "#minecraft:strongholds/in_biome/the_void", - "#minecraft:underground_ores/in_biome/the_void", - "#minecraft:underground_decoration/in_biome/the_void", - "#minecraft:fluid_springs/in_biome/the_void", - "#minecraft:vegetal_decoration/in_biome/the_void", - "#minecraft:top_layer_modification/in_biome/the_void" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/warm_ocean.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/warm_ocean.json deleted file mode 100644 index ea6da2bc45..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/warm_ocean.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/warm_ocean", - "downfall": 0.5, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8103167, - "water_color": 4445678, - "water_fog_color": 270131 - }, - "features": [ - "#minecraft:raw_generation/in_biome/warm_ocean", - "#minecraft:lakes/in_biome/warm_ocean", - "#minecraft:local_modifications/in_biome/warm_ocean", - "#minecraft:underground_structures/in_biome/warm_ocean", - "#minecraft:surface_structures/in_biome/warm_ocean", - "#minecraft:strongholds/in_biome/warm_ocean", - "#minecraft:underground_ores/in_biome/warm_ocean", - "#minecraft:underground_decoration/in_biome/warm_ocean", - "#minecraft:fluid_springs/in_biome/warm_ocean", - "#minecraft:vegetal_decoration/in_biome/warm_ocean", - "#minecraft:top_layer_modification/in_biome/warm_ocean" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "minecraft:drowned", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [ - { - "type": "minecraft:pufferfish", - "maxCount": 3, - "minCount": 1, - "weight": 15 - }, - { - "type": "minecraft:tropical_fish", - "maxCount": 8, - "minCount": 8, - "weight": 25 - } - ], - "water_creature": [ - { - "type": "minecraft:squid", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:dolphin", - "maxCount": 2, - "minCount": 1, - "weight": 2 - } - ] - }, - "temperature": 0.5 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/warped_forest.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/warped_forest.json deleted file mode 100644 index 231225af2d..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/warped_forest.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/warped_forest", - "downfall": 0.0, - "effects": { - "additions_sound": { - "sound": "minecraft:ambient.warped_forest.additions", - "tick_chance": 0.0111 - }, - "ambient_sound": "minecraft:ambient.warped_forest.loop", - "fog_color": 1705242, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.warped_forest.mood", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.nether.warped_forest" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "particle": { - "options": { - "type": "minecraft:warped_spore" - }, - "probability": 0.01428 - }, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/warped_forest", - "#minecraft:lakes/in_biome/warped_forest", - "#minecraft:local_modifications/in_biome/warped_forest", - "#minecraft:underground_structures/in_biome/warped_forest", - "#minecraft:surface_structures/in_biome/warped_forest", - "#minecraft:strongholds/in_biome/warped_forest", - "#minecraft:underground_ores/in_biome/warped_forest", - "#minecraft:underground_decoration/in_biome/warped_forest", - "#minecraft:fluid_springs/in_biome/warped_forest", - "#minecraft:vegetal_decoration/in_biome/warped_forest", - "#minecraft:top_layer_modification/in_biome/warped_forest" - ], - "has_precipitation": false, - "spawn_costs": { - "minecraft:enderman": { - "charge": 1.0, - "energy_budget": 0.12 - } - }, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [ - { - "type": "minecraft:strider", - "maxCount": 2, - "minCount": 1, - "weight": 60 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 4, - "weight": 1 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_forest.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_forest.json deleted file mode 100644 index 02b614667b..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_forest.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/windswept_forest", - "downfall": 0.3, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8233727, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/windswept_forest", - "#minecraft:lakes/in_biome/windswept_forest", - "#minecraft:local_modifications/in_biome/windswept_forest", - "#minecraft:underground_structures/in_biome/windswept_forest", - "#minecraft:surface_structures/in_biome/windswept_forest", - "#minecraft:strongholds/in_biome/windswept_forest", - "#minecraft:underground_ores/in_biome/windswept_forest", - "#minecraft:underground_decoration/in_biome/windswept_forest", - "#minecraft:fluid_springs/in_biome/windswept_forest", - "#minecraft:vegetal_decoration/in_biome/windswept_forest", - "#minecraft:top_layer_modification/in_biome/windswept_forest" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:llama", - "maxCount": 6, - "minCount": 4, - "weight": 5 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.2 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_gravelly_hills.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_gravelly_hills.json deleted file mode 100644 index 02f1c27e6d..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_gravelly_hills.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/windswept_gravelly_hills", - "downfall": 0.3, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8233727, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/windswept_gravelly_hills", - "#minecraft:lakes/in_biome/windswept_gravelly_hills", - "#minecraft:local_modifications/in_biome/windswept_gravelly_hills", - "#minecraft:underground_structures/in_biome/windswept_gravelly_hills", - "#minecraft:surface_structures/in_biome/windswept_gravelly_hills", - "#minecraft:strongholds/in_biome/windswept_gravelly_hills", - "#minecraft:underground_ores/in_biome/windswept_gravelly_hills", - "#minecraft:underground_decoration/in_biome/windswept_gravelly_hills", - "#minecraft:fluid_springs/in_biome/windswept_gravelly_hills", - "#minecraft:vegetal_decoration/in_biome/windswept_gravelly_hills", - "#minecraft:top_layer_modification/in_biome/windswept_gravelly_hills" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:llama", - "maxCount": 6, - "minCount": 4, - "weight": 5 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.2 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_hills.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_hills.json deleted file mode 100644 index b4fff701c8..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_hills.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/windswept_hills", - "downfall": 0.3, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 8233727, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/windswept_hills", - "#minecraft:lakes/in_biome/windswept_hills", - "#minecraft:local_modifications/in_biome/windswept_hills", - "#minecraft:underground_structures/in_biome/windswept_hills", - "#minecraft:surface_structures/in_biome/windswept_hills", - "#minecraft:strongholds/in_biome/windswept_hills", - "#minecraft:underground_ores/in_biome/windswept_hills", - "#minecraft:underground_decoration/in_biome/windswept_hills", - "#minecraft:fluid_springs/in_biome/windswept_hills", - "#minecraft:vegetal_decoration/in_biome/windswept_hills", - "#minecraft:top_layer_modification/in_biome/windswept_hills" - ], - "has_precipitation": true, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:llama", - "maxCount": 6, - "minCount": 4, - "weight": 5 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 0.2 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_savanna.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_savanna.json deleted file mode 100644 index 7573aa3211..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/windswept_savanna.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/windswept_savanna", - "downfall": 0.0, - "effects": { - "fog_color": 12638463, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music_volume": 1.0, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/windswept_savanna", - "#minecraft:lakes/in_biome/windswept_savanna", - "#minecraft:local_modifications/in_biome/windswept_savanna", - "#minecraft:underground_structures/in_biome/windswept_savanna", - "#minecraft:surface_structures/in_biome/windswept_savanna", - "#minecraft:strongholds/in_biome/windswept_savanna", - "#minecraft:underground_ores/in_biome/windswept_savanna", - "#minecraft:underground_decoration/in_biome/windswept_savanna", - "#minecraft:fluid_springs/in_biome/windswept_savanna", - "#minecraft:vegetal_decoration/in_biome/windswept_savanna", - "#minecraft:top_layer_modification/in_biome/windswept_savanna" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:horse", - "maxCount": 6, - "minCount": 2, - "weight": 1 - }, - { - "type": "minecraft:donkey", - "maxCount": 1, - "minCount": 1, - "weight": 1 - }, - { - "type": "minecraft:armadillo", - "maxCount": 3, - "minCount": 2, - "weight": 10 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/wooded_badlands.json b/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/wooded_badlands.json deleted file mode 100644 index 19b1dd0313..0000000000 --- a/pfb_biome_extensions/backport_88/data/minecraft/worldgen/biome/wooded_badlands.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "carvers": "#minecraft:in_biome/wooded_badlands", - "creature_spawn_probability": 0.04, - "downfall": 0.0, - "effects": { - "fog_color": 12638463, - "foliage_color": 10387789, - "grass_color": 9470285, - "mood_sound": { - "block_search_extent": 8, - "offset": 2.0, - "sound": "minecraft:ambient.cave", - "tick_delay": 6000 - }, - "music": [ - { - "data": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.overworld.badlands" - }, - "weight": 1 - } - ], - "music_volume": 1.0, - "sky_color": 7254527, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "features": [ - "#minecraft:raw_generation/in_biome/wooded_badlands", - "#minecraft:lakes/in_biome/wooded_badlands", - "#minecraft:local_modifications/in_biome/wooded_badlands", - "#minecraft:underground_structures/in_biome/wooded_badlands", - "#minecraft:surface_structures/in_biome/wooded_badlands", - "#minecraft:strongholds/in_biome/wooded_badlands", - "#minecraft:underground_ores/in_biome/wooded_badlands", - "#minecraft:underground_decoration/in_biome/wooded_badlands", - "#minecraft:fluid_springs/in_biome/wooded_badlands", - "#minecraft:vegetal_decoration/in_biome/wooded_badlands", - "#minecraft:top_layer_modification/in_biome/wooded_badlands" - ], - "has_precipitation": false, - "spawn_costs": {}, - "spawners": { - "ambient": [ - { - "type": "minecraft:bat", - "maxCount": 8, - "minCount": 8, - "weight": 10 - } - ], - "axolotls": [], - "creature": [ - { - "type": "minecraft:sheep", - "maxCount": 4, - "minCount": 4, - "weight": 12 - }, - { - "type": "minecraft:pig", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:chicken", - "maxCount": 4, - "minCount": 4, - "weight": 10 - }, - { - "type": "minecraft:cow", - "maxCount": 4, - "minCount": 4, - "weight": 8 - }, - { - "type": "minecraft:armadillo", - "maxCount": 2, - "minCount": 1, - "weight": 6 - }, - { - "type": "minecraft:wolf", - "maxCount": 8, - "minCount": 4, - "weight": 2 - } - ], - "misc": [], - "monster": [ - { - "type": "minecraft:spider", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:zombie", - "maxCount": 4, - "minCount": 4, - "weight": 95 - }, - { - "type": "minecraft:zombie_villager", - "maxCount": 1, - "minCount": 1, - "weight": 5 - }, - { - "type": "minecraft:skeleton", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:creeper", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:slime", - "maxCount": 4, - "minCount": 4, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 4, - "minCount": 1, - "weight": 10 - }, - { - "type": "minecraft:witch", - "maxCount": 1, - "minCount": 1, - "weight": 5 - } - ], - "underground_water_creature": [ - { - "type": "minecraft:glow_squid", - "maxCount": 6, - "minCount": 4, - "weight": 10 - } - ], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 2.0 -} diff --git a/pyproject.toml b/pyproject.toml index c691d72d78..6e62ff80c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,9 +7,9 @@ authors = [ ] requires-python = ">=3.14" dependencies = [ - "beet>=0.113.0", - "mecha>=0.102.0", - "bolt>=0.50.0", + "beet>=0.114.0", + "mecha>=0.102.2", + "bolt>=0.50.1", "requests>=2.28.1", "repro-zipfile>=0.1.0", ] diff --git a/resource_pack/beet.yaml b/resource_pack/beet.yaml index 2b4bd876fd..8da2317e69 100644 --- a/resource_pack/beet.yaml +++ b/resource_pack/beet.yaml @@ -6,26 +6,7 @@ resource_pack: load: pack.png: pack.png # other files are inherited by the full-project build - overlays: - - formats: - min_inclusive: 1 - max_inclusive: 63 - min_format: 1 - max_format: 63 - directory: backport_63 - - formats: - min_inclusive: 1 - max_inclusive: 64 - min_format: 1 - max_format: 64 - directory: backport_64 - - formats: - min_inclusive: 1 - max_inclusive: 72 - min_format: 1 - max_format: 72 - directory: backport_72 - + pipeline: - dev_warning diff --git a/resource_pack/dev_description.py b/resource_pack/dev_description.py index ea623fb325..154d71af27 100644 --- a/resource_pack/dev_description.py +++ b/resource_pack/dev_description.py @@ -8,7 +8,5 @@ def beet_default(ctx: Context): "color": "red" } ] - ctx.assets.supported_formats = {"min_inclusive": 55, "max_inclusive": 75} - ctx.assets.pack_format = 55 - ctx.assets.min_format = 55 - ctx.assets.max_format = 75 + ctx.assets.min_format = 80 + ctx.assets.max_format = 80 diff --git a/spyglass.json b/spyglass.json index 0639f793bf..117251310f 100644 --- a/spyglass.json +++ b/spyglass.json @@ -1,6 +1,6 @@ { "env": { - "gameVersion": "1.21.11", + "gameVersion": "Latest snapshot", "exclude": [ ".*/**", "docs/**", diff --git a/uv.lock b/uv.lock index 7f14509385..d6fe9f09aa 100644 --- a/uv.lock +++ b/uv.lock @@ -12,7 +12,7 @@ wheels = [ [[package]] name = "beet" -version = "0.113.0" +version = "0.114.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "click" }, @@ -25,9 +25,9 @@ dependencies = [ { name = "pyyaml" }, { name = "toml" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/75/71/a2a93320ab7ec4cd1cf787600e18b6f49c149c4d14c088e209e4ef93727f/beet-0.113.0.tar.gz", hash = "sha256:81c93ca56d44d94819f5cc5c158e9fa8c09ffa140d8a67fc83e45a191bbd8fb2", size = 95028 } +sdist = { url = "https://files.pythonhosted.org/packages/47/87/f26ad4aa3b4a7c91c2f060aab9eab098e0361cd72b0d92e34cbe16002daa/beet-0.114.0.tar.gz", hash = "sha256:31b297bb285b63bf6b2d1eb5cacae392ed3131b0cb85c326b0567fdd54e00cbe", size = 95479 } wheels = [ - { url = "https://files.pythonhosted.org/packages/17/cf/92965352432c05bcce43cf49c7461f58ecdb10e9aa39cb8c3636adf4b810/beet-0.113.0-py3-none-any.whl", hash = "sha256:a10757ece106b79918cecc031045a7ad9b98a618a6e3ebcc3e0f91d6f145625f", size = 124656 }, + { url = "https://files.pythonhosted.org/packages/4e/c0/b7bd256b98b353c088d1cc407f82f277ff9888d79661ef0337c2105fc1c7/beet-0.114.0-py3-none-any.whl", hash = "sha256:35b553b55a164dc99162195ef7211590c6d94ffcb6189a88dc09569165a14df9", size = 125072 }, ] [[package]] @@ -53,15 +53,15 @@ wheels = [ [[package]] name = "bolt" -version = "0.50.0" +version = "0.50.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "beet" }, { name = "mecha" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/d7/b2/759f6ff1120598e06b1e035b032ed68d4de3cfff6ba8c1664ad1bd099eeb/bolt-0.50.0.tar.gz", hash = "sha256:eccafa15880f6436171f6076f73f1be60f73ceaa6e4d766e01a8329aec3a5149", size = 52337 } +sdist = { url = "https://files.pythonhosted.org/packages/b4/3c/53d8b950adbba601fdf4a0d2f1f1da652ca5f5879e040da2d8d8a020f9db/bolt-0.50.1.tar.gz", hash = "sha256:5bcb0ee76c87c0504fdf52fb79cf71a9acd0e681cc6df33fa9829039d8277ab8", size = 52341 } wheels = [ - { url = "https://files.pythonhosted.org/packages/2e/aa/828408ac398e42eb15ee39c9e11ea23858c8cfa672414c82a1cb730f906b/bolt-0.50.0-py3-none-any.whl", hash = "sha256:07dbb522ae23badee201bb52b1edce9beb3e4ca597b4a6d30eecc86b22bce870", size = 59725 }, + { url = "https://files.pythonhosted.org/packages/3f/9b/fa2699f4d991fa7b83b61daecb0c7a533487358448191bf4eefbcef89ce7/bolt-0.50.1-py3-none-any.whl", hash = "sha256:89c5505050d4431f0c0a6fed28691c626d0439c8d2432c3fdfdc185dbcddf592", size = 59733 }, ] [[package]] @@ -151,9 +151,9 @@ dev = [ [package.metadata] requires-dist = [ - { name = "beet", specifier = ">=0.113.0" }, - { name = "bolt", specifier = ">=0.50.0" }, - { name = "mecha", specifier = ">=0.102.0" }, + { name = "beet", specifier = ">=0.114.0" }, + { name = "bolt", specifier = ">=0.50.1" }, + { name = "mecha", specifier = ">=0.102.2" }, { name = "repro-zipfile", specifier = ">=0.1.0" }, { name = "requests", specifier = ">=2.28.1" }, ] @@ -226,15 +226,15 @@ wheels = [ [[package]] name = "mecha" -version = "0.102.0" +version = "0.102.2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "beet" }, { name = "tokenstream" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/89/79/d442fbca85f5754981f02e47dabfe83d6f466552a7c88f45c245fa329f5c/mecha-0.102.0.tar.gz", hash = "sha256:19acb0a48da8c9c328414ea296759656229c5b5bd35060e8a01b2c0be245ac50", size = 552610 } +sdist = { url = "https://files.pythonhosted.org/packages/05/4f/95aacb9479f7a7904196ec6066849c162c46d45ba1b4205b5bdd64704c17/mecha-0.102.2.tar.gz", hash = "sha256:8cccb5eceb80b3dc25d4bcec099ef2632d4cd33a9a8af95b2d43efdc8af0dc79", size = 552769 } wheels = [ - { url = "https://files.pythonhosted.org/packages/c3/dd/2cd518682a09fea8d7f7f56adaaf59fc56b4ec73a7a0637b22bf1aa8da37/mecha-0.102.0-py3-none-any.whl", hash = "sha256:c8df9a21466ed474f334b93cc59f4898652cae2b0ab76f076606e2e87d4c2482", size = 587493 }, + { url = "https://files.pythonhosted.org/packages/dc/db/38a8d8ef8b494d87b2aabb660220877c78d7c66ed1522094a58665d338e8/mecha-0.102.2-py3-none-any.whl", hash = "sha256:28fb7cd17330b844dd740a33a5b1d1734038acc8657ef90ed14ae726454e89c7", size = 587674 }, ] [[package]]